From 2fe44598d9c501f5d376a0da3b1a8abb5176d7f9 Mon Sep 17 00:00:00 2001
From: preischig <preischig@xnovotech.com>
Date: Wed, 26 Mar 2014 15:18:21 +0100
Subject: [PATCH] gtPreprocessing: now uses gtGeoSamEnvFromAcq to compute the
sample envelope.
Signed-off-by: preischig <preischig@xnovotech.com>
---
1_preprocessing/gtPreprocessing.m | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/1_preprocessing/gtPreprocessing.m b/1_preprocessing/gtPreprocessing.m
index 2a3c23c0..e7e34cde 100644
--- a/1_preprocessing/gtPreprocessing.m
+++ b/1_preprocessing/gtPreprocessing.m
@@ -170,9 +170,10 @@ if (parameters.acq.no_direct_beam)
check = inputwdefault('Is it like a taper scan with the sample still in the images? [y/n]', 'y');
if strcmpi(check,'y')
% define the sample envelope - assume centred on direct beam
- parameters.labgeo.samenvtop = (parameters.acq.bb(4)/2)*parameters.acq.pixelsize;
- parameters.labgeo.samenvbot = -parameters.labgeo.samenvtop;
- parameters.labgeo.samenvrad = (parameters.acq.bb(3)/2)*parameters.acq.pixelsize;
+ labgeo_tmp = gtGeoSamEnvFromAcq(parameters.labgeo, parameters.acq);
+ parameters.labgeo.samenvtop = labgeo_tmp.samenvtop;
+ parameters.labgeo.samenvbot = labgeo_tmp.samenvbot;
+ parameters.labgeo.samenvrad = labgeo_tmp.samenvrad;
end
else
% find direct beam bounding box
@@ -214,10 +215,10 @@ else
parameters.prep.bbox = parameters.acq.bb+[-parameters.prep.margin 0 2*parameters.prep.margin 0];
% define the sample envelope - assume centred on direct beam
- parameters.labgeo.samenvtop = (parameters.acq.bb(4)/2)*parameters.acq.pixelsize;
- parameters.labgeo.samenvbot = -parameters.labgeo.samenvtop;
- parameters.labgeo.samenvrad = (parameters.acq.bb(3)/2)*parameters.acq.pixelsize;
-
+ labgeo_tmp = gtGeoSamEnvFromAcq(parameters.labgeo, parameters.acq);
+ parameters.labgeo.samenvtop = labgeo_tmp.samenvtop;
+ parameters.labgeo.samenvbot = labgeo_tmp.samenvbot;
+ parameters.labgeo.samenvrad = labgeo_tmp.samenvrad;
end
save(parameters_name,'parameters');
end % end no_direct_beam case
--
GitLab