gtGeoLabDefaultParameters : using new function gtGeoSamEnvFromAcq to update...

gtGeoLabDefaultParameters : using new function gtGeoSamEnvFromAcq to update samenv when changing acq.bb


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

zUtil_Geo/gtGeoLabDefaultParameters.m

@@ -65,9 +65,7 @@ elseif (~acq.no_direct_beam)
     % Should take sample envelope from sample bbox (parameters.acq.bb) if
     % exists, otherwise in gtPreprocessing
     if (isfield(acq, 'bb') && ~isempty(acq.bb))
-        par_labgeo.samenvtop = (acq.bb(4)/2) * acq.pixelsize * 1.1;
-        par_labgeo.samenvbot = -par_labgeo.samenvtop;
-        par_labgeo.samenvrad = (acq.bb(3)/2) * acq.pixelsize * 1.1;
+        par_labgeo = gtGeoSamEnvFromAcq(par_labgeo, acq);
     else
         par_labgeo.samenvtop = [];
         par_labgeo.samenvbot = [];
@@ -87,9 +85,7 @@ elseif (acq.no_direct_beam && strcmp(acq.detector_definition, 'inline'))
         % guess a sample bounding box
         acq.bb = [acq.xdet/2 -50 acq.ydet/2-50 100 100];
     end
-    par_labgeo.samenvtop = (acq.bb(4)/2) * acq.pixelsize * 1.1;
-    par_labgeo.samenvbot = -par_labgeo.samenvtop;
-    par_labgeo.samenvrad = (acq.bb(3)/2) * acq.pixelsize * 1.1;
+    par_labgeo = gtGeoSamEnvFromAcq(par_labgeo, acq);
     disp('Choose a squared sample bounding box in the center of the image...')
 end
 

zUtil_Geo/gtGeoSamEnvFromAcq.m

+function labgeo = gtGeoSamEnvFromAcq(labgeo, acq)
+% labgeo = gtGeoSamEnv(labgeo, acq)
+% calculates sample envelope using acq.bb and acq.pixelsize
+% overscaling the sample envelope of 1.1
+%
+% Version 001 09-10-2013 by LNervo
+
+labgeo.samenvtop = (acq.bb(4)/2) * acq.pixelsize * 1.1;
+labgeo.samenvbot = -labgeo.samenvtop;
+labgeo.samenvrad = (acq.bb(3)/2) * acq.pixelsize * 1.1;
+
+end % end of function