gtDetectorTwotheta : changed variable 'int' to 'intensity' and directly...

gtDetectorTwotheta : changed variable 'int' to 'intensity' and directly transpose fields to have rows
gtFillCrystFields : removed lines to transpose fields relative to gtDetectorTwotheta calculation

Signed-off-by: Laura Nervo <laura.nervo@esrf.fr>

1_preprocessing/gtFillCrystFields.m

@@ -322,12 +322,6 @@ function parameters = sfExpandData(parameters, phase_id)
     clear hklsymmetry;
 
     % Transpose arrays to have rows
-    parameters.cryst(phase_id).hkl       = parameters.cryst(phase_id).hkl';
-    parameters.cryst(phase_id).thetatype = parameters.cryst(phase_id).thetatype';
-    parameters.cryst(phase_id).theta     = parameters.cryst(phase_id).theta';
-    parameters.cryst(phase_id).dspacing  = parameters.cryst(phase_id).dspacing';
-    parameters.cryst(phase_id).int       = parameters.cryst(phase_id).int';
-    parameters.cryst(phase_id).mult      = parameters.cryst(phase_id).mult';
 
     parameters.cryst(phase_id).hklsp       = parameters.cryst(phase_id).hklsp';
     parameters.cryst(phase_id).thetatypesp = parameters.cryst(phase_id).thetatypesp';

zUtil_Cryst/gtDetectorTwotheta.m

@@ -49,7 +49,7 @@ end
 results = [];
 
 hkl  = gtFindFamilies(parameters, 'hkl', phaseID);
-int  = gtFindFamilies(parameters, 'int', phaseID);
+intensity  = gtFindFamilies(parameters, 'int', phaseID);
 mult = gtFindFamilies(parameters, 'mult', phaseID);
 
 disp(['hkl total families:       ' num2str(size(hkl, 1))])
@@ -74,26 +74,26 @@ ind = [ind; find(tt < minangle/2)];
 tt(ind)    = [];            
 hkl(ind, :) = [];
 d0(ind)    = [];
-int(ind)   = [];
+intensity(ind)   = [];
 mult(ind)  = [];
 
 % order reflections by increasing twotheta values
 [tt,ind_tt] = sort(tt);
 hkl = hkl(ind_tt, :);
 d0  = d0(ind_tt);
-int = int(ind_tt);
+intensity = intensity(ind_tt);
 thtype = (1:length(hkl))';
 mult   = mult(ind_tt);
 
 disp(['Families on the detector: ' num2str(size(hkl,1))])
 disp('Now reflections are sorted by increasing theta values')
 
-results.hkl       = hkl;
+results.hkl       = hkl';
 results.theta     = tt;
 results.dspacing  = d0;
-results.int       = int;
-results.thetatype = thtype;
-results.mult      = mult;
+results.int       = intensity';
+results.thetatype = thtype';
+results.mult      = mult';
 
 end % end of function