Use minimal header length for full images in order to avoid variable header length

In case of multiphase materials, copy default structures for .xop and .cryst fields

Signed-off-by: Wolfgang Ludwig <wolfgang.ludwig@esrf.fr>

1_preprocessing/gtCreateFullLive.m

@@ -257,12 +257,12 @@ for ii = first_img : prep.absint : (last_img - prep.absint)
         end
 
         % Save full image edf file
-        edf_write(full_vol, fullname, info_img);
+        edf_write(full_vol, fullname, info_img, 1);
 
         % Save extinction and absorption images edf files
         if (is_direct_beam)
-            edf_write(ext, extname, info_img);
-            edf_write(absorp, absname, info_img);
+            edf_write(ext, extname, info_img, 1);
+            edf_write(absorp, absname, info_img, 1);
         end
         
         disp(['Done image ' num2str(imno)])

1_preprocessing/gtSetup.m

@@ -439,7 +439,12 @@ nof_phases = 1;
 parameters.acq.nof_phases = inputwdefaultnumeric( ...
     'Number of crystallographic phases to be analysed in this sample?', num2str(nof_phases));
 
-% Since the crystallography setup often crashes, include it in try/catch 
+if parameters.acq.nof_phases >1
+    parameters.xop(parameters.acq.nof_phases)=parameters.xop(1);
+    parameters.cryst(parameters.acq.nof_phases)=parameters.cryst(1);
+end
+
+% Since the crystallography setup often crashes, include it in try/catch
 try
 	% get Cryst field information for all phases
 	for phase_id = 1 : parameters.acq.nof_phases

zUtil_Geo/gtGeoTwoThetaLimits.m

@@ -45,12 +45,15 @@ function [minangle,maxangle, bbdir]=gtGeoTwoThetaLimits(im, parameters)
     % detector - take the one with maximum distance for estimation of maximum two-theta angle
 
     maxdist = zeros(4, 1);
-    maxdist(1) = max(sqrt(sum((edges - repmat([bbdir(1) bbdir(2)]',1, 4)).^2)));
-    maxdist(2) = max(sqrt(sum((edges - repmat([bbdir(1) bbdir(2) + bbdir(4)]',1, 4)).^2)));
-    maxdist(3) = max(sqrt(sum((edges - repmat([bbdir(1) + bbdir(3) bbdir(2)]',1, 4)).^2)));
-    maxdist(4) = max(sqrt(sum((edges - repmat([bbdir(1) + bbdir(3) bbdir(2) + bbdir(4)]',1, 4)).^2)));
-
-    maxangle = atand(max(maxdist) * parameters.acq.pixelsize / parameters.acq.dist);
+    center  = [bbdir(1) + bbdir(3)/2 bbdir(2) + bbdir(4)/2];
+    %maxdist(1) = max(sqrt(sum((edges - repmat([bbdir(1) bbdir(2)]',1, 4)).^2)));
+    %maxdist(2) = max(sqrt(sum((edges - repmat([bbdir(1) bbdir(2) + bbdir(4)]',1, 4)).^2)));
+    %maxdist(3) = max(sqrt(sum((edges - repmat([bbdir(1) + bbdir(3) bbdir(2)]',1, 4)).^2)));
+    %maxdist(4) = max(sqrt(sum((edges - repmat([bbdir(1) + bbdir(3) bbdir(2) + bbdir(4)]',1, 4)).^2)));
+   
+    maxdist = max(sqrt(sum((edges - repmat(center', 1, 4)).^2)));
+    
+    maxangle = atand(maxdist * parameters.acq.pixelsize / parameters.acq.dist);
 
     minangle = 0;