Changeset 344 in ETALON

Timestamp:

Mar 1, 2016, 6:08:54 PM (9 years ago)

Author:

malovyts

Message:

Fixed scatter_2d to give plot handle as output

File:

• SPESO/ana2015/data_scatter2d.m (modified) (1 diff)

SPESO/ana2015/data_scatter2d.m

@@ -1 @@
-function data_scatter2d(var1,var2,repeat_frequency)
+function sch = data_scatter2d(var1,var2,repeat_frequency)
 
-global allData;
+        global allData;
 
-[valsused,vals]=data_get_vals(var1,var2);
+        [valsused,vals]=data_get_vals(var1,var2);
 
-if nargin>2
-        vals(1,:)=mod(vals(1,:),repeat_frequency);
-end
+        if nargin>2
+                vals(1,:)=mod(vals(1,:),repeat_frequency);
+        end
 
-if (isempty(vals(1,:))||isempty(vals(2,:)))
-  warning_sp([ ' Warning one of the two variable is empty: ' length(vals(1,:)) ' / '  length(vals(2,:))  ])
-else
-hold on
-if (valsused(4,1))
-   scatter(vals(1,:),vals(2,:),'red')
-   scatter(vals(1,:),-10*vals(4,:),'blue','+')
-   legend('Det. 1','Det. 2 x-10', 'Location','Best')
-   else
-   scatter(vals(1,:),vals(2,:), 'red','+')
-end % there is a var in pos 4
+        if (isempty(vals(1,:))||isempty(vals(2,:)))
+                  warning_sp([ ' Warning one of the two variable is empty: ' length(vals(1,:)) ' / '  length(vals(2,:))  ])
+                else
+                hold on
+                if (valsused(4,1))
+                   sch(1) = scatter(vals(1,:),vals(2,:),'red')
+                   sch(2) = scatter(vals(1,:),-10*vals(4,:),'blue','+')
+                   legend('Det. 1','Det. 2 x-10', 'Location','Best')
+                   else
+                   sch = scatter(vals(1,:),vals(2,:), 'red','+')
+                end % there is a var in pos 4
 
-title({ [ get_var_name(var1) ' vs ' get_var_name(var2) ];allData.selection})
-xlabel(get_var_name(var1))
-ylabel(get_var_name(var2))
-end %not empty
+                title({ [ get_var_name(var1) ' vs ' get_var_name(var2) ];allData.selection})
+                xlabel(get_var_name(var1))
+                ylabel(get_var_name(var2))
+        end %not empty
 end %function