Changeset 508 in ETALON for SPESO

Timestamp:

Apr 21, 2016, 2:08:16 PM (8 years ago)

Author:

malovyts

Message:

Modified data_histc

File:

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

SPESO/ana2015/data_histc.m

@@ -31 +31 @@
 selection_text2 = allData.selection;
 
+
 %allData.selection = [baseSelection selection_text1 selection_text2];
 allData.selection = [baseSelection];
@@ -52 +53 @@
 vals2=vals2(2,:);
 
+
+bins1=zeros(4,length(edges)-1);
+bins2=zeros(4,length(edges)-1);
+
+
 for bin_loop=1:length(edges)-1
  idxs1=find(pos1>=edges(bin_loop)&pos1<edges(bin_loop+1));
  idxs2=find(pos2>=edges(bin_loop)&pos2<edges(bin_loop+1));
-bins1(1,bin_loop)=mean(vals1(idxs1));
-bins1(2,bin_loop)=(edges(bin_loop)+edges(bin_loop+1))/2;
-bins1(3,bin_loop)=rms(vals1(idxs1)-bins1(1,bin_loop));
-bins1(4,bin_loop)=length(vals1(idxs1));
-
-bins2(1,bin_loop)=mean(vals2(idxs2));
-bins2(2,bin_loop)=(edges(bin_loop)+edges(bin_loop+1))/2;
-bins2(3,bin_loop)=rms(vals2(idxs2)-bins2(1,bin_loop));
-bins2(4,bin_loop)=length(vals2(idxs2));
+        if length(idxs1>0)
+                bins1(1,bin_loop)=mean(vals1(idxs1));
+                bins1(3,bin_loop)=rms(vals1(idxs1)-bins1(1,bin_loop));
+                bins1(4,bin_loop)=length(vals1(idxs1));
+        end;
+                bins1(2,bin_loop)=(edges(bin_loop)+edges(bin_loop+1))/2;
+        if length(idxs2>0)
+                bins2(1,bin_loop)=mean(vals2(idxs2));
+                bins2(3,bin_loop)=rms(vals2(idxs2)-bins2(1,bin_loop));
+                bins2(4,bin_loop)=length(vals2(idxs2));
+        end;
+                bins2(2,bin_loop)=(edges(bin_loop)+edges(bin_loop+1))/2;
 end;
-
-output.bins1=bins1;
-output.bins2=bins2;
 
 subplot('Position', [0.1 0.30 0.8 0.55]);
 %subplot(3,1,[1:2]);
+
 hold on
    bar(bins1(2,:),bins1(1,:),'FaceColor', [0.8 0.5 0.5]);
@@ -78 +85 @@
 hold off
 legend(selection_text1, selection_text2, selection_text1, selection_text2, 'Location','southoutside');
+
 title({ [ get_var_name(var1) ' vs ' get_var_name(var2) ];allData.selection});
 
-xlabel(get_var_name(var1));
+xlabel([get_var_name(var1) char(10) ' ']);
 ylabel(get_var_name(var2));
 
@@ -90 +98 @@
 hold off
 legend(selection_text1, selection_text2, 'Location','southoutside');
-xlabel(get_var_name(var1));
+xlabel([get_var_name(var1) char(10) ' ']);
 ylabel('Number of points in bin');
 
@@ -96 +104 @@
 allData.selection=baseSelection;
 
+output.bins1=bins1;
+output.bins2=bins2;
+output.sel_txt1=selection_text1;
+output.sel_txt2=selection_text1;
+output.title={ [ get_var_name(var1) ' vs ' get_var_name(var2) ];allData.selection};
+
 end %function