Changeset 207 for trunk/src/imadoc2struct.m

Timestamp:

Feb 27, 2011, 10:41:07 PM (14 years ago)

Author:

sommeria

Message:

bug fixes to deal with volumes

File:

• trunk/src/imadoc2struct.m (modified) (4 diffs)

trunk/src/imadoc2struct.m

@@ -117 +117 @@
     if length(uid_subtree)==1
         subt=branch(t,uid_subtree);%subtree under GeometryCalib
-       [s.TranslationMotor,errormsg]=read_subtree(subt,{'Nbslice','ZStart','ZEnd'},[1 1 1],[1 1 1])
+       [s.TranslationMotor,errormsg]=read_subtree(subt,{'Nbslice','ZStart','ZEnd'},[1 1 1],[1 1 1]);
     end 
 end
@@ -207 +207 @@
                     tsai.SliceCoord=ones(NbSlice,1)*tsai.SliceCoord+DZ*(0:NbSlice-1)'*[0 0 1];
                 end
-            end
-            uid_VolumeScan=find(subt,'/GeometryCalib/VolumeScan');
-            if ~isempty(uid_VolumeScan)
-                tsai.VolumeScan=get(subt,children(subt,uid_VolumeScan),'value');
-            end
-            tsai.InterfaceCoord=get_value(subt,'/GeometryCalib/InterfaceCoord',[0 0 0])
-            tsai.RefractionIndex=get_value(subt,'/GeometryCalib/RefractionIndex',1)
+            end   
+            tsai.SliceAngle=get_value(subt,'/GeometryCalib/SliceAngle',[0 0 0]);
+            tsai.VolumeScan=get_value(subt,'/GeometryCalib/VolumeScan','n');
+            tsai.InterfaceCoord=get_value(subt,'/GeometryCalib/InterfaceCoord',[0 0 0]);
+            tsai.RefractionIndex=get_value(subt,'/GeometryCalib/RefractionIndex',1);
             
             if strcmp(option,'GeometryCalib')
@@ -236 +234 @@
 s=[];%default
 errormsg='';
-head_element=get(subt,1,'name')
+head_element=get(subt,1,'name');
     cont=get(subt,1,'contents');
     if ~isempty(cont)
         for ilist=1:length(Data)
-            uid_key=find(subt,[head_element '/' Data{ilist}])
+            uid_key=find(subt,[head_element '/' Data{ilist}]);
             if ~isequal(length(uid_key),NbOccur(ilist))
-                errormsg=['wrong number of occurence for ' Data{ilist}]
+                errormsg=['wrong number of occurence for ' Data{ilist}];
                 return
             end
             for ival=1:length(uid_key)
-                val=get(subt,children(subt,uid_key(ival)),'value')
+                val=get(subt,children(subt,uid_key(ival)),'value');
                 if ~NumTest(ilist)
                     eval(['s.' Data{ilist} '=val;']);
@@ -279 +277 @@
            if ~isempty(val_read)
                val=val_read;
+           else
+              val=get(t,uid_child,'value');%char string data
            end
        end