Changeset 457 in ETALON for SPESO

Timestamp:

Apr 7, 2016, 10:41:51 AM (8 years ago)

Author:

malovyts

Message:

Fixed last 24 hours on the main page; fixed directory name for next day SOLEIL status in the day info page

Location:

SPESO/ana2015

Files:

• analyse_day.m (modified) (1 diff)
• data_select.m (modified) (3 diffs)

SPESO/ana2015/analyse_day.m

@@ -263 +263 @@
                   end; % is it is past 20:00
                   if datenum(dateStr, 'yyyymmdd')+1+8/24<now
-                          imgName = ['soleil_status_' datestr(datenum(dateStr, 'yyyymmdd')+1,  'yyyymmdd') '_08.png'];
-                          fprintf(fid, [ '<A HREF="' imgName '" >' ...
-                                                                  '<IMG SRC="' imgName '" WIDTH=' num2str(imageSizes) ' >' ...
+                          dateStrNext=datestr(datenum(dateStr, 'yyyymmdd')+1,  'yyyymmdd');
+                          imgName = ['soleil_status_' dateStrNext '_08.png'];
+                          fprintf(fid, [ '<A HREF="../' dateStrNext '/' imgName '" >' ...
+                                                                  '<IMG SRC="../' dateStrNext '/' imgName '" WIDTH=' num2str(imageSizes) ' >' ...
                                                                   '</A>\n' ] );
              end; % if it is less than 24 hours ago

SPESO/ana2015/data_select.m

@@ -20 +20 @@
             dataArray=allData.hoursNum; 
             case 11
-            dataArray=allData.timestamp-floor(now);
+            dataArray=allData.timestamp-now;
         end;
    case dvar.BEAMINFO
@@ -27 +27 @@
         switch varidx
             case 1
-        dataArray=allData.ch2signalValLPM(:);
+            dataArray=allData.ch2signalValLPM(:);
             case 2
             dataArray=allData.ch2signalNegPeakLPM(:);
@@ -42 +42 @@
                         fix(mod(allData.hoursNum(:),10000)/100)+...
                         mod(allData.hoursNum(:),100)/60), 30);
+            case 41
+            RS_params=get_RS_params(allData.timestamp); 
+            dataArray=allData.beamInfo(:,5)-RS_params.RS1_offset.';
+            case 42
+            RS_params=get_RS_params(allData.timestamp); 
+            dataArray=allData.beamInfo(:,7)-RS_params.RS2_offset.';
+            case 43
+            RS_params=get_RS_params(allData.timestamp); 
+            dataArray=allData.beamInfo(:,9)-RS_params.RS3_offset.';
+            case 44
+            RS_params=get_RS_params(allData.timestamp); 
+            dataArray=allData.beamInfo(:,11)-RS_params.RS4_offset.';
             otherwise
                 warning_sp([ 'The varidx ' varidx ' is unknown.' ]);