Skip to content

Commit

Permalink
Merge branch 'develop' into tutorial.ltiberio.bug86
Browse files Browse the repository at this point in the history
  • Loading branch information
Lisa Tiberio committed Nov 15, 2017
2 parents e9cd2c7 + 4d96301 commit 87a3b21
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 3 deletions.
3 changes: 3 additions & 0 deletions template_analysis/batch_template.m
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
AP=setPemDropThreshold(AP,5');
% Add autofluorescence back in after removing for compensation?
AP=setUseAutoFluorescence(AP,false');
% By default, analysis tries to fit constitutive to transformed and non-transformed components
% If your distribution is more complex or less complex, you can change the number of components
% AP=setNumGaussianComponents(AP,3);

% Make a map of condition names to file sets
stem1011 = '../example_assay/LacI-CAGop_';
Expand Down
1 change: 0 additions & 1 deletion template_analysis/plots/placeholder.txt

This file was deleted.

3 changes: 3 additions & 0 deletions template_analysis/plusminus_template.m
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
AP=setPemDropThreshold(AP,5');
% Add autofluorescence back in after removing for compensation?
AP=setUseAutoFluorescence(AP,false');
% By default, analysis tries to fit constitutive to “transformed” and “non-transformed” components
% 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
% This analysis supports two variables: a +/- variable and a "tuning" variable
Expand Down
3 changes: 3 additions & 0 deletions template_analysis/transfercurve_template.m
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@
AP=setPemDropThreshold(AP,5');
% Add autofluorescence back in after removing for compensation?
AP=setUseAutoFluorescence(AP,false');
% By default, analysis tries to fit constitutive to “transformed” and “non-transformed” components
% If your distribution is more complex or less complex, you can change the number of components
% AP=setNumGaussianComponents(AP,3);

% Make a map of induction levels to file sets
stem1011 = '../example_assay/LacI-CAGop_';
Expand Down
2 changes: 1 addition & 1 deletion template_colormodel/make_color_model.m
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
channels{1} = Channel('FITC-A', 488, 515, 20);
channels{1} = setPrintName(channels{1}, 'EYFP'); % Name to print on charts
channels{1} = setLineSpec(channels{1}, 'y'); % Color for lines, when needed
colorfiles{1} = [stem0312 'EYFP_P3.fcs'];
colorfiles{1} = [stem0312 'EYFP_P3.fcs']; % If there is only one channel, the color file is optional

channels{2} = Channel('PE-Tx-Red-YG-A', 561, 610, 20);
channels{2} = setPrintName(channels{2}, 'mKate');
Expand Down
1 change: 0 additions & 1 deletion template_colormodel/plots/placeholder.txt

This file was deleted.

0 comments on commit 87a3b21

Please sign in to comment.