Changeset 505 in ETALON for SPESO

Timestamp:

Apr 21, 2016, 1:57:04 PM (8 years ago)

Author:

malovyts

Message:

Fixed bugs in the colorplot

File:

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

SPESO/ana2015/data_colorplot.m

@@ -1 @@
-function bin_surf = data_colorplot(var1,var2, magnitude_var, edges1, edges2)
+function out_vars = data_colorplot(var1,var2, magnitude_var, edges1, edges2)
 
 global allData;
@@ -72 +72 @@
          end;% binloop2
         end; % binloop1
-        
-        min_magnitude=min(magnitude);
-        color_coeff=(max(magnitude)-min(magnitude));
+
+                
+        min_magnitude=min(min(bin_surf(:,:,1)));
+        color_coeff=(max(max(bin_surf(:,:,1)))-min_magnitude);
         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));       
+        colors_row=reshape(colors.',1,length(pos1)*length(pos2));
 
         tick5=sprintf('%4.2e',(color_to_magn(250)));
@@ -85 +86 @@
         tick2=sprintf('%4.2e',(color_to_magn(100)));
         tick1=sprintf('%4.2e',(color_to_magn(50)));
-        %tick6=sprintf('%4.2e',magnitude(find(colors==0)));
 
         posx=reshape(repmat(pos1, length(pos2), 1),1,length(pos1)*length(pos2));
@@ -93 +93 @@
         posy_vert=[posy-bin_width2/2;posy-bin_width2/2;posy+bin_width2/2;posy+bin_width2/2];
 
-        hold on
         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
+%       sch = scatter(reshape(repmat(pos1, length(pos2), 1),1,length(pos1)*length(pos2)),...
+%                             repmat(pos2, 1, length(pos1)), 0.2, ...
+%                      '+', 'MarkerFaceColor', 'white', 'MarkerEdgeColor', 'white');
         cbh = colorbar('v');%, 'YTickLabel',{tick1, tick2, tick3, tick4, tick5, tick6})
-        %set(cbh,'YTick',[0:50:250])
+        set(cbh,'YTick',[50:50:250])
         set(cbh,'YTickLabel',{tick1, tick2, tick3, tick4, tick5})
         title({ [ get_var_name(var1) ' vs ' get_var_name(var2) ]; get_var_name(magnitude_var);allData.selection})
         xlabel(get_var_name(var1))
         ylabel(get_var_name(var2))
+
+        out_vars.bins=bin_surf;
+        out_vars.s=pos1;
+        out_vars.x=pos2;
+
 end %function