From bc0fcd3a89c14fd2350833c0ebdd1be00ba8c5e2 Mon Sep 17 00:00:00 2001
From: Nicola Vigano <vigano@yoda.esrf.fr>
Date: Wed, 11 May 2016 15:06:16 +0200
Subject: [PATCH] Reformatting
Signed-off-by: Nicola Vigano <vigano@yoda.esrf.fr>
---
zUtil_Geo/gtGeoProjForReconstruction.m | 79 +++++++++++++-------------
1 file changed, 39 insertions(+), 40 deletions(-)
diff --git a/zUtil_Geo/gtGeoProjForReconstruction.m b/zUtil_Geo/gtGeoProjForReconstruction.m
index ac43393e..1be16917 100644
--- a/zUtil_Geo/gtGeoProjForReconstruction.m
+++ b/zUtil_Geo/gtGeoProjForReconstruction.m
@@ -44,57 +44,56 @@ function proj_geom = gtGeoProjForReconstruction(projvec, omega, graincenter,...
%
%
-if isempty(bboff)
- bboff = zeros(size(bbpos, 1), 2);
-end
+ if isempty(bboff)
+ bboff = zeros(size(bbpos, 1), 2);
+ end
-if (isempty(detgeo))
- detgeo = gtGeoConvertLegacyLabgeo2Detgeo(labgeo);
-end
+ if (isempty(detgeo))
+ detgeo = gtGeoConvertLegacyLabgeo2Detgeo(labgeo);
+ end
-% Bounding box center U,V coordinates
-bbcent_det = [ bbpos(:, 1) + (bbpos(:, 3) - 1) / 2 + bboff(:, 1) , ...
- bbpos(:, 2) + (bbpos(:, 4) - 1) / 2 + bboff(:, 2) ];
+ % Bounding box center U,V coordinates
+ bbcent_det = [ bbpos(:, 1) + (bbpos(:, 3) - 1) / 2 + bboff(:, 1) , ...
+ bbpos(:, 2) + (bbpos(:, 4) - 1) / 2 + bboff(:, 2) ];
-% All functions that use the same omegas, need the same rotation tensors:
-rot_comp_w = gtMathsRotationMatrixComp(labgeo.rotdir', 'col');
-rot_omega = gtMathsRotationTensor(omega, rot_comp_w);
+ % All functions that use the same omegas, need the same rotation tensors:
+ rot_comp_w = gtMathsRotationMatrixComp(labgeo.rotdir', 'col');
+ rot_omega = gtMathsRotationTensor(omega, rot_comp_w);
-% Bounding box center X,Y,Z coordinates in LAB and REC reference
-bbcent_lab = gtGeoDet2Lab(bbcent_det, detgeo, 0);
-bbcent_rec = gtGeoLab2Sam(bbcent_lab, rot_omega, labgeo, recgeo, 0, 0);
+ % Bounding box center X,Y,Z coordinates in LAB and REC reference
+ bbcent_lab = gtGeoDet2Lab(bbcent_det, detgeo, 0);
+ bbcent_rec = gtGeoLab2Sam(bbcent_lab, rot_omega, labgeo, recgeo, 0, 0);
-% Detector orientation vectors in REC reference
-detdiru = detgeo.detdiru ./ sqrt(sum(detgeo.detdiru .^ 2)) * detgeo.pixelsizeu;
-detdirv = detgeo.detdirv ./ sqrt(sum(detgeo.detdirv .^ 2)) * detgeo.pixelsizev;
+ % Detector orientation vectors in REC reference
+ detdiru = detgeo.detdiru ./ sqrt(sum(detgeo.detdiru .^ 2)) * detgeo.pixelsizeu;
+ detdirv = detgeo.detdirv ./ sqrt(sum(detgeo.detdirv .^ 2)) * detgeo.pixelsizev;
-ones_omega = ones(length(omega), 1);
-detdiru_rec = gtGeoLab2Sam(detdiru(ones_omega, :), rot_omega, labgeo, recgeo, 1, 0);
-detdirv_rec = gtGeoLab2Sam(detdirv(ones_omega, :), rot_omega, labgeo, recgeo, 1, 0);
+ ones_omega = ones(length(omega), 1);
+ detdiru_rec = gtGeoLab2Sam(detdiru(ones_omega, :), rot_omega, labgeo, recgeo, 1, 0);
+ detdirv_rec = gtGeoLab2Sam(detdirv(ones_omega, :), rot_omega, labgeo, recgeo, 1, 0);
-if (strcmpi(rectype, 'ASTRA_absorption'))
- projvec = labgeo.beamdir(ones_omega, :);
- projvec = gtGeoLab2Sam(projvec, rot_omega, labgeo, recgeo, 1, 0);
-end
+ if (strcmpi(rectype, 'ASTRA_absorption'))
+ projvec = labgeo.beamdir(ones_omega, :);
+ projvec = gtGeoLab2Sam(projvec, rot_omega, labgeo, recgeo, 1, 0);
+ end
-% Normalised projection vector in REC reference
-projvec_rec = gtGeoSam2Sam(projvec, samgeo, recgeo, 1, 0);
-projvec_rec = gtMathsNormalizeVectorsList(projvec_rec);
+ % Normalised projection vector in REC reference
+ projvec_rec = gtGeoSam2Sam(projvec, samgeo, recgeo, 1, 0);
+ projvec_rec = gtMathsNormalizeVectorsList(projvec_rec);
-switch (rectype)
- case {'ASTRA_grain'}
- % Grain center in REC reference
- graincenter_rec = gtGeoSam2Sam(graincenter, samgeo, recgeo, 0, 0);
- graincenter_rec = graincenter_rec(ones(size(bbcent_rec, 1), 1), :);
+ switch (rectype)
+ case {'ASTRA_grain'}
+ % Grain center in REC reference
+ graincenter_rec = gtGeoSam2Sam(graincenter, samgeo, recgeo, 0, 0);
+ graincenter_rec = graincenter_rec(ones(size(bbcent_rec, 1), 1), :);
- bbcent_rec = bbcent_rec - graincenter_rec;
-
- proj_geom = [projvec_rec, bbcent_rec, detdiru_rec, detdirv_rec];
+ bbcent_rec = bbcent_rec - graincenter_rec;
- case {'ASTRA_full', 'ASTRA_absorption'}
- proj_geom = [projvec_rec, bbcent_rec, detdiru_rec, detdirv_rec];
-end
+ proj_geom = [projvec_rec, bbcent_rec, detdiru_rec, detdirv_rec];
-end % of function
+ case {'ASTRA_full', 'ASTRA_absorption'}
+ proj_geom = [projvec_rec, bbcent_rec, detdiru_rec, detdirv_rec];
+ end
+end
--
GitLab