Changeset 445 in ETALON

Timestamp:

Mar 31, 2016, 5:55:20 PM (9 years ago)

Author:

malovyts

Message:

Changed order of data rows and fixed SOLEIL status plots

File:

• SPESO/ana2015/analyse_day.m (modified) (7 diffs)

SPESO/ana2015/analyse_day.m

@@ -169 +169 @@
 analyse_dayInfo(dateStr, 200);
 
+%=====================  Copy SOLEIL status imgs =============================
+        imgName1 = ['soleil_status_' dateStr '_08.png'];
+        [result errmsg]=copyfile( [ basedir '/' dateStr  '/' imgName1 ] ,...
+                                                                                         [ plots_basedir '/' dateStr  '/' imgName1 ] );
+        if datenum(dateStr, 'yyyymmdd')+20/24<now
+        imgName1 = ['soleil_status_' dateStr '_20.png'];
+        [result errmsg]=copyfile( [ basedir '/' dateStr  '/' imgName1 ] ,...
+                                                                                         [ plots_basedir '/' dateStr  '/' imgName1 ] );
+        end; % if data for 20 hours exist 
+% ---------------------------------------------------------------------------
+
 %%% HTML file
 
 
-% page for each hour
+% ================================== page for 00 - 23 hours ========================== 
     for ihour=0:23
       %ihour=24 => full day
@@ -221 +232 @@
         analyse_day_html_generalFooter(fid);    
     end %for each hour
-
-% daily pages
-% page for general info
+% --------------------------------- page for 00 - 23 hours ------------------------------
+
+% ============================== page for general info ==================================
         fhtmlname_general=[ plots_basedir dateStr  '/'  'info_daily.html' ];
         
         titleStr = [ 'SPESO - 1-day - ' dateStr ];
-        
+
+        % HEADER        
         fid=analyse_day_html_generalHeader(fhtmlname_general, titleStr, dateStr);
-        fprintf(fid,'<HR>');
+
+        fprintf(fid,'<HR>'); % -------------------------------------------
         fprintf(fid,[ '<BR/> nData= ' num2str(nDataNum)...
                       ' / nShots= ' num2str(nShots)...
@@ -235 +248 @@
         fprintf(fid,'<HR>');% ---------------------------------------------------
         %online analysis
+
+        % ======================== SOLEIL status images  ===================================
+                  if datenum(dateStr, 'yyyymmdd')+8/24<now
+                          imgName = ['soleil_status_' dateStr '_08.png'];
+                          fprintf(fid, [ '<A HREF="' imgName '" >' ...
+                                                                  '<IMG SRC="' imgName '" WIDTH=' num2str(imageSizes) ' >' ...
+                                                                  '</A>\n' ] );
+                  end; % % is it is past 08:00
+                  if datenum(dateStr, 'yyyymmdd')+20/24<now
+                          imgName = ['soleil_status_' dateStr '_20.png'];
+                          fprintf(fid, [ '<A HREF="' imgName '" >' ...
+                                                                  '<IMG SRC="' imgName '" WIDTH=' num2str(imageSizes) ' >' ...
+                                                                  '</A>\n' ] );
+                  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) ' >' ...
+                                                                  '</A>\n' ] );
+             end; % if it is less than 24 hours ago
+        % -------------------------- END SOLEIL status---------------------------------------
+
+        % ====================== data contrast for 4 data types =============================
         imgname=[ 'analysis_figure_' num2str(200) '.png' ];
-        fprintf(fid, [ '<A HREF="' imgname '" ><IMG SRC="' imgname '" WIDTH=' num2str(imageSizes) ' ></A>\n' ] );
+        fprintf(fid, [ '<A HREF="' imgname '" >' ...
+                                                          '<IMG SRC="' imgname '" WIDTH=' num2str(imageSizes) ' >' ...
+                                                          '</A>\n' ] );
+        % -----------------------------------------------------------------------------------
+
+        %============================= if full data exists      =================================
+        if (nFullShots>0)
+         for ifig=[1]
+           imgname=[ 'analysis_figure_' num2str(ifig) '.png' ];
+           fprintf(fid, [ '<A HREF="' imgname '" >' ...
+                                                                  '<IMG SRC="' imgname '" WIDTH=' num2str(imageSizes) ' >' ...
+                                                                  '</A>\n' ] );
+         end % for each figure
+        end %if nFullShots>0
+        % ----------------------------------- full data --------------------------------------
+
+        % ================================== data in table ===================================
         fprintf(fid,'<table>');
-        for irow=0:4
+        % irow
+        % 0 - all data scatter
+        % 1 - histc bin width - 30 min
+        % 2 - histc bin width - 8 hours
+        % 3 - histo binarized values
+        % 4 - scatter 30 min
+        for irow=[4 3 0 1 2]
              fprintf(fid,'<tr>');
                 for ifig=[201+irow*4:204+irow*4]
                    imgname=[ 'analysis_figure_' num2str(ifig) '.png' ];
                    fprintf(fid,'<td>');
-                   fprintf(fid, [ '<A HREF="' imgname '" ><IMG SRC="' imgname '" WIDTH=' num2str(imageSizes) ' ></A>\n' ] );
+                   fprintf(fid, [ '<A HREF="' imgname '" >' ...
+                                                                '<IMG SRC="' imgname '" WIDTH=' num2str(imageSizes) ' >' ...
+                                                                '</A>\n' ] );
                    fprintf(fid,'<td>');
                 end % for each figure
@@ -249 +309 @@
         end; % irow
         fprintf(fid,'</table>');
+
+        % ----------------------------------- end table  ------------------------------------
         
-        if (nFullShots>0)
-         for ifig=[1,101,111:112]
-           imgname=[ 'analysis_figure_' num2str(ifig) '.png' ];
-           fprintf(fid, [ '<A HREF="' imgname '" ><IMG SRC="' imgname '" WIDTH=' num2str(imageSizes) ' ></A>\n' ] );
-         end % for each figure
-        end %if nFullShots>0
         fprintf(fid,'<HR>');% ---------------------------------------------------
 
         analyse_day_html_generalFooter(fid);
-% page with hourly plots
+% --------------------------------- end daily general info ---------------------------------
+
+% =============================== page with hourly plots ===================================
         fhtmlname_hours=[ plots_basedir dateStr  '/'  'info_daily_hours.html' ];
         
@@ -276 +334 @@
 
         analyse_day_html_generalFooter(fid);
-
-% page with shot tables
+% -------------------------------- end hourly plot -----------------------------------------
+
+% ============================== page with shot tables ======================================
         fhtmlname_tables=[ plots_basedir dateStr  '/'  'info_daily_tables.html' ];
 
@@ -319 +378 @@
 
         analyse_day_html_generalFooter(fid);
-
-% page for shots
+% -------------------------------- end page with table of shots --------------------------------
+
+% ===================================== page for shots ========================================
 
         fhtmlname_shots=[ plots_basedir dateStr  '/'  'info_daily_shots.html' ];
@@ -336 +396 @@
 
         analyse_day_html_generalFooter(fid);
-
+% ------------------------------------ end page with shots -------------------------------------