Skip to content
Snippets Groups Projects
Commit d6be2ff1 authored by Wolfgang Ludwig's avatar Wolfgang Ludwig
Browse files

dimensions of rectangular images were confused in gtSetup when loading from xml file.

Repair creation of cryst structure from of .csv or .dat files

Signed-off-by: default avatarWolfgang Ludwig <wolfgang.ludwig@esrf.fr>
parent dbae38bc
No related branches found
No related tags found
No related merge requests found
...@@ -16,8 +16,8 @@ function acq = gtLoadAcquisitionXML(xmlfname, interactive) ...@@ -16,8 +16,8 @@ function acq = gtLoadAcquisitionXML(xmlfname, interactive)
acq.name = tmpxml.scanName; % shouldn't change! acq.name = tmpxml.scanName; % shouldn't change!
acq.date = tmpxml.date; acq.date = tmpxml.date;
acq.xdet = tmpxml.projectionSize.DIM_2; % pixels acq.xdet = tmpxml.projectionSize.DIM_1; % pixels
acq.ydet = tmpxml.projectionSize.DIM_1; % pixels acq.ydet = tmpxml.projectionSize.DIM_2; % pixels
acq.nproj = tmpxml.tomo_N/2; acq.nproj = tmpxml.tomo_N/2;
acq.refon = tmpxml.ref_On; acq.refon = tmpxml.ref_On;
acq.nref = tmpxml.ref_N; acq.nref = tmpxml.ref_N;
...@@ -33,8 +33,8 @@ function acq = gtLoadAcquisitionXML(xmlfname, interactive) ...@@ -33,8 +33,8 @@ function acq = gtLoadAcquisitionXML(xmlfname, interactive)
warning('Could not find scanRange info in xml file, assuming it is 360degree...'); warning('Could not find scanRange info in xml file, assuming it is 360degree...');
acq.type = '360degree'; acq.type = '360degree';
end end
acq.detroi_u_off = tmpxml.projectionSize.ROW_BEG; acq.detroi_u_off = tmpxml.projectionSize.COL_BEG;
acq.detroi_v_off = tmpxml.projectionSize.COL_BEG; acq.detroi_v_off = tmpxml.projectionSize.ROW_BEG;
else %if .xml not found else %if .xml not found
if interactive if interactive
disp('No .xml file found!'); disp('No .xml file found!');
......
...@@ -29,8 +29,11 @@ function [allshkls, allhklinds, mult] = gtCrystSignedHKLs(hkl, symm) ...@@ -29,8 +29,11 @@ function [allshkls, allhklinds, mult] = gtCrystSignedHKLs(hkl, symm)
if ~isa(hkl,'double') if ~isa(hkl,'double')
hkl = double(hkl); hkl = double(hkl);
end end
% reflections in rows % reflections in rows
hkl = hkl'; if ~isrow(hkl)
hkl = hkl';
end
if ~exist('symm','var') || isempty(symm) if ~exist('symm','var') || isempty(symm)
load parameters load parameters
......
...@@ -92,7 +92,7 @@ if isreflections ...@@ -92,7 +92,7 @@ if isreflections
end end
end end
reflections.hkl = [reflections.h reflections.k reflections.l]; reflections.hkl = double([reflections.h reflections.k reflections.l]);
reflections = rmfield(reflections, {'h','k','l'}); reflections = rmfield(reflections, {'h','k','l'});
xop = reflections; xop = reflections;
......
...@@ -61,7 +61,7 @@ mult = []; ...@@ -61,7 +61,7 @@ mult = [];
% 4 columns needed for hexagonal % 4 columns needed for hexagonal
for ii = 1:size(hkltypes_used,1) for ii = 1:size(hkltypes_used,1)
allhkls_i = gtCrystSignedHKLs(hkltypes_used(ii,:),cryst.spacegroup); allhkls_i = gtCrystSignedHKLs(hkltypes_used(ii,:));
nhkls = size(allhkls_i,1); nhkls = size(allhkls_i,1);
hklsp = [hklsp; allhkls_i]; hklsp = [hklsp; allhkls_i];
hkl = [hkl; repmat(hkltypes_used(ii,:),nhkls,1)]; hkl = [hkl; repmat(hkltypes_used(ii,:),nhkls,1)];
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment