Merge branch 'master' into coverney.excel

Author: coverney

template_analysis/plusminus_template.m

@@ -28,18 +28,20 @@
 % If your distribution is more complex or less complex, you can change the number of components
 % AP=setNumGaussianComponents(AP,3);
 
-% Make a map of the batches of plus/minus comparisons to test
+% Make a map of the batches comparisons to test, add in a list of batch
+% names (e.g., {'+', '-'}) to signify possible sets.
 % This analysis supports two variables: a +/- variable and a "tuning" variable
 stem1011 = '../example_assay/LacI-CAGop_';
 batch_description = {...
- {'Lows';'BaseDox';
+ {'Lows';'BaseDox';{'+', '-', 'control'};
   % First set is the matching "plus" conditions
-  {0.1,  {[stem1011 'B9_P3.fcs']}; % Replicates go here, e.g., {[rep1], [rep2], [rep3]}
-   0.2,  {[stem1011 'B10_P3.fcs']}};
-  % Second set is the matching "minus" conditions 
+  {0.1,  {[stem1011 'C3_P3.fcs']}; % Replicates go here, e.g., {[rep1], [rep2], [rep3]}
+   0.2,  {[stem1011 'C4_P3.fcs']}};
   {0.1,  {[stem1011 'B3_P3.fcs']};
    0.2,  {[stem1011 'B4_P3.fcs']}}};
- {'Highs';'BaseDox';
+  {0.1,  {[stem1011 'B9_P3.fcs']}; 
+   0.2,  {[stem1011 'B10_P3.fcs']}};
+ {'Highs';'BaseDox';{'+', '-'};
   {10,   {[stem1011 'C3_P3.fcs']};
    20,   {[stem1011 'C4_P3.fcs']}};
   {10,   {[stem1011 'B9_P3.fcs']};
@@ -55,7 +57,7 @@
     TASBEConfig.set('OutputSettings.StemName',batch_description{i}{1});
     TASBEConfig.set('OutputSettings.DeviceName',device_name);
     TASBEConfig.set('OutputSettings.PlotTickMarks',1);
-    plot_plusminus_comparison(results{i})
+    plot_plusminus_comparison(results{i}, batch_description{i}{3});
 end
 
 save('-V7','LacI-CAGop-plus-minus.mat','batch_description','AP','results');

template_analysis/transfercurve_template.m

@@ -59,6 +59,7 @@
 
 % Plot how the constitutive fluorescence was distributed
 TASBEConfig.set('OutputSettings.DeviceName',device_name);
+TASBEConfig.set('histogram.displayLegend',false);
 plot_bin_statistics(sampleresults);
 
 % Plot the relation between inducer and input fluorescence