Skip to content
Snippets Groups Projects
Commit da6dd256 authored by Laura Nervo's avatar Laura Nervo Committed by Nicola Vigano
Browse files

build_list_v2 : fix differencies with parameters structure used in the current code. 


Signed-off-by: default avatarLaura Nervo <laura.nervo@esrf.fr>

git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@738 4c865b51-4357-4376-afb4-474e03ccb993
parent c24ba491
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
zUtil_Parameters/build_list_v2.m
+ 21
− 33
View file @ da6dd256
......@@ -311,13 +311,13 @@ list.labgeo{15,1} = 'detanglemax'; list.labgeo{15,2} = '[Com
list.labgeo{16,1} = 'labunit'; list.labgeo{16,2} = 'LAB units (default is mm) [for records only]';
list.labgeo{16,3} = 'char';
list.labgeo{16,4} = 1;
list.labgeo{17,1} = 'deflabX'; list.labgeo{17,2} = 'Description how Lab X direction was chosen [for records only]';
list.labgeo{17,1} = 'reflabX'; list.labgeo{17,2} = 'Description how Lab X direction was chosen [for records only]';
list.labgeo{17,3} = 'char';
list.labgeo{17,4} = 1;
list.labgeo{18,1} = 'deflabY'; list.labgeo{18,2} = 'Description how Lab Y direction was chosen [for records only]';
list.labgeo{18,1} = 'reflabY'; list.labgeo{18,2} = 'Description how Lab Y direction was chosen [for records only]';
list.labgeo{18,3} = 'char';
list.labgeo{18,4} = 1;
list.labgeo{19,1} = 'deflabZ'; list.labgeo{19,2} = 'Description how Lab Z direction was chosen [for records only]';
list.labgeo{19,1} = 'reflabZ'; list.labgeo{19,2} = 'Description how Lab Z direction was chosen [for records only]';
list.labgeo{19,3} = 'char';
list.labgeo{19,4} = 1;
list.labgeo{20,1} = 'detsizeu'; list.labgeo{20,2} = 'Number of pixels along the u direction';
......@@ -326,12 +326,12 @@ list.labgeo{20,1} = 'detsizeu'; list.labgeo{20,2} = 'Numb
list.labgeo{21,1} = 'detsizev'; list.labgeo{21,2} = 'Number of pixels along the v direction';
list.labgeo{21,3} = 'double'; % scalar
list.labgeo{21,4} = 0;
%list.labgeo{16,1} = 'detnorm'; list.labgeo{16,2} = '[Computed] Detector normal direction in LAB (unit row vector) [computed]';
% list.labgeo{16,3} = 'double'; % size (1,3)
% list.labgeo{16,4} = 0;
%list.labgeo{17,1} = 'detorig'; list.labgeo{17,2} = '[Computed] Detector origin position (center of pixel 0,0) in LAB [computed]';
% list.labgeo{17,3} = 'double'; % size (1,3)
% list.labgeo{17,4} = 0;
list.labgeo{22,1} = 'detnorm'; list.labgeo{22,2} = '[Computed] Detector normal direction in LAB (unit row vector) [computed]';
list.labgeo{22,3} = 'double'; % size (1,3)
list.labgeo{22,4} = 0;
list.labgeo{23,1} = 'detorig'; list.labgeo{23,2} = '[Computed] Detector origin position (center of pixel 0,0) in LAB [computed]';
list.labgeo{23,3} = 'double'; % size (1,3)
list.labgeo{23,4} = 0;
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
......@@ -354,23 +354,6 @@ list.samgeo{5,1} = 'voxsize'; list.samgeo{5,2} = 'Voxel
list.samgeo{5,4} = 0;
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Database
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
list.database{1,1} = 'name'; list.database{1,2} = 'Database name';
list.database{1,3} = 'char';
list.database{1,4} = 0;
list.database{2,1} = 'host'; list.database{2,2} = 'Database host';
list.database{2,3} = 'char';
list.database{2,4} = 0;
list.database{3,1} = 'user'; list.database{3,2} = 'Database user';
list.database{3,3} = 'char';
list.database{3,4} = 0;
list.database{4,1} = 'password'; list.database{4,2} = 'Database password';
list.database{4,3} = 'char';
list.database{4,4} = 0;
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Preprocessing
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
......@@ -543,7 +526,10 @@ list.index{1,1} = 'strategy'; list.index{1,2} = 'Strate
list.index{2,1} = 'discard'; list.index{2,2} = 'Vector of pair id-s to be discarded in indexing';
list.index{2,3} = 'double'; % row vector
list.index{2,4} = 2;
list.index{3,1} = 'forcemerge'; list.index{3,2} = 'Cell array of grain id-s to be merged';
list.index{3,3} = 'cell'; % row vector
list.index{3,4} = 2;
list.index__strategy{1,1} = 'iter'; list.index__strategy{1,2} = 'Number of iteration loops';
list.index__strategy{1,3} = 'double'; % scalar
list.index__strategy{1,4} = 2;
......@@ -731,6 +717,8 @@ list.fsim{13,1} = 'included'; list.fsim{13,2} = 'Difspo
list.fsim{14,1} = 'selected'; list.fsim{14,2} = 'Difspots with flag >= selected be used for reconstruction';
list.fsim{14,3} = 'double'; % scalar
list.fsim{14,4} = 2;
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% reconstruction
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
......@@ -760,12 +748,12 @@ list.rec{8,1} = 'percentile1'; list.rec{8,2} = 'Alternat
list.rec{8,3} = 'double'; % scalar
list.rec{8,4} = 2;
%list.rec{8,1} = 'select_projections_auto'; list.rec{8,2} = 'select projecions automatically';
% list.rec{8,3} = 'logical';
% list.rec{8,4} = 2;
% list.rec{9,1} = 'use_extspots'; list.rec{9,2} = 'Use extension spots';
% list.rec{9,3} = 'logical';
% list.rec{9,4} = 2;
% list.rec{9,1} = 'select_projections_auto'; list.rec{9,2} = 'select projecions automatically';
% list.rec{9,3} = 'logical';
% list.rec{9,4} = 2;
% list.rec{10,1} = 'use_extspots'; list.rec{10,2} = 'Use extension spots';
% list.rec{10,3} = 'logical';
% list.rec{10,4} = 2;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment