From ffdf8e0e4cba065462b2fefe93fedb24f4968ffa Mon Sep 17 00:00:00 2001
From: Nicola Vigano <nicola.vigano@esrf.fr>
Date: Wed, 29 Apr 2015 17:51:32 +0200
Subject: [PATCH] fixed gtShowFsim
Signed-off-by: Nicola Vigano <nicola.vigano@esrf.fr>
---
zUtil_ForwardSim/gtShowFsim.m | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/zUtil_ForwardSim/gtShowFsim.m b/zUtil_ForwardSim/gtShowFsim.m
index 41a0c17f..7f9b79c5 100644
--- a/zUtil_ForwardSim/gtShowFsim.m
+++ b/zUtil_ForwardSim/gtShowFsim.m
@@ -87,11 +87,15 @@ db_info = gtDBLoadTable([datasetname 'difspot'], 'difspotID');
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Getting fields and updating grain
-pixelsize = mean([parameters.labgeo.pixelsizeu, parameters.labgeo.pixelsizev]);
-detrefpos_pix = parameters.labgeo.detrefpos ./ pixelsize;
+if (~isfield(parameters, 'detgeo'))
+ [parameters.detgeo, parameters.labgeo] = gtGeoConvertLegacyLabgeo2Detgeo(parameters.labgeo);
+end
+
+pixelsize = mean([parameters.detgeo.pixelsizeu, parameters.detgeo.pixelsizev]);
+detrefpos_pix = parameters.detgeo.detrefpos ./ pixelsize;
spotsCommProps = gtFwdSimGetDiffspotsCommonProperties(grain, detrefpos_pix, parameters);
-getradius = @(u, v) sqrt((u - parameters.labgeo.detrefu).^2 + (v - parameters.labgeo.detrefv).^2);
+getradius = @(u, v) sqrt((u - parameters.detgeo.detrefu).^2 + (v - parameters.detgeo.detrefv).^2);
if strcmpi(app.fsimtype, 'allblobs')
uvw = grain.allblobs.detector(1).uvw;
--
GitLab