From 958c4847a1ef1cd6a4aa9a752e2b209efff7fd87 Mon Sep 17 00:00:00 2001 From: jakebeal Date: Sun, 11 Feb 2018 05:06:27 -0600 Subject: [PATCH 01/10] Remove redundant CSV production --- template_analysis/batch_template.m | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/template_analysis/batch_template.m b/template_analysis/batch_template.m index 7303e25..d8d5c20 100644 --- a/template_analysis/batch_template.m +++ b/template_analysis/batch_template.m @@ -52,20 +52,6 @@ TASBEConfig.set('OS.FixedInputAxis',[1e4 1e10]); plot_batch_histograms(results,sampleresults,{'b','y','r'},CM); -[statisticsFile, histogramFile] = serializeBatchOutput(file_pairs, CM, AP, sampleresults, '../'); +[statisticsFile, histogramFile] = serializeBatchOutput(file_pairs, CM, AP, sampleresults, 'LacI-CAGop-batch'); save('LacI-CAGop-batch.mat','AP','bins','file_pairs','results','sampleresults'); - -% Dump CSV files: -fprintf('Dumping CSV files\n'); -fid = fopen('LacI-CAGop-batch.csv','w'); -fprintf(fid,'Device ID,datapoints,,,log10 Mean,,,Std.Dev. of mean (fold)\n'); -fprintf(fid,',EBFP2,EYFP,mKate,EBFP2,EYFP,mKate,EBFP2,EYFP,mKate\n'); -for i=1:n_conditions - fprintf(fid,'%s,',file_pairs{i,1}); - fprintf(fid,'%d,',sum(results{i}.bincounts)); - fprintf(fid,'%d,',log10(results{i}.means)); - fprintf(fid,'%d,',results{i}.stdofmeans); - fprintf(fid,'\n'); -end -fclose(fid); From f0fcb801da6c541521661348c0207621d4900b38 Mon Sep 17 00:00:00 2001 From: jakebeal Date: Sun, 11 Feb 2018 06:22:28 -0600 Subject: [PATCH 02/10] update secondary bead channel example in template --- template_colormodel/make_color_model.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template_colormodel/make_color_model.m b/template_colormodel/make_color_model.m index 7079f91..adff50b 100644 --- a/template_colormodel/make_color_model.m +++ b/template_colormodel/make_color_model.m @@ -65,7 +65,7 @@ CM=set_translation_channel_min(CM,[2,2,2]); % When dealing with very strong fluorescence, use secondary channel to segment -%settings = setSetting(settings,'SecondaryBeadChannel','PE-Texas_Red-A'); +% TASBEConfig.set('SecondaryBeadChannel','PE-Tx-Red-YG-A'); CM = add_filter(CM,autogate); % Execute and save the model From 31a3356c308a8cbae5af8e873e59c8d2752f173e Mon Sep 17 00:00:00 2001 From: jakebeal Date: Sun, 11 Feb 2018 07:20:50 -0600 Subject: [PATCH 03/10] update use of serializeBatchOutput to reflect change to CSV naming, add CSVs --- .../LacI-CAGop_histogramFile.csv | 841 ++++++++++++++++++ .../LacI-CAGop_statisticsFile.csv | 15 + template_analysis/batch_template.m | 2 +- 3 files changed, 857 insertions(+), 1 deletion(-) create mode 100644 template_analysis/LacI-CAGop_histogramFile.csv create mode 100644 template_analysis/LacI-CAGop_statisticsFile.csv diff --git a/template_analysis/LacI-CAGop_histogramFile.csv b/template_analysis/LacI-CAGop_histogramFile.csv new file mode 100644 index 0000000..0602c1e --- /dev/null +++ b/template_analysis/LacI-CAGop_histogramFile.csv @@ -0,0 +1,841 @@ +ID,BinCenters,BinCount_FITC_A,BinCount_PE_Tx_Red_YG_A,BinCount_Pacific_Blue_A +Dox 0.1,11220.1845430196,6799,2200,1383 +,14125.3754462276,8012,2732,2696 +,17782.7941003892,8780,3327,2638 +,22387.2113856834,8563,4637,2632 +,28183.8293126445,7622,4623,3741 +,35481.3389233575,6328,5595,4708 +,44668.3592150964,3929,5939,5301 +,56234.1325190349,1815,6289,5435 +,70794.5784384137,511,5738,5800 +,89125.0938133746,124,4272,4745 +,112201.845430196,20,3096,4170 +,141253.754462276,4,2285,3253 +,177827.941003892,4,2339,2923 +,223872.113856834,2,2546,3272 +,281838.293126445,2,2845,3603 +,354813.389233575,1,3389,4013 +,446683.592150963,2,3757,4009 +,562341.325190349,1,4030,3976 +,707945.784384137,0,4246,4139 +,891250.938133746,0,4436,4189 +,1122018.45430196,0,4502,4183 +,1412537.54462276,0,4289,4099 +,1778279.41003892,0,4007,3881 +,2238721.13856834,0,3630,3826 +,2818382.93126445,0,3244,3684 +,3548133.89233575,0,2738,3506 +,4466835.92150963,0,2203,3230 +,5623413.25190349,0,1731,3040 +,7079457.84384139,0,1406,2598 +,8912509.38133746,0,989,2384 +,11220184.5430196,0,769,1921 +,14125375.4462275,0,493,1622 +,17782794.1003892,0,391,1341 +,22387211.3856834,0,214,990 +,28183829.3126445,0,150,802 +,35481338.9233575,0,101,633 +,44668359.2150963,0,59,420 +,56234132.5190349,0,39,269 +,70794578.4384137,0,16,177 +,89125093.8133746,0,10,122 +,112201845.430197,0,1,84 +,141253754.462275,0,1,48 +,177827941.003892,0,0,31 +,223872113.856835,0,0,12 +,281838293.126445,0,0,3 +,354813389.233576,0,0,1 +,446683592.150962,0,0,1 +,562341325.190349,0,0,0 +,707945784.38414,0,0,0 +,891250938.133744,0,0,0 +,1122018454.30197,0,0,0 +,1412537544.62275,0,0,0 +,1778279410.03892,0,0,0 +,2238721138.56835,0,0,0 +,2818382931.26445,0,0,0 +,3548133892.33576,0,0,0 +,4466835921.50962,0,0,0 +,5623413251.90349,0,0,0 +,7079457843.8414,0,0,0 +,8912509381.33744,0,0,0 +Dox 0.2,11220.1845430196,5394,1803,1120 +,14125.3754462276,6620,2302,2100 +,17782.7941003892,7208,2710,2199 +,22387.2113856834,6972,3827,2126 +,28183.8293126445,6208,3847,3063 +,35481.3389233575,5296,4635,3823 +,44668.3592150964,3051,4876,4406 +,56234.1325190349,1454,5102,4436 +,70794.5784384137,480,4575,4602 +,89125.0938133746,99,3347,3733 +,112201.845430196,9,2401,3293 +,141253.754462276,5,1871,2468 +,177827.941003892,4,1807,2393 +,223872.113856834,0,1994,2585 +,281838.293126445,1,2223,2840 +,354813.389233575,1,2551,3117 +,446683.592150963,1,2905,3209 +,562341.325190349,1,3238,3283 +,707945.784384137,0,3528,3260 +,891250.938133746,0,3654,3262 +,1122018.45430196,1,3532,3240 +,1412537.54462276,0,3473,3275 +,1778279.41003892,0,3312,3204 +,2238721.13856834,0,3039,3111 +,2818382.93126445,0,2562,3044 +,3548133.89233575,0,2249,2801 +,4466835.92150963,0,1789,2586 +,5623413.25190349,0,1456,2345 +,7079457.84384139,0,1072,2181 +,8912509.38133746,0,838,1804 +,11220184.5430196,0,626,1618 +,14125375.4462275,0,433,1264 +,17782794.1003892,0,312,1083 +,22387211.3856834,0,195,765 +,28183829.3126445,0,147,636 +,35481338.9233575,0,82,482 +,44668359.2150963,0,58,325 +,56234132.5190349,0,24,219 +,70794578.4384137,0,16,148 +,89125093.8133746,0,8,111 +,112201845.430197,0,2,57 +,141253754.462275,0,1,36 +,177827941.003892,0,0,23 +,223872113.856835,0,0,14 +,281838293.126445,0,0,7 +,354813389.233576,0,0,1 +,446683592.150962,0,0,1 +,562341325.190349,0,0,0 +,707945784.38414,0,0,0 +,891250938.133744,0,0,0 +,1122018454.30197,0,0,0 +,1412537544.62275,0,0,0 +,1778279410.03892,0,0,0 +,2238721138.56835,0,0,0 +,2818382931.26445,0,0,0 +,3548133892.33576,0,0,0 +,4466835921.50962,0,0,0 +,5623413251.90349,0,0,0 +,7079457843.8414,0,0,0 +,8912509381.33744,0,0,0 +Dox 0.5,11220.1845430196,5208,1718,1049 +,14125.3754462276,6346,2166,2074 +,17782.7941003892,6879,2661,1984 +,22387.2113856834,6809,3524,1991 +,28183.8293126445,5907,3526,2779 +,35481.3389233575,4900,4318,3659 +,44668.3592150964,2986,4657,4017 +,56234.1325190349,1339,4773,4313 +,70794.5784384137,426,4352,4301 +,89125.0938133746,95,3220,3480 +,112201.845430196,11,2280,3308 +,141253.754462276,5,1832,2471 +,177827.941003892,4,1848,2368 +,223872.113856834,1,1985,2539 +,281838.293126445,3,2166,2810 +,354813.389233575,1,2469,3102 +,446683.592150963,0,2944,3099 +,562341.325190349,1,3178,3140 +,707945.784384137,0,3460,3248 +,891250.938133746,0,3501,3255 +,1122018.45430196,0,3497,3317 +,1412537.54462276,0,3417,3098 +,1778279.41003892,0,3211,3176 +,2238721.13856834,0,2930,3082 +,2818382.93126445,0,2603,2991 +,3548133.89233575,0,2111,2752 +,4466835.92150963,0,1781,2510 +,5623413.25190349,0,1422,2359 +,7079457.84384139,0,1130,2173 +,8912509.38133746,0,863,1833 +,11220184.5430196,0,597,1530 +,14125375.4462275,1,408,1336 +,17782794.1003892,0,307,1028 +,22387211.3856834,0,198,807 +,28183829.3126445,0,145,626 +,35481338.9233575,0,68,484 +,44668359.2150963,0,64,353 +,56234132.5190349,0,30,226 +,70794578.4384137,0,17,156 +,89125093.8133746,0,7,100 +,112201845.430197,0,3,72 +,141253754.462275,0,1,45 +,177827941.003892,0,0,22 +,223872113.856835,0,0,10 +,281838293.126445,0,0,0 +,354813389.233576,0,0,0 +,446683592.150962,0,0,0 +,562341325.190349,0,0,0 +,707945784.38414,0,0,0 +,891250938.133744,0,0,0 +,1122018454.30197,0,0,0 +,1412537544.62275,0,0,0 +,1778279410.03892,0,0,0 +,2238721138.56835,0,0,0 +,2818382931.26445,0,0,0 +,3548133892.33576,0,0,0 +,4466835921.50962,0,0,0 +,5623413251.90349,0,0,0 +,7079457843.8414,0,0,0 +,8912509381.33744,0,0,0 +Dox 1.0,11220.1845430196,4733,1606,995 +,14125.3754462276,5587,1849,1798 +,17782.7941003892,5960,2279,1765 +,22387.2113856834,5866,3121,1708 +,28183.8293126445,5165,3201,2522 +,35481.3389233575,4307,3749,3145 +,44668.3592150964,2602,4053,3663 +,56234.1325190349,1140,4263,3647 +,70794.5784384137,385,3771,3695 +,89125.0938133746,83,2796,3079 +,112201.845430196,19,2064,2808 +,141253.754462276,8,1601,2121 +,177827.941003892,6,1567,1980 +,223872.113856834,5,1577,2219 +,281838.293126445,3,1860,2429 +,354813.389233575,1,2190,2796 +,446683.592150963,2,2580,2746 +,562341.325190349,1,2933,2762 +,707945.784384137,0,2956,2777 +,891250.938133746,0,3101,2880 +,1122018.45430196,0,3022,2760 +,1412537.54462276,0,2983,2733 +,1778279.41003892,0,2888,2814 +,2238721.13856834,0,2594,2815 +,2818382.93126445,0,2283,2594 +,3548133.89233575,0,1881,2534 +,4466835.92150963,0,1563,2295 +,5623413.25190349,0,1272,1991 +,7079457.84384139,0,970,1927 +,8912509.38133746,0,776,1698 +,11220184.5430196,0,512,1389 +,14125375.4462275,0,383,1174 +,17782794.1003892,0,259,955 +,22387211.3856834,0,178,809 +,28183829.3126445,0,133,581 +,35481338.9233575,0,82,390 +,44668359.2150963,0,48,308 +,56234132.5190349,0,36,174 +,70794578.4384137,0,19,147 +,89125093.8133746,0,3,94 +,112201845.430197,0,9,61 +,141253754.462275,0,0,35 +,177827941.003892,0,0,17 +,223872113.856835,0,0,13 +,281838293.126445,0,0,2 +,354813389.233576,0,0,0 +,446683592.150962,0,0,0 +,562341325.190349,0,0,0 +,707945784.38414,0,0,0 +,891250938.133744,0,0,0 +,1122018454.30197,0,0,0 +,1412537544.62275,0,0,0 +,1778279410.03892,0,0,0 +,2238721138.56835,0,0,0 +,2818382931.26445,0,0,0 +,3548133892.33576,0,0,0 +,4466835921.50962,0,0,0 +,5623413251.90349,0,0,0 +,7079457843.8414,0,0,0 +,8912509381.33744,0,0,0 +Dox 2.0,11220.1845430196,5180,1719,1029 +,14125.3754462276,6153,2090,2017 +,17782.7941003892,6676,2431,1971 +,22387.2113856834,6647,3509,2004 +,28183.8293126445,5794,3548,2774 +,35481.3389233575,4855,4246,3527 +,44668.3592150964,2891,4608,4021 +,56234.1325190349,1348,4941,4030 +,70794.5784384137,416,4351,4241 +,89125.0938133746,100,3138,3421 +,112201.845430196,28,2314,3178 +,141253.754462276,9,1801,2416 +,177827.941003892,9,1721,2274 +,223872.113856834,3,1955,2544 +,281838.293126445,6,2230,2855 +,354813.389233575,0,2571,3064 +,446683.592150963,1,2895,2999 +,562341.325190349,1,3040,3163 +,707945.784384137,0,3319,3188 +,891250.938133746,0,3388,3238 +,1122018.45430196,0,3363,3235 +,1412537.54462276,0,3356,3210 +,1778279.41003892,0,3101,3148 +,2238721.13856834,0,2849,3053 +,2818382.93126445,0,2527,2868 +,3548133.89233575,0,2059,2849 +,4466835.92150963,0,1749,2619 +,5623413.25190349,0,1389,2327 +,7079457.84384139,0,1041,2103 +,8912509.38133746,0,736,1826 +,11220184.5430196,0,535,1495 +,14125375.4462275,0,401,1284 +,17782794.1003892,0,274,1051 +,22387211.3856834,0,169,822 +,28183829.3126445,0,112,660 +,35481338.9233575,0,74,439 +,44668359.2150963,0,52,339 +,56234132.5190349,0,26,228 +,70794578.4384137,0,10,134 +,89125093.8133746,0,7,89 +,112201845.430197,0,1,60 +,141253754.462275,0,0,38 +,177827941.003892,0,0,27 +,223872113.856835,0,0,11 +,281838293.126445,0,0,4 +,354813389.233576,0,0,1 +,446683592.150962,0,0,0 +,562341325.190349,0,0,0 +,707945784.38414,0,0,0 +,891250938.133744,0,0,0 +,1122018454.30197,0,0,0 +,1412537544.62275,0,0,0 +,1778279410.03892,0,0,0 +,2238721138.56835,0,0,0 +,2818382931.26445,0,0,0 +,3548133892.33576,0,0,0 +,4466835921.50962,0,0,0 +,5623413251.90349,0,0,0 +,7079457843.8414,0,0,0 +,8912509381.33744,0,0,0 +Dox 5.0,11220.1845430196,5900,2101,1263 +,14125.3754462276,7179,2541,2305 +,17782.7941003892,7844,2934,2493 +,22387.2113856834,7869,4126,2343 +,28183.8293126445,6850,4112,3555 +,35481.3389233575,5619,5108,4179 +,44668.3592150964,3436,5350,4784 +,56234.1325190349,1675,5668,4868 +,70794.5784384137,614,5076,5061 +,89125.0938133746,165,3661,4131 +,112201.845430196,73,2715,3726 +,141253.754462276,52,2060,2681 +,177827.941003892,28,2047,2631 +,223872.113856834,20,2232,2929 +,281838.293126445,23,2559,3175 +,354813.389233575,13,3052,3534 +,446683.592150963,10,3329,3532 +,562341.325190349,5,3556,3587 +,707945.784384137,2,3919,3863 +,891250.938133746,4,3855,3685 +,1122018.45430196,3,3968,3577 +,1412537.54462276,2,3918,3640 +,1778279.41003892,1,3587,3713 +,2238721.13856834,1,3248,3637 +,2818382.93126445,0,2878,3404 +,3548133.89233575,0,2506,3232 +,4466835.92150963,0,2014,2892 +,5623413.25190349,0,1713,2799 +,7079457.84384139,0,1151,2518 +,8912509.38133746,0,832,2236 +,11220184.5430196,0,687,1835 +,14125375.4462275,0,468,1604 +,17782794.1003892,0,337,1299 +,22387211.3856834,0,176,999 +,28183829.3126445,0,139,772 +,35481338.9233575,0,83,574 +,44668359.2150963,0,65,371 +,56234132.5190349,0,27,261 +,70794578.4384137,0,15,192 +,89125093.8133746,0,10,125 +,112201845.430197,0,2,70 +,141253754.462275,0,0,45 +,177827941.003892,0,0,20 +,223872113.856835,0,0,20 +,281838293.126445,0,0,7 +,354813389.233576,0,0,1 +,446683592.150962,0,0,0 +,562341325.190349,0,0,0 +,707945784.38414,0,0,0 +,891250938.133744,0,0,0 +,1122018454.30197,0,0,0 +,1412537544.62275,0,0,0 +,1778279410.03892,0,0,0 +,2238721138.56835,0,0,0 +,2818382931.26445,0,0,0 +,3548133892.33576,0,0,0 +,4466835921.50962,0,0,0 +,5623413251.90349,0,0,0 +,7079457843.8414,0,0,0 +,8912509381.33744,0,0,0 +Dox 10.0,11220.1845430196,5695,1877,1117 +,14125.3754462276,6839,2310,2111 +,17782.7941003892,7434,2842,2253 +,22387.2113856834,7327,3869,2196 +,28183.8293126445,6321,3674,3142 +,35481.3389233575,5234,4592,3932 +,44668.3592150964,3149,4997,4419 +,56234.1325190349,1615,5241,4485 +,70794.5784384137,602,4612,4778 +,89125.0938133746,237,3619,3778 +,112201.845430196,112,2432,3408 +,141253.754462276,109,1924,2575 +,177827.941003892,67,1956,2441 +,223872.113856834,61,2147,2721 +,281838.293126445,48,2404,3094 +,354813.389233575,26,2700,3365 +,446683.592150963,17,3214,3386 +,562341.325190349,14,3572,3550 +,707945.784384137,15,3699,3479 +,891250.938133746,8,3956,3485 +,1122018.45430196,5,3864,3427 +,1412537.54462276,3,3703,3485 +,1778279.41003892,1,3494,3432 +,2238721.13856834,2,2967,3326 +,2818382.93126445,3,2725,3224 +,3548133.89233575,0,2250,2983 +,4466835.92150963,0,1798,2748 +,5623413.25190349,0,1560,2551 +,7079457.84384139,0,1180,2336 +,8912509.38133746,0,858,1985 +,11220184.5430196,0,599,1682 +,14125375.4462275,0,430,1463 +,17782794.1003892,0,328,1151 +,22387211.3856834,0,183,845 +,28183829.3126445,0,139,635 +,35481338.9233575,0,70,479 +,44668359.2150963,0,47,361 +,56234132.5190349,0,38,261 +,70794578.4384137,0,15,171 +,89125093.8133746,0,4,91 +,112201845.430197,0,4,71 +,141253754.462275,0,0,50 +,177827941.003892,0,0,34 +,223872113.856835,0,0,13 +,281838293.126445,0,0,4 +,354813389.233576,0,0,4 +,446683592.150962,0,0,0 +,562341325.190349,0,0,0 +,707945784.38414,0,0,0 +,891250938.133744,0,0,0 +,1122018454.30197,0,0,0 +,1412537544.62275,0,0,0 +,1778279410.03892,0,0,0 +,2238721138.56835,0,0,0 +,2818382931.26445,0,0,0 +,3548133892.33576,0,0,0 +,4466835921.50962,0,0,0 +,5623413251.90349,0,0,0 +,7079457843.8414,0,0,0 +,8912509381.33744,0,0,0 +Dox 20.0,11220.1845430196,5805,1951,1203 +,14125.3754462276,6863,2398,2185 +,17782.7941003892,7636,2840,2220 +,22387.2113856834,7401,3940,2259 +,28183.8293126445,6565,3962,3281 +,35481.3389233575,5606,4862,3976 +,44668.3592150964,3614,5281,4659 +,56234.1325190349,1992,5328,4816 +,70794.5784384137,995,4783,4888 +,89125.0938133746,586,3615,3890 +,112201.845430196,458,2532,3513 +,141253.754462276,369,1916,2624 +,177827.941003892,292,1912,2450 +,223872.113856834,224,2175,2747 +,281838.293126445,199,2459,3113 +,354813.389233575,133,2882,3463 +,446683.592150963,100,3392,3568 +,562341.325190349,75,3704,3627 +,707945.784384137,57,3807,3574 +,891250.938133746,36,3949,3676 +,1122018.45430196,28,4113,3567 +,1412537.54462276,21,3924,3613 +,1778279.41003892,17,3688,3612 +,2238721.13856834,15,3253,3485 +,2818382.93126445,8,2918,3306 +,3548133.89233575,5,2425,3093 +,4466835.92150963,0,1999,2894 +,5623413.25190349,3,1569,2690 +,7079457.84384139,2,1214,2416 +,8912509.38133746,1,874,2193 +,11220184.5430196,0,602,1835 +,14125375.4462275,0,439,1528 +,17782794.1003892,0,307,1259 +,22387211.3856834,1,184,1028 +,28183829.3126445,1,122,796 +,35481338.9233575,0,96,547 +,44668359.2150963,0,45,407 +,56234132.5190349,0,30,270 +,70794578.4384137,0,13,207 +,89125093.8133746,0,4,130 +,112201845.430197,0,1,73 +,141253754.462275,0,3,70 +,177827941.003892,0,0,27 +,223872113.856835,0,1,16 +,281838293.126445,0,0,3 +,354813389.233576,0,0,3 +,446683592.150962,0,0,0 +,562341325.190349,0,0,1 +,707945784.38414,0,0,0 +,891250938.133744,0,0,0 +,1122018454.30197,0,0,0 +,1412537544.62275,0,0,0 +,1778279410.03892,0,0,0 +,2238721138.56835,0,0,0 +,2818382931.26445,0,0,0 +,3548133892.33576,0,0,0 +,4466835921.50962,0,0,0 +,5623413251.90349,0,0,0 +,7079457843.8414,0,0,0 +,8912509381.33744,0,0,0 +Dox 50.0,11220.1845430196,4212,1514,887 +,14125.3754462276,5108,1916,1714 +,17782.7941003892,5732,2253,1710 +,22387.2113856834,5486,3201,1835 +,28183.8293126445,5054,3133,2508 +,35481.3389233575,4495,3840,3011 +,44668.3592150964,3228,4155,3513 +,56234.1325190349,1962,4243,3575 +,70794.5784384137,1364,3840,3667 +,89125.0938133746,1178,2839,3013 +,112201.845430196,1106,2103,2709 +,141253.754462276,975,1596,2104 +,177827.941003892,956,1633,1943 +,223872.113856834,871,1776,2212 +,281838.293126445,813,2035,2541 +,354813.389233575,701,2397,2895 +,446683.592150963,539,2823,2757 +,562341.325190349,453,3076,2793 +,707945.784384137,375,3150,2772 +,891250.938133746,239,3167,2845 +,1122018.45430196,198,3337,2829 +,1412537.54462276,147,3107,2830 +,1778279.41003892,125,2886,2812 +,2238721.13856834,101,2426,2649 +,2818382.93126445,58,2058,2694 +,3548133.89233575,47,1744,2428 +,4466835.92150963,19,1386,2354 +,5623413.25190349,24,1053,2100 +,7079457.84384139,9,789,1977 +,8912509.38133746,8,600,1739 +,11220184.5430196,4,388,1548 +,14125375.4462275,4,288,1321 +,17782794.1003892,1,193,1000 +,22387211.3856834,2,128,784 +,28183829.3126445,0,85,666 +,35481338.9233575,0,46,501 +,44668359.2150963,0,19,360 +,56234132.5190349,0,11,266 +,70794578.4384137,0,6,168 +,89125093.8133746,0,3,104 +,112201845.430197,0,0,84 +,141253754.462275,0,0,46 +,177827941.003892,0,0,27 +,223872113.856835,0,0,19 +,281838293.126445,0,0,9 +,354813389.233576,0,0,0 +,446683592.150962,0,0,0 +,562341325.190349,0,0,0 +,707945784.38414,0,0,0 +,891250938.133744,0,0,0 +,1122018454.30197,0,0,0 +,1412537544.62275,0,0,0 +,1778279410.03892,0,0,0 +,2238721138.56835,0,0,0 +,2818382931.26445,0,0,0 +,3548133892.33576,0,0,0 +,4466835921.50962,0,0,0 +,5623413251.90349,0,0,0 +,7079457843.8414,0,0,0 +,8912509381.33744,0,0,0 +Dox 100.0,11220.1845430196,4190,1609,895 +,14125.3754462276,5119,2012,1843 +,17782.7941003892,5576,2378,1904 +,22387.2113856834,5606,3312,1819 +,28183.8293126445,5075,3320,2576 +,35481.3389233575,4774,4005,3265 +,44668.3592150964,3407,4347,3676 +,56234.1325190349,2424,4423,3808 +,70794.5784384137,1645,4039,3945 +,89125.0938133746,1512,3056,3321 +,112201.845430196,1436,2263,2868 +,141253.754462276,1384,1880,2143 +,177827.941003892,1468,1808,2174 +,223872.113856834,1392,2162,2429 +,281838.293126445,1322,2449,2565 +,354813.389233575,1143,2744,2879 +,446683.592150963,979,3166,2910 +,562341.325190349,884,3277,2999 +,707945.784384137,683,3441,3058 +,891250.938133746,624,3574,3052 +,1122018.45430196,436,3377,3151 +,1412537.54462276,360,3233,3047 +,1778279.41003892,254,3010,2954 +,2238721.13856834,172,2447,2979 +,2818382.93126445,147,2067,2834 +,3548133.89233575,89,1607,2663 +,4466835.92150963,65,1345,2499 +,5623413.25190349,55,966,2348 +,7079457.84384139,41,714,2111 +,8912509.38133746,20,532,1883 +,11220184.5430196,12,386,1647 +,14125375.4462275,6,245,1424 +,17782794.1003892,1,174,1156 +,22387211.3856834,2,90,872 +,28183829.3126445,2,61,731 +,35481338.9233575,0,36,557 +,44668359.2150963,0,14,375 +,56234132.5190349,1,7,316 +,70794578.4384137,0,3,172 +,89125093.8133746,0,2,121 +,112201845.430197,0,2,65 +,141253754.462275,0,0,40 +,177827941.003892,0,0,26 +,223872113.856835,0,0,17 +,281838293.126445,0,0,7 +,354813389.233576,0,0,3 +,446683592.150962,0,0,0 +,562341325.190349,0,0,0 +,707945784.38414,0,0,0 +,891250938.133744,0,0,0 +,1122018454.30197,0,0,0 +,1412537544.62275,0,0,0 +,1778279410.03892,0,0,0 +,2238721138.56835,0,0,0 +,2818382931.26445,0,0,0 +,3548133892.33576,0,0,0 +,4466835921.50962,0,0,0 +,5623413251.90349,0,0,0 +,7079457843.8414,0,0,0 +,8912509381.33744,0,0,0 +Dox 200.0,11220.1845430196,4211,1818,1035 +,14125.3754462276,5101,2171,1909 +,17782.7941003892,5680,2636,2031 +,22387.2113856834,5813,3546,1971 +,28183.8293126445,5412,3761,2836 +,35481.3389233575,5074,4523,3576 +,44668.3592150964,3771,4906,3925 +,56234.1325190349,2747,5159,3972 +,70794.5784384137,2096,4609,4459 +,89125.0938133746,1876,3696,3621 +,112201.845430196,1949,2808,3326 +,141253.754462276,1995,2228,2430 +,177827.941003892,2196,2254,2329 +,223872.113856834,2101,2465,2657 +,281838.293126445,2049,2734,2842 +,354813.389233575,2009,3137,3170 +,446683.592150963,1855,3485,3210 +,562341.325190349,1577,3731,3389 +,707945.784384137,1335,3704,3374 +,891250.938133746,1207,3734,3281 +,1122018.45430196,916,3659,3432 +,1412537.54462276,826,3226,3423 +,1778279.41003892,675,2797,3222 +,2238721.13856834,483,2435,3349 +,2818382.93126445,368,2038,3213 +,3548133.89233575,280,1611,2942 +,4466835.92150963,199,1188,2721 +,5623413.25190349,161,897,2545 +,7079457.84384139,88,643,2321 +,8912509.38133746,57,435,1976 +,11220184.5430196,33,315,1772 +,14125375.4462275,23,226,1495 +,17782794.1003892,10,154,1224 +,22387211.3856834,4,96,944 +,28183829.3126445,3,52,703 +,35481338.9233575,3,25,522 +,44668359.2150963,1,24,423 +,56234132.5190349,0,8,257 +,70794578.4384137,0,7,155 +,89125093.8133746,0,0,117 +,112201845.430197,0,2,82 +,141253754.462275,0,0,50 +,177827941.003892,0,0,32 +,223872113.856835,0,0,13 +,281838293.126445,0,0,4 +,354813389.233576,0,0,2 +,446683592.150962,0,0,1 +,562341325.190349,0,0,0 +,707945784.38414,0,0,0 +,891250938.133744,0,0,0 +,1122018454.30197,0,0,0 +,1412537544.62275,0,0,0 +,1778279410.03892,0,0,0 +,2238721138.56835,0,0,0 +,2818382931.26445,0,0,0 +,3548133892.33576,0,0,0 +,4466835921.50962,0,0,0 +,5623413251.90349,0,0,0 +,7079457843.8414,0,0,0 +,8912509381.33744,0,0,0 +Dox 500.0,11220.1845430196,4009,2096,1071 +,14125.3754462276,4864,2485,1984 +,17782.7941003892,5414,2983,1969 +,22387.2113856834,5650,4167,2050 +,28183.8293126445,5248,4309,2861 +,35481.3389233575,5192,5156,3677 +,44668.3592150964,3894,5553,4172 +,56234.1325190349,2881,5658,4268 +,70794.5784384137,2521,5378,4651 +,89125.0938133746,2440,4169,3753 +,112201.845430196,2538,3368,3388 +,141253.754462276,2801,2904,2517 +,177827.941003892,2919,2867,2484 +,223872.113856834,3034,3298,2670 +,281838.293126445,3264,3573,2952 +,354813.389233575,3199,3754,3360 +,446683.592150963,3197,4036,3576 +,562341.325190349,2998,4065,3585 +,707945.784384137,2678,3955,3728 +,891250.938133746,2483,3694,3719 +,1122018.45430196,2076,3495,3820 +,1412537.54462276,1688,3030,3729 +,1778279.41003892,1414,2533,3769 +,2238721.13856834,1059,1986,3781 +,2818382.93126445,802,1525,3671 +,3548133.89233575,611,1184,3619 +,4466835.92150963,468,878,3429 +,5623413.25190349,333,631,3260 +,7079457.84384139,226,463,2967 +,8912509.38133746,158,316,2549 +,11220184.5430196,87,218,2281 +,14125375.4462275,67,146,2003 +,17782794.1003892,47,87,1687 +,22387211.3856834,28,45,1336 +,28183829.3126445,9,37,1050 +,35481338.9233575,8,14,769 +,44668359.2150963,2,11,626 +,56234132.5190349,1,8,444 +,70794578.4384137,1,0,298 +,89125093.8133746,0,0,186 +,112201845.430197,0,0,136 +,141253754.462275,0,1,84 +,177827941.003892,0,0,45 +,223872113.856835,0,0,28 +,281838293.126445,0,0,17 +,354813389.233576,0,0,2 +,446683592.150962,0,0,1 +,562341325.190349,0,0,0 +,707945784.38414,0,0,0 +,891250938.133744,0,0,0 +,1122018454.30197,0,0,0 +,1412537544.62275,0,0,0 +,1778279410.03892,0,0,0 +,2238721138.56835,0,0,0 +,2818382931.26445,0,0,0 +,3548133892.33576,0,0,0 +,4466835921.50962,0,0,0 +,5623413251.90349,0,0,0 +,7079457843.8414,0,0,0 +,8912509381.33744,0,0,0 +Dox 1000.0,11220.1845430196,3427,2030,1001 +,14125.3754462276,4307,2429,1724 +,17782.7941003892,4948,3118,1790 +,22387.2113856834,5041,4169,1769 +,28183.8293126445,4795,4345,2532 +,35481.3389233575,4724,5185,3306 +,44668.3592150964,3819,5766,3733 +,56234.1325190349,3074,6111,4018 +,70794.5784384137,2641,5825,4362 +,89125.0938133746,2619,4761,3836 +,112201.845430196,2909,4040,3580 +,141253.754462276,3116,3739,2789 +,177827.941003892,3507,3615,2627 +,223872.113856834,3824,3847,2799 +,281838.293126445,4125,4013,3074 +,354813.389233575,4274,4341,3507 +,446683.592150963,4242,4289,3711 +,562341.325190349,4236,4239,3805 +,707945.784384137,4025,3750,3838 +,891250.938133746,3616,3497,4064 +,1122018.45430196,3177,3084,4088 +,1412537.54462276,2780,2481,4230 +,1778279.41003892,2317,1950,4218 +,2238721.13856834,1873,1482,4168 +,2818382.93126445,1435,1114,3969 +,3548133.89233575,1041,835,4060 +,4466835.92150963,784,601,3810 +,5623413.25190349,541,447,3534 +,7079457.84384139,368,268,3382 +,8912509.38133746,256,201,3025 +,11220184.5430196,223,130,2648 +,14125375.4462275,111,91,2325 +,17782794.1003892,66,52,1847 +,22387211.3856834,42,34,1548 +,28183829.3126445,13,19,1232 +,35481338.9233575,9,11,925 +,44668359.2150963,6,6,756 +,56234132.5190349,0,3,479 +,70794578.4384137,1,1,339 +,89125093.8133746,0,1,250 +,112201845.430197,0,0,162 +,141253754.462275,0,0,85 +,177827941.003892,0,0,68 +,223872113.856835,0,0,41 +,281838293.126445,0,0,11 +,354813389.233576,0,0,2 +,446683592.150962,0,0,0 +,562341325.190349,0,0,0 +,707945784.38414,0,0,0 +,891250938.133744,0,0,0 +,1122018454.30197,0,0,0 +,1412537544.62275,0,0,0 +,1778279410.03892,0,0,0 +,2238721138.56835,0,0,0 +,2818382931.26445,0,0,0 +,3548133892.33576,0,0,0 +,4466835921.50962,0,0,0 +,5623413251.90349,0,0,0 +,7079457843.8414,0,0,0 +,8912509381.33744,0,0,0 +Dox 2000.0,11220.1845430196,3160,2135,887 +,14125.3754462276,3941,2505,1691 +,17782.7941003892,4594,3214,1600 +,22387.2113856834,4704,4285,1767 +,28183.8293126445,4761,4560,2539 +,35481.3389233575,4844,5420,3175 +,44668.3592150964,3991,6148,3640 +,56234.1325190349,3111,6736,3920 +,70794.5784384137,2778,6376,4263 +,89125.0938133746,2770,5499,3788 +,112201.845430196,2937,4727,3596 +,141253.754462276,3237,4161,3009 +,177827.941003892,3806,4161,2733 +,223872.113856834,4186,4160,3002 +,281838.293126445,4733,4330,3166 +,354813.389233575,4945,4427,3635 +,446683.592150963,5328,4309,3855 +,562341.325190349,5224,4280,3955 +,707945.784384137,5117,3870,4359 +,891250.938133746,4628,3343,4336 +,1122018.45430196,4313,2854,4451 +,1412537.54462276,3776,2144,4436 +,1778279.41003892,2974,1769,4660 +,2238721.13856834,2417,1330,4611 +,2818382.93126445,1769,934,4553 +,3548133.89233575,1348,640,4344 +,4466835.92150963,1032,475,4157 +,5623413.25190349,674,340,3904 +,7079457.84384139,530,217,3732 +,8912509.38133746,316,119,3303 +,11220184.5430196,208,88,3050 +,14125375.4462275,113,47,2518 +,17782794.1003892,71,26,2170 +,22387211.3856834,43,17,1777 +,28183829.3126445,20,7,1490 +,35481338.9233575,7,6,1079 +,44668359.2150963,3,4,764 +,56234132.5190349,2,1,516 +,70794578.4384137,0,0,376 +,89125093.8133746,0,0,224 +,112201845.430197,0,0,143 +,141253754.462275,0,0,107 +,177827941.003892,0,0,57 +,223872113.856835,0,0,28 +,281838293.126445,0,0,19 +,354813389.233576,0,0,9 +,446683592.150962,0,0,2 +,562341325.190349,0,0,1 +,707945784.38414,0,0,0 +,891250938.133744,0,0,0 +,1122018454.30197,0,0,0 +,1412537544.62275,0,0,0 +,1778279410.03892,0,0,0 +,2238721138.56835,0,0,0 +,2818382931.26445,0,0,0 +,3548133892.33576,0,0,0 +,4466835921.50962,0,0,0 +,5623413251.90349,0,0,0 +,7079457843.8414,0,0,0 +,8912509381.33744,0,0,0 diff --git a/template_analysis/LacI-CAGop_statisticsFile.csv b/template_analysis/LacI-CAGop_statisticsFile.csv new file mode 100644 index 0000000..3b50b82 --- /dev/null +++ b/template_analysis/LacI-CAGop_statisticsFile.csv @@ -0,0 +1,15 @@ +ID,BinCount_FITC_A,BinCount_PE_Tx_Red_YG_A,BinCount_Pacific_Blue_A,GeoMean_FITC_A,GeoMean_PE_Tx_Red_YG_A,GeoMean_Pacific_Blue_A,GeoStdDev_FITC_A,GeoStdDev_PE_Tx_Red_YG_A,GeoStdDev_Pacific_Blue_A +Dox 0.1,52519,109304,119534,22165.025452981,249480.031428636,410631.479202476,1.60060851602962,6.76534630618315,8.10003529761778 +Dox 0.2,42805,88422,95699,22188.0743351113,248909.635637894,407573.027865249,1.5989574034829,6.86705919259453,8.13062195345944 +Dox 0.5,40922,85388,93073,22108.805065838,257671.246116955,426008.54075171,1.59814139083964,6.86483601671476,8.12292552499894 +Dox 1.0,35873,75011,81845,22047.9528459911,258753.029631657,433436.305211408,1.60355897065308,6.91542171813179,8.21351966835268 +Dox 2.0,40117,83646,91874,22156.9833530256,250988.198177039,430944.214811771,1.60347980970474,6.75640141682951,8.10705860949241 +Dox 5.0,47388,97825,108168,22546.8133305892,248623.129202773,427654.749184805,1.64272376558834,6.80195719151201,8.27411543382126 +Dox 10.0,44944,91893,100527,22812.2405422446,254573.233427275,425856.502036798,1.70295768283413,6.76177886966528,8.12197873781665 +Dox 20.0,49108,95512,104801,25391.5763608897,257381.737571485,440725.312703547,1.99137655091,6.77005600726259,8.29382800299649 +Dox 50.0,45594,75243,82319,37910.9571859584,242175.06260393,462127.788442408,3.05675286196286,6.45792828797547,8.40520472709297 +Dox 100.0,52306,79583,88127,48912.9408807794,232673.026366744,472205.546041661,3.68677556998661,6.17018059244424,8.41844135833363 +Dox 200.0,64184,86943,96283,69242.0431237276,210677.034934462,465926.99712996,4.50684333785668,5.86855444787047,8.23925696594572 +Dox 500.0,80309,94076,108022,109305.024898359,175132.19946249,567293.173746977,5.28188595606136,5.27799922540984,8.7369227720754 +Dox 1000.0,92312,95920,113067,159093.739305107,154512.535696275,671434.882968259,5.60188995678396,4.70610037710353,8.58928321844016 +Dox 2000.0,102411,99664,119397,194717.045060966,141752.63631461,746082.759983345,5.57735408403808,4.38999273430913,8.43911397110291 diff --git a/template_analysis/batch_template.m b/template_analysis/batch_template.m index d8d5c20..7599095 100644 --- a/template_analysis/batch_template.m +++ b/template_analysis/batch_template.m @@ -52,6 +52,6 @@ TASBEConfig.set('OS.FixedInputAxis',[1e4 1e10]); plot_batch_histograms(results,sampleresults,{'b','y','r'},CM); -[statisticsFile, histogramFile] = serializeBatchOutput(file_pairs, CM, AP, sampleresults, 'LacI-CAGop-batch'); +[statisticsFile, histogramFile] = serializeBatchOutput(file_pairs, CM, AP, sampleresults); save('LacI-CAGop-batch.mat','AP','bins','file_pairs','results','sampleresults'); From 2a3307389dcf8157b50bd79287ddfca8cc70e8fe Mon Sep 17 00:00:00 2001 From: jakebeal Date: Sun, 11 Feb 2018 10:33:47 -0600 Subject: [PATCH 04/10] adjust to reflect movement of bead_plot into TASBEConfig --- 03_flow_MEFL/exercises.m | 1 - template_colormodel/make_color_model.m | 1 - 2 files changed, 2 deletions(-) diff --git a/03_flow_MEFL/exercises.m b/03_flow_MEFL/exercises.m index 5022217..8e8611b 100644 --- a/03_flow_MEFL/exercises.m +++ b/03_flow_MEFL/exercises.m @@ -71,7 +71,6 @@ CM = ColorModel(beadfile, blankfile, channels, colorfiles, colorpairfiles); CM = set_ERF_channel_name(CM, 'FITC-A'); % Name the channel we'll use for ERF units CM=set_dequantization(CM, 1); % important at low levels -CM=set_bead_plot(CM, 2); % 2 = show beads for all channels, even though only FITC will be used CM=set_bead_min(CM, 1); % Don't consider beads less than this amount % Things we'll talk about in the next section... CM=set_translation_plot(CM, true); diff --git a/template_colormodel/make_color_model.m b/template_colormodel/make_color_model.m index adff50b..c39d41c 100644 --- a/template_colormodel/make_color_model.m +++ b/template_colormodel/make_color_model.m @@ -47,7 +47,6 @@ colorpairfiles{2} = {channels{1}, channels{3}, channels{2}, [stem0312 'mkate_EBFP2_EYFP_P3.fcs']}; CM = ColorModel(beadfile, blankfile, channels, colorfiles, colorpairfiles); -CM=set_bead_plot(CM, 2); % 2 = detailed plots; 1 = minimal plot; 0 = no plot CM=set_translation_plot(CM, true); CM=set_noise_plot(CM, true); From 0a8ae28be1ffc34660354854d7051c34e8c010fb Mon Sep 17 00:00:00 2001 From: jakebeal Date: Sun, 11 Feb 2018 11:28:06 -0600 Subject: [PATCH 05/10] update secondary bead channel config --- template_colormodel/make_color_model.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template_colormodel/make_color_model.m b/template_colormodel/make_color_model.m index c39d41c..158b37f 100644 --- a/template_colormodel/make_color_model.m +++ b/template_colormodel/make_color_model.m @@ -64,7 +64,7 @@ CM=set_translation_channel_min(CM,[2,2,2]); % When dealing with very strong fluorescence, use secondary channel to segment -% TASBEConfig.set('SecondaryBeadChannel','PE-Tx-Red-YG-A'); +% TASBEConfig.set('beads.secondaryBeadChannel','PE-Tx-Red-YG-A'); CM = add_filter(CM,autogate); % Execute and save the model From 78b5ddfc0a6eedb386902e5d846279df30f6cf72 Mon Sep 17 00:00:00 2001 From: jakebeal Date: Sun, 11 Feb 2018 11:58:58 -0600 Subject: [PATCH 06/10] don't need to plot path set to the default --- template_analysis/plusminus_template.m | 1 - 1 file changed, 1 deletion(-) diff --git a/template_analysis/plusminus_template.m b/template_analysis/plusminus_template.m index bc87c08..5d17a3f 100755 --- a/template_analysis/plusminus_template.m +++ b/template_analysis/plusminus_template.m @@ -53,7 +53,6 @@ for i=1:numel(results) TASBEConfig.set('OS.StemName',batch_description{i}{1}); TASBEConfig.set('OS.DeviceName',device_name); - TASBEConfig.set('OS.Directory','plots/'); TASBEConfig.set('OS.PlotTickMarks',1); plot_plusminus_comparison(results{i}) end From bc64d5f039a19ad79410de667d355d52575652e9 Mon Sep 17 00:00:00 2001 From: ltiberio Date: Mon, 12 Feb 2018 19:05:36 -0500 Subject: [PATCH 07/10] Issue-125: Verified the Color Model was created with non-default value for standardUnits. --- template_colormodel/CM120312.mat | Bin 7447 -> 7435 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/template_colormodel/CM120312.mat b/template_colormodel/CM120312.mat index 38d0a35a993a00f904efb54fb1a2765678f780f2..5f4e2ddc83895be1cd46fdd734e40c5ab57fa40d 100644 GIT binary patch delta 7350 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 delta 7362 zcmV;z96jTUI+r?-GZ<8LWgtpnZXhu>ATcvKF)=zYIUq7HF*uP?BavVRk#rD$j~oC1 zc%1B5eP|p-6rcM@+N4byO`2$-@%{+3f>#oo8mZ!Ka?K@y)SmgkRuk6A?c{Eoz1{2X zTs~?sib9I`RY9Z(lF&*mh#34x{GbNKKP;%N|M-VhF(Rh;K{2)!q`{fpz1-er?=H8! zrZjY5c6a8z-2X45 z4N7EPACoOo*2lt5A?m-z0ZdHV{L&k^pBFH3aqG#EqF^X;Q0BVHJgm5yi2Vb+kY;rV zU4Y_11_r-ole7w``;+2-({QNtAmr2Wl#<#ClIMb3?>C+cmHL~OGQHg`>N_8C9*&n$ z2ut!vu_o`{Eb6z3$}q8xENnU86{+0KioGloK{fS}Ba_(5HNem>@1Yrq#~nYWvq z({m1cIF~bboRfT20DCyF3|yilaljI1wXVkT%E;HqGI8z{oEtRn3k2=V&zZ;h-(kr+M02UwDfYUqAmR>*#$0Ka4$8VtaiGtFN5B?ZuV1tGIuEc4nYp#HdisI?~`9pL_gpZ)M*i{p!XCU~_Cs&z-mbwpZDC@=$?-*F4F1vhd1WFkJNh+Lt<#$M@2f{t-x^qqJ*IF0)>wI zQbqdsY|hiwcwTt(USl=hYed{hoHGlK+Ob@JZx=gEcGQXths?diPs1j*K7PrK?4TrI zn98SJU#4({;gZ{M6y-5tV~5}%5|9`s&XVYgNka*I49O(qU{>J65q)e9VfE(EAd5pG z$ffEkNMW<8r0XF04>EV>$KO`cUklU`+_wD31MK+h8!o(9F10 zN+BiEaY{o=)t$Egd_j>pG zt#|Fc*1Oi8O_QGn7YRM2|1~%~|4f;azXm0L@Xy#oxY=L85&wYuD7%}|xr`xvDd`hl z;0x;xj)Ht%;7Vt)7;Yc-iP+G*E1y|(cLp|0W^@jNJuEC@x^Wro1q>GdI3!pyow$6E z1&86~{~iNSGXGd;OX4;J45lf_u+$#DE&z=F+Wam|P95Bd#XxNq?h_dO_o zThJYu&P+#TBR4OGCK}y7jr@vz`mb<#qreU3$4u0Yq^ta?Eey8D$m#E! zci+p-x8%j&-PZ^nGoi(ISiCdg=QY{t687FkXnyOR!;j z`+kp2W|?kOEA4Tl$)UPc)wD@hHRs1^w9$sI50CoUM$e5raWHcJga5MMR(FSg`=~je zSsqLdzs7y6gdYV4o%OrG;W~Y|!Y^=irkkUO7mMFJKMI3-oZ%~cJP z&qI#S(^t^TEB$+D*Bm>~df+jbtzY);dRHH9wD#<_o=JF@+w%Gu!#iokgt)r>?u z8AfX_T5^42aT^J??PFO_H0Y&&O-jBea-7`x!9QPtPxf$Mus5i`2lwatxS<$+uAlT5 z{u+$1KbXIR`FK@Z2s@0^#A0#haIrXJ0dE0w0exZ$iAEL`G8d8%=@R0Qy#;3o`tW~< zY(plI>&e~ZBC@!UCpnv}LMD_$|TS)_?4T96i z4rFJt4xifv*OPMuUkaWP6cv)We-#;yX9)HLE{U_rmC-iOm&x-JE`%eP@_0MClUexl1njn8;gOXIp zVbwn$7gG*QdvwKEItzO5KPc~&xdr5~0Yks5S+G4kjWx~pSMU#rJ?l=%fkv}H-$JK6 zC_Qjacj~rWm?(1c(GkjZkUgdxl8NO*dSm@#*I75fI!%Nz-uf1Qw2#Y6si-RigC7d3 zWn?9^h~G=N-S-$8ldHVB`A?yVnoKv|TMHg3N4vf9>fo>& zlNZ4K4I(;l88@*Pupo@Hp~1Wj<|{sLetT)e?@BTFgVMbju

vKXhbf=iP^Y=Xau*@`b@Q!oi5ey=76h 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 Date: Mon, 19 Feb 2018 16:34:52 +0100 Subject: [PATCH 08/10] Fixing #138 --- template_analysis/batch_template.m | 4 ++-- template_analysis/plusminus_template.m | 8 ++++---- template_analysis/transfercurve_template.m | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/template_analysis/batch_template.m b/template_analysis/batch_template.m index 7599095..e8f5364 100644 --- a/template_analysis/batch_template.m +++ b/template_analysis/batch_template.m @@ -48,8 +48,8 @@ [results sampleresults] = per_color_constitutive_analysis(CM,file_pairs,{'EBFP2','EYFP','mKate'},AP); % Make output plots -TASBEConfig.set('OS.StemName','LacI-CAGop'); -TASBEConfig.set('OS.FixedInputAxis',[1e4 1e10]); +TASBEConfig.set('OutputSettings.StemName','LacI-CAGop'); +TASBEConfig.set('OutputSettings.FixedInputAxis',[1e4 1e10]); plot_batch_histograms(results,sampleresults,{'b','y','r'},CM); [statisticsFile, histogramFile] = serializeBatchOutput(file_pairs, CM, AP, sampleresults); diff --git a/template_analysis/plusminus_template.m b/template_analysis/plusminus_template.m index 5d17a3f..b170926 100755 --- a/template_analysis/plusminus_template.m +++ b/template_analysis/plusminus_template.m @@ -46,14 +46,14 @@ }; % Execute the actual analysis -TASBEConfig.set('OS.DeviceName',device_name); +TASBEConfig.set('OutputSettings.DeviceName',device_name); results = process_plusminus_batch( CM, batch_description, AP); % Make additional output plots for i=1:numel(results) - TASBEConfig.set('OS.StemName',batch_description{i}{1}); - TASBEConfig.set('OS.DeviceName',device_name); - TASBEConfig.set('OS.PlotTickMarks',1); + TASBEConfig.set('OutputSettings.StemName',batch_description{i}{1}); + TASBEConfig.set('OutputSettings.DeviceName',device_name); + TASBEConfig.set('OutputSettings.PlotTickMarks',1); plot_plusminus_comparison(results{i}) end diff --git a/template_analysis/transfercurve_template.m b/template_analysis/transfercurve_template.m index 50cb574..245a7f8 100644 --- a/template_analysis/transfercurve_template.m +++ b/template_analysis/transfercurve_template.m @@ -55,18 +55,18 @@ results = summarize_data(CM,experiment,AP,sampleresults); % Make output plots -TASBEConfig.set('OS.StemName','Fine'); +TASBEConfig.set('OutputSettings.StemName','Fine'); % Plot how the constitutive fluorescence was distributed -TASBEConfig.set('OS.DeviceName',device_name); +TASBEConfig.set('OutputSettings.DeviceName',device_name); plot_bin_statistics(sampleresults); % Plot the relation between inducer and input fluorescence -TASBEConfig.set('OS.DeviceName',inducer_name); +TASBEConfig.set('OutputSettings.DeviceName',inducer_name); plot_inducer_characterization(results); % Plot the relation between input and output fluorescence -TASBEConfig.set('OS.DeviceName',device_name); +TASBEConfig.set('OutputSettings.DeviceName',device_name); plot_IO_characterization(results); % Save the results of computation From c4ccb3dcbefe5ed44f4ec1bacc3c44342b97b2e9 Mon Sep 17 00:00:00 2001 From: jakebeal Date: Tue, 20 Feb 2018 10:02:46 +0100 Subject: [PATCH 09/10] move rest of bead prefs into TASBEConfig --- 03_flow_MEFL/exercises.m | 8 ++++---- template_analysis/batch_template.m | 1 + template_analysis/plusminus_template.m | 1 + template_analysis/transfercurve_template.m | 1 + template_colormodel/make_color_model.m | 14 +++++++------- 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/03_flow_MEFL/exercises.m b/03_flow_MEFL/exercises.m index 8e8611b..28ca211 100644 --- a/03_flow_MEFL/exercises.m +++ b/03_flow_MEFL/exercises.m @@ -71,7 +71,7 @@ CM = ColorModel(beadfile, blankfile, channels, colorfiles, colorpairfiles); CM = set_ERF_channel_name(CM, 'FITC-A'); % Name the channel we'll use for ERF units CM=set_dequantization(CM, 1); % important at low levels -CM=set_bead_min(CM, 1); % Don't consider beads less than this amount +TASBEConfig.set('beads.rangeMin', 1); % Don't consider beads less than this (log10) amount % Things we'll talk about in the next section... CM=set_translation_plot(CM, true); CM=set_translation_channel_min(CM,[2,2,2]); @@ -87,15 +87,15 @@ % The FITC channel is the one that we will key off % The identification is pretty terrible, though! % Two things are going wrong here: -% 1) We're getting smearing of peaks from autofluorescence: bead_min should be raised +% 1) We're getting smearing of peaks from autofluorescence: beads.rangeMin should be raised % 2) Automatic threshold detection is not finding the right value, because there % is not a distinct enough "valley" in the FITC graph % Notice also that you got a warning that: "Warning: Bead calibration probably incorrect" % When peaks are mis-detected, this typically leads to a bad fit against the % expected sequence gaps, giving warning of failures. -CM=set_bead_min(CM, 2); % Don't consider beads less than this amount -CM=set_bead_peak_threshold(CM, 200); % override default peak threshold +TASBEConfig.set('beads.rangeMin', 2); % Don't consider beads less than this (log10) amount +TASBEConfig.set('beads.peakThreshold', 200); % override default peak threshold CM = resolve(CM); % We get a new warning: "Warning: Only one bead peak found, assuming brightest" diff --git a/template_analysis/batch_template.m b/template_analysis/batch_template.m index e8f5364..7e95e08 100644 --- a/template_analysis/batch_template.m +++ b/template_analysis/batch_template.m @@ -1,5 +1,6 @@ % This template shows how to perform a simple batch analysis of a set of conditions % Each color is analyzed independently +TASBEConfig.checkpoint('init'); % load the color model load('../template_colormodel/CM120312.mat'); diff --git a/template_analysis/plusminus_template.m b/template_analysis/plusminus_template.m index b170926..9dfd8e3 100755 --- a/template_analysis/plusminus_template.m +++ b/template_analysis/plusminus_template.m @@ -1,4 +1,5 @@ % This file shows how to perform a batch of +/- comparisons +TASBEConfig.checkpoint('init'); % load the color model load('../template_colormodel/CM120312.mat'); diff --git a/template_analysis/transfercurve_template.m b/template_analysis/transfercurve_template.m index 245a7f8..40105c3 100644 --- a/template_analysis/transfercurve_template.m +++ b/template_analysis/transfercurve_template.m @@ -1,5 +1,6 @@ % This template shows how to perform parametric analysis of a transient % transfection transfer curve +TASBEConfig.checkpoint('init'); % load the color model load('../template_colormodel/CM120312.mat'); diff --git a/template_colormodel/make_color_model.m b/template_colormodel/make_color_model.m index 158b37f..0d3ebf0 100644 --- a/template_colormodel/make_color_model.m +++ b/template_colormodel/make_color_model.m @@ -1,4 +1,4 @@ -% auto generated by colorModel.py, modified by us +TASBEConfig.checkpoint('init'); stem0312 = '../example_controls/2012-03-12_'; @@ -50,15 +50,15 @@ CM=set_translation_plot(CM, true); CM=set_noise_plot(CM, true); -CM=set_bead_model(CM,'SpheroTech RCP-30-5A'); % Entry from BeadCatalog.xls matching your beads -CM=set_bead_batch(CM,'Lot AA01, AA02, AA03, AA04, AB01, AB02, AC01, GAA01-R'); % Entry from BeadCatalog.xls containing your lot -% Can also set bead channel if, for some reason, you don't want to use fluorescein as standard +TASBEConfig.set('beads.beadModel','SpheroTech RCP-30-5A'); % Entry from BeadCatalog.xls matching your beads +TASBEConfig.set('beads.beadBatch','Lot AA01, AA02, AA03, AA04, AB01, AB02, AC01, GAA01-R'); % Entry from BeadCatalog.xls containing your lot +% Can also set beads.beadChannel if, for some reason, you don't want to use fluorescein as standard -% Ignore all bead data below 10^[bead_min] as being too "smeared" with noise -CM=set_bead_min(CM, 2); +% Ignore all bead data below 10^[rangeMin] as being too "smeared" with noise +TASBEConfig.set('beads.rangeMin', 2); % The peak threshold determines the minumum count per bin for something to % be considered part of a peak. Set if automated threshold finds too many or few peaks -%CM=set_bead_peak_threshold(CM, 200); +%TASBEConfig.set('beads.peakThreshold', 200); CM=set_ERF_channel_name(CM, 'FITC-A'); % Ignore channel data for ith channel if below 10^[value(i)] CM=set_translation_channel_min(CM,[2,2,2]); From 5df5d1562cfa942a54390136b5fcb6ef54d6916b Mon Sep 17 00:00:00 2001 From: jakebeal Date: Tue, 20 Feb 2018 10:28:16 +0100 Subject: [PATCH 10/10] updated colormodel --- template_colormodel/CM120312.mat | Bin 7435 -> 7310 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/template_colormodel/CM120312.mat b/template_colormodel/CM120312.mat index 5f4e2ddc83895be1cd46fdd734e40c5ab57fa40d..4d166da0fc024125867b61e2518232b089733062 100644 GIT binary patch delta 7275 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 bw~zgLuk={Vvk5M;U7BZqbAI>&MA7L0qnNei