Changeset 408 in ETALON for SPESO

Timestamp:

Mar 24, 2016, 6:44:09 PM (8 years ago)

Author:

malovyts

Message:

Taken out some parts as external functions

File:

• SPESO/ana2015/analyse_dayInfo.m (modified) (3 diffs)

SPESO/ana2015/analyse_dayInfo.m

@@ -1 +1 @@
 function analyse_dayInfo(date_str, figure_idx)
+% analyse yyyymmdd.dayInfo file
         global basedir;
         global imageSizes;
@@ -21 +22 @@
 
         % turn off figure windows
-        set(0, 'DefaultFigureVisible', 'off');
+        %set(0, 'DefaultFigureVisible', 'off');
 
         data_types=[dvar.DATA1_VAL_LPM dvar.DATA2_VAL_LPM dvar.DATA1_VAL_SPM dvar.DATA2_VAL_SPM];
         data_names={'LPM det.1','LPM det.2','SPM det.1','SPM det.2'};
 
-        load_analysis_data([date_str '.dayInfo']);
-        if length(allData.selected)==0
-                display(['No events to analyse on ' date_str]);
-                return;
-        end;
 
-        for iloop=1:length(data_types)
-                
-                % get mean signal and bg for all day
+        % if there is no file to load
+        try     
+          load_analysis_data([date_str '.dayInfo']);
+        catch
+           display(['No events to analyse on ' date_str]);
+           return;
+        end
 
-                fih=figure('visible', 'off');
-                        bin=data_histc(dvar.DATA_TIME_MINUTES, data_types(iloop),...
-                                                                {{{dvar.DATA_TIME_30, '>', 6},{dvar.DATA_TIME_30, '<', 20}},...
-                                                                 {{dvar.DATA_TIME_30, '>', 25}}}, [0 24*60]);
-                close(fih);
-
-                signalMean(iloop)=abs(bin.bins1(1,1));
-                bgMean(iloop)=abs(bin.bins2(1,1));
-                signalRMS(iloop)=abs(bin.bins1(3,1));
-                bgRMS(iloop)=abs(bin.bins2(3,1));
-        end; % iloop
-
-        % check if signal is within errors of bg 
-        if (length(find(signalMean-(bgMean+bgRMS)<0)))
-                %write allert into a file
-                alert_problem(alertVar.SIGNAL_BAD, date_str,...
-                 [get_var_name(data_type) '; ' ...
-                  'Between ' num2str(hours(hour_loop)*hours_multi)...
-                  'th and ' num2str((hours(hour_loop)+1)*hours_multi) 'th hour']);
-        end % if bad signal
-
-        % figure signal and bg with errorbars for each detector
         fih = figure(figure_idx); % scatter
-                hold on
-                        errorbar(signalMean, signalRMS, 'ro');
-                        errorbar(bgMean, bgRMS, 'bo' );
-                hold off
-                        legend('Signal', 'Background', 'Location', 'best')
-                set(gca, 'XTick', [1 2 3 4]);
-                set(gca, 'XTickLabel', data_names)
-                ylabel('Absolute value');
-                title({'Signal selection, background selection';...
-                                 'whole day';...
-                                ['Data for ' date_str(1:4) '/' date_str(5:6) '/' date_str(7:8) char(10)]});
+                clf
+                analyse_dataContrast(); 
                 print(fih, [ basedirfigures  'analysis_figure_' num2str(figure_idx) '.png'], '-dpng');
         close(fih);
@@ -112 +81 @@
                 %--------------------------------------------------
 
-                %Save selection
-                selected_data=allData.selected;
 
                 %====== Colored plot of data within 30 minutes =======
                 fih = figure(dataloop);
                         clf
-                        plot_handle = data_scatter2d(dvar.DATA_TIME_30, data_types(dataloop));
-                        set(plot_handle, 'MarkerEdgeColor','k');
-                        
-
-                        % selecting signal in time intervals
-                        % > maximum time of signal rise,
-                        % < minimum time of signal drop
-
-                        data_select(dvar.DATA_TIME_30, '<', 20);
-                        data_select(dvar.DATA_TIME_30, '>', 10);
-                        hold on
-                                plot_handle = data_scatter2d(dvar.DATA_TIME_30, data_types(dataloop));
-                                set(plot_handle, 'MarkerEdgeColor','r');
-                                set(plot_handle, 'MarkerFaceColor','r');
-                        hold off
-                        
-                        % virtually reset selection     
-                        allData.selected=selected_data;
-                        
-                        %selecting background in time intervals
-                        % > maximum time of signal drop
-                        % < end of range
-                        
-                        data_select(dvar.DATA_TIME_30, '>', 27);
-                        hold on
-                                plot_handle = data_scatter2d(dvar.DATA_TIME_30, data_types(dataloop));
-                                set(plot_handle, 'MarkerEdgeColor','b');
-                                set(plot_handle, 'MarkerFaceColor','b');
-                        hold off
+                        data_scatter30min(data_types(dataloop));        
                 print(fih,'-dpng',[ basedirfigures 'analysis_figure_' num2str(figure_idx+16+dataloop) '.png' ]);
                 close(fih);