Changeset 417 in ETALON for SPESO

Timestamp:

Mar 30, 2016, 3:54:39 PM (8 years ago)

Author:

malovyts

Message:

Fixed colorplot empty cells

File:

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

SPESO/ana2015/data_colorplot.m

@@ -1 @@
-function data_colorplot(var1,var2, magnitude_var, edges1, edges2)
+function bin_surf = data_colorplot(var1,var2, magnitude_var, edges1, edges2)
 
 global allData;
@@ -26 +26 @@
   return
 end;
+        % if edges are not defined
         if nargin<4
         left_edge1=(min(vals1)-abs(min(vals))*0.1);
@@ -47 +48 @@
         pos2=(edges2(1:end-1)+edges2(2:end))./2;
 
+        bin_width1=mean(diff(abs(edges1)));
+        bin_width2=mean(diff(abs(edges2)));
+
         for bin_loop1=1:length(edges1)-1
          for bin_loop2=1:length(edges2)-1       
+           % selected data points in two ranges
            idxs1=find(vals1>=edges1(bin_loop1)&vals1<edges1(bin_loop1+1));
            idxs2=find(vals2>=edges2(bin_loop2)&vals2<edges2(bin_loop2+1));
+           % find crossection of selection
            idxx=intersect(idxs1,idxs2);
 
-           bin_surf(bin_loop1, bin_loop2,1)=mean(magnitude(idxx));
-           bin_surf(bin_loop1, bin_loop2,2)=rms(magnitude(idxx)-bin_surf(bin_loop1, bin_loop2,1));
-           bin_surf(bin_loop1, bin_loop2,3)=length(magnitude(idxx));
+                % if there is no selected point
+                if length(idxx)>0
+                        bin_surf(bin_loop1, bin_loop2,1)=mean(magnitude(idxx));
+                        bin_surf(bin_loop1, bin_loop2,2)=rms(magnitude(idxx)-bin_surf(bin_loop1, bin_loop2,1));
+                        bin_surf(bin_loop1, bin_loop2,3)=length(idxx);
+                else
+                        bin_surf(bin_loop1, bin_loop2,1)=0;
+                        bin_surf(bin_loop1, bin_loop2,2)=0;
+                        bin_surf(bin_loop1, bin_loop2,3)=0;
+                end;
           
          end;% binloop2
@@ -62 +75 @@
         min_magnitude=min(magnitude);
         color_coeff=(max(magnitude)-min(magnitude));
-        colors=round((magnitude-min_magnitude)./color_coeff.*255)+1;
+        colors=round((bin_surf(:, :,1)-min_magnitude)./color_coeff.*255)+1;
         color_to_magn=@(color_in)((color_in-1)/255*color_coeff+min_magnitude);
+        
+        colors_row=reshape(colors.',1,length(pos1)*length(pos2));       
+
         tick5=sprintf('%4.2e',(color_to_magn(250)));
         tick4=sprintf('%4.2e',(color_to_magn(200)));
@@ -71 +87 @@
         %tick6=sprintf('%4.2e',magnitude(find(colors==0)));
 
+        posx=reshape(repmat(pos1, length(pos2), 1),1,length(pos1)*length(pos2));
+        posx_vert=[posx-bin_width1/2;posx+bin_width1/2;posx+bin_width1/2;posx-bin_width1/2];
+        
+        posy=repmat(pos2, 1, length(pos1));
+        posy_vert=[posy-bin_width2/2;posy-bin_width2/2;posy+bin_width2/2;posy+bin_width2/2];
+
         hold on
-        contourf(pos1,pos2, bin_surf(:,:,1).',20);
-        sch = scatter(repmat(pos1, 1, length(pos2)),repmat(pos2, 1, length(pos1)),...
-                       'o', 'filled', 'MarkerFaceColor', 'white', 'MarkerEdgeColor', 'black');
+        patch(posx_vert,posy_vert,colors_row)%, bin_surf(:,:,1).',20);
+        sch = scatter(reshape(repmat(pos1, length(pos2), 1),1,length(pos1)*length(pos2)),repmat(pos2, 1, length(pos1)), 0.2, ...
+                       '+', 'MarkerFaceColor', 'white', 'MarkerEdgeColor', 'white');
         hold off
         cbh = colorbar('v');%, 'YTickLabel',{tick1, tick2, tick3, tick4, tick5, tick6})