From 5ca29119a6a622a3f9799ec0713bf24c95c39a7e Mon Sep 17 00:00:00 2001
From: Lorenzo Valzania <valzania@rnice7-0201.esrf.fr>
Date: Thu, 29 Jan 2015 14:45:18 +0100
Subject: [PATCH] FittingPackage: fixes for detgeo
Signed-off-by: Lorenzo Valzania <valzania@rnice7-0201.esrf.fr>
---
zUtil_Fit/gtFITParameters.m | 10 ++++++----
zUtil_Fit/gtFitFwdSimGrains.m | 2 +-
zUtil_Fit/gtFitSpotPosDeviations.m | 2 +-
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/zUtil_Fit/gtFITParameters.m b/zUtil_Fit/gtFITParameters.m
index f554e242..85f06b42 100644
--- a/zUtil_Fit/gtFITParameters.m
+++ b/zUtil_Fit/gtFITParameters.m
@@ -508,13 +508,15 @@ end
if any(activeglobal)
[labgeo, detgeo, energy] = gtFitUpdateLabgeo(varsopt(1:sum(activeglobal)), ...
activeglobal, par.iniglobal, labgeo, detgeo);
- labgeo = rmfield(labgeo, 'detnorm');
- labgeo = rmfield(labgeo, 'detorig');
else
energy = par.iniglobal(10);
end
-labgeo = rmfield(labgeo,'detnorm');
-labgeo = rmfield(labgeo,'detorig');
+if (isfield(labgeo, 'detnorm'))
+ labgeo = rmfield(labgeo,'detnorm');
+end
+if (isfield(labgeo, 'detorig'))
+ labgeo = rmfield(labgeo,'detorig');
+end
% Drifts
drift = par.drift;
diff --git a/zUtil_Fit/gtFitFwdSimGrains.m b/zUtil_Fit/gtFitFwdSimGrains.m
index f1eb90f9..72181795 100644
--- a/zUtil_Fit/gtFitFwdSimGrains.m
+++ b/zUtil_Fit/gtFitFwdSimGrains.m
@@ -135,7 +135,7 @@ for ii = 1:length(grain)
% Absolute detector coordinates U,V in pixels
uv = gtFedPredictUVMultiple(rot4, dveclab, gcsam, detgeo.detrefpos', ...
- detgeo.detnorm, detgeo.Qdet, [detgeo.detrefu; detgeo.detrefv]);
+ detgeo.detnorm', detgeo.Qdet, [detgeo.detrefu; detgeo.detrefv]);
% Absolute coordinates U,V,W (pixel,pixel,image); to account for
diff --git a/zUtil_Fit/gtFitSpotPosDeviations.m b/zUtil_Fit/gtFitSpotPosDeviations.m
index 2f851e09..25cd1617 100644
--- a/zUtil_Fit/gtFitSpotPosDeviations.m
+++ b/zUtil_Fit/gtFitSpotPosDeviations.m
@@ -120,7 +120,7 @@ end
%%% Update labgeo
%%%%%%%%%%%%%%%%%%%%%%%%%
-[labgeo, detgeo] = gtGeoConvertLegacyLabgeo2Detgeo(par.labgeoini);
+[detgeo, labgeo] = gtGeoConvertLegacyLabgeo2Detgeo(par.labgeoini);
% Recalculate labgeo
if any(activeglobal)
[labgeo, detgeo, energy] = gtFitUpdateLabgeo( ...
--
GitLab