Changeset 232 in ETALON for SPESO/ana2015/gen_ana_speso_fun.m

Timestamp:

Apr 15, 2015, 4:38:18 PM (9 years ago)

Author:

delerue

Message:

Analysis updated - accepts beam info data

File:

• SPESO/ana2015/gen_ana_speso_fun.m (modified) (5 diffs)

SPESO/ana2015/gen_ana_speso_fun.m

@@ -8 +8 @@
 define_dirs_analysis;
 
+set(0,'DefaultAxesFontSize',12)
 
 fnamebase=[ basedir dateStr '_scope/scope_' dateStr '_' timeStr '_' ];
@@ -22 +23 @@
     rerun=0;
 else
+    rerun=1;
+end
+
+if (~exist('dateAnalysed'))
+    warning('dateAnalysed missing')
+    rerun=1;
+    dateAnalysed=0;
+end
+
+if (~exist('dateCode'))
+    load('dateCode.mat')
+end
+
+if (dateCode>(dateAnalysed-0.5))
+    warning('File was analysed with old code')
     rerun=1;
 end
@@ -112 +128 @@
             fprintf(fid, [ '<IMG SRC="' imgName '" WIDTH=' num2str(imageSizes) '><BR/>\n' ]);
             
+            channelValues.on=1;
             
         else % channel is off
-            channelValues=[];
+            channelValues.on=0;
+            channelValues.means=[0 0 0];
+            channelValues.rms=[0 0 0];
+            channelValues.sv=0;
+            channelValues.peak=0;
         end % channel is off
         
@@ -128 +149 @@
         
     end % for all channels
+    eventData.timing=datenum([ dateStr timeStr],'YYYYmmDDHHMMSS');    
     
     fprintf(fid,'</TR>');
@@ -142 +164 @@
     fclose(fid);
     
-    mamboDataIncluded=0;
-    save(fnameMat,'eventData','dateAnalysed','mamboDataIncluded');
+    save(fnameMat,'eventData','dateAnalysed');