diff --git a/CS_analysis.cpp b/CS_analysis.cpp index abee3ff..f4df083 100644 --- a/CS_analysis.cpp +++ b/CS_analysis.cpp @@ -74,11 +74,14 @@ int main(int argc, char* argv[]) { scan_v6.push_back("045"); scan_v6.push_back("046"); scan_v6.push_back("048"); + scan_v6.push_back("049"); scan_v6.push_back("050"); + scan_v6.push_back("051"); scan_v6.push_back("053"); scan_v6.push_back("054"); scan_v6.push_back("057"); scan_v6.push_back("058"); + scan_v6.push_back("060"); scan_v6.push_back("061"); scan_v6.push_back("062"); scan_v6.push_back("064"); @@ -131,6 +134,9 @@ int main(int argc, char* argv[]) { scan_v6.push_back("222"); scan_v6.push_back("224"); scan_v6.push_back("226"); + scan_v6.push_back("234"); + scan_v6.push_back("235"); + scan_v6.push_back("236"); jungfrauFile *thisfile = new jungfrauFile(); diff --git a/JFMC_ModuleComp.cpp b/JFMC_ModuleComp.cpp index ce264e2..721b47c 100644 --- a/JFMC_ModuleComp.cpp +++ b/JFMC_ModuleComp.cpp @@ -42,13 +42,16 @@ int main(int argc, char* argv[]) { modules.push_back(45); modules.push_back(46); modules.push_back(48); + modules.push_back(49); modules.push_back(50); + modules.push_back(51); modules.push_back(53); modules.push_back(54); modules.push_back(55); modules.push_back(57); modules.push_back(58); modules.push_back(59); + modules.push_back(60); modules.push_back(61); modules.push_back(62); modules.push_back(64); @@ -108,6 +111,9 @@ int main(int argc, char* argv[]) { modules.push_back(222); modules.push_back(224); modules.push_back(226); + modules.push_back(234); + modules.push_back(235); + modules.push_back(236); vector modules_d; vector module_errs; diff --git a/run_JFCalibration.txt b/run_JFCalibration.txt index 421fd5c..db9f56e 100644 --- a/run_JFCalibration.txt +++ b/run_JFCalibration.txt @@ -149,6 +149,14 @@ Module 048 ./JFMC_CalibWriter_wBP 048 +Module 049 +./CuFluo_analysis 049 G0 /mnt/pcmoench_jungfrau_calib/data/Module_049_Calib pedeG0_M049_2018-07-23 CuFluoG0_M049_2018-07-23 +./CuFluo_analysis 049 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_049_Calib pedeHG0_M049_2018-07-23 CuFluoHG0_M049_2018-07-23 +./BP_analysis 049 /mnt/pcmoench_jungfrau_calib/data/Module_049_Calib/BP_M049_2018-07-20 +./CS_analysis 049 /mnt/pcmoench_jungfrau_calib/data/Module_049_Calib CS_M049_2018-07-20 +./JFMC_CalibWriter_wBP 049 + + Module 050 ./CuFluo_analysis 050 G0 /mnt/pcmoench_jungfrau_data/Module_050_2017-11-22_Calib pedeG0_2017-11-24_1525 CuFluo_G0_2017-11-24 ./CuFluo_analysis 050 HG0 /mnt/pcmoench_jungfrau_data/Module_050_2017-11-22_Calib pedeHG0_2017-11-24_1535 CuFluo_HG0_2017-11-24 @@ -157,6 +165,14 @@ Module 050 ./JFMC_CalibWriter_wBP 050 +Module 051 +./CuFluo_analysis 051 G0 /mnt/pcmoench_jungfrau_calib/data/Module_051_Calib pedeG0_M051_2018-07-23 CuFluoG0_M051_2018-07-23 +./CuFluo_analysis 051 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_051_Calib pedeHG0_M051_2018-07-23 CuFluoHG0_M051_2018-07-23 +./BP_analysis 051 /mnt/pcmoench_jungfrau_calib/data/Module_051_Calib/BP_M051_2018-07-20 +./CS_analysis 051 /mnt/pcmoench_jungfrau_calib/data/Module_051_Calib CS_M051_2018-07-20 +./JFMC_CalibWriter_wBP 051 + + Module 053 ./CuFluo_analysis 053 G0 /mnt/pcmoench_jungfrau_calib/data/Module_053_Calib pedeG0_M053_2018-05-16 CuFluoG0_M053_2018-05-16 ./CuFluo_analysis 053 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_053_Calib pedeHG0_M053_2018-05-16 CuFluoHG0_M053_2018-05-16 @@ -203,6 +219,14 @@ Module 059 ./JFMC_CalibWriter_wBP 059 +Module 060 +./CuFluo_analysis 060 G0 /mnt/pcmoench_jungfrau_calib/data/Module_060_Calib pedeG0_M060_2018-07-23 CuFluoG0_M060_2018-07-23 +./CuFluo_analysis 060 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_060_Calib pedeHG0_M060_2018-07-23 CuFluoHG0_M060_2018-07-23 +./BP_analysis 060 /mnt/pcmoench_jungfrau_calib/data/Module_060_Calib/BP_M060_2018-07-20 +./CS_analysis 060 /mnt/pcmoench_jungfrau_calib/data/Module_060_Calib CS_M060_2018-07-20 +./JFMC_CalibWriter_wBP 060 + + Module 061 ./CuFluo_analysis 061 G0 /mnt/pcmoench_jungfrau_calib/data/Module_061_Calib pedeG0_M061_2018-06-07 CuFluoG0_M061_2018-06-07 ./CuFluo_analysis 061 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_061_Calib pedeHG0_M061_2018-06-07 CuFluoHG0_M061_2018-06-07 @@ -679,3 +703,27 @@ Module 226 ./BP_analysis 226 /mnt/pcmoench_jungfrau_data/Module_226_Calib/BP_2018-04-25_scan1 ./CS_analysis 226 /mnt/pcmoench_jungfrau_data/Module_226_Calib CS_2018-04-25_scan1 ./JFMC_CalibWriter_wBP 226 + + +Module 234 +./CuFluo_analysis 234 G0 /mnt/pcmoench_jungfrau_calib/data/Module_234_Calib pedeG0_M234_2018-07-23 CuFluoG0_M234_2018-07-23 +./CuFluo_analysis 234 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_234_Calib pedeHG0_M234_2018-07-23 CuFluoHG0_M234_2018-07-23 +./BP_analysis 234 /mnt/pcmoench_jungfrau_calib/data/Module_234_Calib/BP_M234_2018-07-20 +./CS_analysis 234 /mnt/pcmoench_jungfrau_calib/data/Module_234_Calib CS_M234_2018-07-20 +./JFMC_CalibWriter_wBP 234 + + +Module 235 +./CuFluo_analysis 235 G0 /mnt/pcmoench_jungfrau_calib/data/Module_235_Calib pedeG0_M235_2018-07-23 CuFluoG0_M235_2018-07-23 +./CuFluo_analysis 235 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_235_Calib pedeHG0_M235_2018-07-23 CuFluoHG0_M235_2018-07-23 +./BP_analysis 235 /mnt/pcmoench_jungfrau_calib/data/Module_235_Calib/BP_M235_2018-07-20 +./CS_analysis 235 /mnt/pcmoench_jungfrau_calib/data/Module_235_Calib CS_M235_2018-07-20 +./JFMC_CalibWriter_wBP 235 + + +Module 236 +./CuFluo_analysis 236 G0 /mnt/pcmoench_jungfrau_calib/data/Module_236_Calib pedeG0_M236_2018-07-23 CuFluoG0_M236_2018-07-23 +./CuFluo_analysis 236 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_236_Calib pedeHG0_M236_2018-07-23 CuFluoHG0_M236_2018-07-23 +./BP_analysis 236 /mnt/pcmoench_jungfrau_calib/data/Module_236_Calib/BP_M236_2018-07-23 +./CS_analysis 236 /mnt/pcmoench_jungfrau_calib/data/Module_236_Calib CS_M236_2018-07-23 +./JFMC_CalibWriter_wBP 236