diff --git a/CS_analysis.cpp b/CS_analysis.cpp index 955ace7..9fbef37 100644 --- a/CS_analysis.cpp +++ b/CS_analysis.cpp @@ -65,6 +65,7 @@ int main(int argc, char* argv[]) { scan_v5.push_back("094"); vector scan_v6; + scan_v6.push_back("011"); scan_v6.push_back("021"); scan_v6.push_back("029"); scan_v6.push_back("035"); @@ -75,6 +76,7 @@ int main(int argc, char* argv[]) { scan_v6.push_back("048"); scan_v6.push_back("050"); scan_v6.push_back("053"); + scan_v6.push_back("054"); scan_v6.push_back("057"); scan_v6.push_back("058"); scan_v6.push_back("062"); @@ -82,16 +84,20 @@ int main(int argc, char* argv[]) { scan_v6.push_back("067"); scan_v6.push_back("071"); scan_v6.push_back("072"); + scan_v6.push_back("073"); scan_v6.push_back("074"); scan_v6.push_back("075"); scan_v6.push_back("076"); scan_v6.push_back("080"); scan_v6.push_back("086"); + scan_v6.push_back("089"); scan_v6.push_back("098"); + scan_v6.push_back("099"); scan_v6.push_back("100"); scan_v6.push_back("102"); scan_v6.push_back("103"); scan_v6.push_back("104"); + scan_v6.push_back("106"); scan_v6.push_back("107"); scan_v6.push_back("108"); scan_v6.push_back("109"); @@ -101,8 +107,10 @@ int main(int argc, char* argv[]) { scan_v6.push_back("114"); scan_v6.push_back("116"); scan_v6.push_back("117"); + scan_v6.push_back("118"); scan_v6.push_back("119"); scan_v6.push_back("121"); + scan_v6.push_back("122"); scan_v6.push_back("124"); scan_v6.push_back("126"); scan_v6.push_back("131"); diff --git a/JFMC_ModuleComp.cpp b/JFMC_ModuleComp.cpp index e66de11..5563917 100644 --- a/JFMC_ModuleComp.cpp +++ b/JFMC_ModuleComp.cpp @@ -28,6 +28,7 @@ int main(int argc, char* argv[]) { vector modules; modules.push_back(6); modules.push_back(8); + modules.push_back(11); modules.push_back(21); modules.push_back(22); modules.push_back(27); @@ -43,6 +44,7 @@ int main(int argc, char* argv[]) { modules.push_back(48); modules.push_back(50); modules.push_back(53); + modules.push_back(54); modules.push_back(55); modules.push_back(57); modules.push_back(58); @@ -56,6 +58,7 @@ int main(int argc, char* argv[]) { modules.push_back(69); modules.push_back(71); modules.push_back(72); + modules.push_back(73); modules.push_back(74); modules.push_back(75); modules.push_back(76); @@ -63,12 +66,15 @@ int main(int argc, char* argv[]) { modules.push_back(80); modules.push_back(86); modules.push_back(88); + modules.push_back(89); modules.push_back(94); modules.push_back(98); + modules.push_back(99); modules.push_back(100); modules.push_back(102); modules.push_back(103); modules.push_back(104); + modules.push_back(106); modules.push_back(107); modules.push_back(108); modules.push_back(109); @@ -78,6 +84,7 @@ int main(int argc, char* argv[]) { modules.push_back(114); modules.push_back(116); modules.push_back(117); + modules.push_back(118); modules.push_back(119); modules.push_back(121); modules.push_back(124); @@ -85,6 +92,7 @@ int main(int argc, char* argv[]) { modules.push_back(131); modules.push_back(204); modules.push_back(205); + modules.push_back(206); modules.push_back(208); modules.push_back(209); modules.push_back(212); diff --git a/run_JFCalibration.txt b/run_JFCalibration.txt index dcf7df7..8b4fb55 100644 --- a/run_JFCalibration.txt +++ b/run_JFCalibration.txt @@ -27,6 +27,14 @@ Module 008 ./JFMC_CalibWriter_wBP 008 +Module 011 +./CuFluo_analysis 011 G0 /mnt/pcmoench_jungfrau_calib/data/Module_011_Calib pedeG0_M011_2018-05-23 CuFluoG0_M011_2018-05-23 +./CuFluo_analysis 011 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_011_Calib pedeHG0_M011_2018-05-23 CuFluoHG0_M011_2018-05-23 +./BP_analysis 011 /mnt/pcmoench_jungfrau_calib/data/Module_011_Calib/BP_M011_2018-05-24 +./CS_analysis 011 /mnt/pcmoench_jungfrau_calib/data/Module_011_Calib CS_M011_2018-05-23 +./JFMC_CalibWriter_wBP 011 + + Module 021 ./CuFluo_analysis 021 G0 /mnt/pcmoench_jungfrau_data/1M_021_022_150916 10us_200Hz_QS_allgain_pede__B 10us_200Hz_QS_G0_Cu__B ./CuFluo_analysis 021 G0 /mnt/pcmoench_jungfrau_data/Module_021_2017-11-24_Calib pedeG0_1145 CuFluo_G0_ @@ -157,6 +165,14 @@ Module 053 ./JFMC_CalibWriter_wBP 053 +Module 054 +./CuFluo_analysis 054 G0 /mnt/pcmoench_jungfrau_calib/data/Module_054_Calib pedeG0_M054_2018-05-23 CuFluoG0_M054_2018-05-23 +./CuFluo_analysis 054 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_054_Calib pedeHG0_M054_2018-05-23 CuFluoHG0_M054_2018-05-23 +./BP_analysis 054 /mnt/pcmoench_jungfrau_calib/data/Module_054_Calib/BP_M054_2018-05-24 +./CS_analysis 054 /mnt/pcmoench_jungfrau_calib/data/Module_054_Calib CS_M054_2018-05-23 +./JFMC_CalibWriter_wBP 054 + + Module 055 ./CuFluo_analysis 055 G0 /mnt/pcmoench_jungfrau_data/Module_055_2017-09-21_Calib pedeG0_1140 CuFluo_10us_500Hz ./BP_analysis 055 /mnt/pcmoench_jungfrau_data/Module_055_2017-09-21_Calib/VbackplanePulsing_scan1 @@ -258,6 +274,14 @@ Module 072 ./JFMC_CalibWriter_wBP 072 +Module 073 +./CuFluo_analysis 073 G0 /mnt/pcmoench_jungfrau_calib/data/Module_073_Calib pedeG0_M073_2018-05-23 CuFluoG0_M073_2018-05-23 +./CuFluo_analysis 073 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_073_Calib pedeHG0_M073_2018-05-23 CuFluoHG0_M073_2018-05-23 +./BP_analysis 073 /mnt/pcmoench_jungfrau_calib/data/Module_073_Calib/BP_M073_2018-05-24 +./CS_analysis 073 /mnt/pcmoench_jungfrau_calib/data/Module_073_Calib CS_M073_2018-05-23 +./JFMC_CalibWriter_wBP 073 + + Module 074 ./CuFluo_analysis 074 G0 /mnt/pcmoench_jungfrau_data/Module_074_Calib pedeG0_M074_2018-05-02 CuFluoG0_M074_2018-05-02 ./CuFluo_analysis 074 HG0 /mnt/pcmoench_jungfrau_data/Module_074_Calib pedeHG0_M074_2018-05-02 CuFluoHG0_M074_2018-05-02 @@ -312,6 +336,14 @@ Module 088 ./JFMC_CalibWriter_wBP 088 +Module 089 +./CuFluo_analysis 089 G0 /mnt/pcmoench_jungfrau_calib/data/Module_089_Calib pedeG0_M089_2018-05-23 CuFluoG0_M089_2018-05-23 +./CuFluo_analysis 089 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_089_Calib pedeHG0_M089_2018-05-23 CuFluoHG0_M089_2018-05-23 +./BP_analysis 089 /mnt/pcmoench_jungfrau_calib/data/Module_089_Calib/BP_M089_2018-05-24 +./CS_analysis 089 /mnt/pcmoench_jungfrau_calib/data/Module_089_Calib CS_M089_2018-05-23 +./JFMC_CalibWriter_wBP 089 + + Module 094 ./CuFluo_analysis 094 G0 /mnt/pcmoench_jungfrau_data/Module_094_2017-10-24_Calib pedeG0_1041 CuFluo_10us_500Hz ./BP_analysis 094 /mnt/pcmoench_jungfrau_data/Module_094_2017-10-24_Calib/BP_scan1 @@ -329,6 +361,14 @@ Module 098 ./JFMC_CalibWriter_wBP 098 +Module 099 +./CuFluo_analysis 099 G0 /mnt/pcmoench_jungfrau_calib/data/Module_099_Calib pedeG0_M099_2018-05-23 CuFluoG0_M099_2018-05-23 +./CuFluo_analysis 099 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_099_Calib pedeHG0_M099_2018-05-23 CuFluoHG0_M099_2018-05-23 +./BP_analysis 099 /mnt/pcmoench_jungfrau_calib/data/Module_099_Calib/BP_M099_2018-05-24 +./CS_analysis 099 /mnt/pcmoench_jungfrau_calib/data/Module_099_Calib CS_M099_2018-05-23 +./JFMC_CalibWriter_wBP 099 + + Module 100 ./CuFluo_analysis 100 G0 /mnt/pcmoench_jungfrau_data/Module_100_Calib pedeG0_M100_2018-02-27 CuFluo_G0_M100_2018-02-27 ./CuFluo_analysis 100 HG0 /mnt/pcmoench_jungfrau_data/Module_100_Calib pedeHG0_M100_2018-02-27 CuFluo_HG0_M100_2018-02-27 @@ -361,6 +401,14 @@ Module 104 ./JFMC_CalibWriter_wBP 104 +Module 106 +./CuFluo_analysis 106 G0 /mnt/pcmoench_jungfrau_calib/data/Module_106_Calib pedeG0_M106_2018-05-23 CuFluoG0_M106_2018-05-23 +./CuFluo_analysis 106 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_106_Calib pedeHG0_M106_2018-05-23 CuFluoHG0_M106_2018-05-23 +./BP_analysis 106 /mnt/pcmoench_jungfrau_calib/data/Module_106_Calib/BP_M106_2018-05-24 +./CS_analysis 106 /mnt/pcmoench_jungfrau_calib/data/Module_106_Calib CS_M106_2018-05-23 +./JFMC_CalibWriter_wBP 106 + + Module 107 ./CuFluo_analysis 107 G0 /mnt/pcmoench_jungfrau_calib/data/Module_107_Calib pedeG0_M107_2018-05-16 CuFluoG0_M107_2018-05-16 ./CuFluo_analysis 107 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_107_Calib pedeHG0_M107_2018-05-16 CuFluoHG0_M107_2018-05-16 @@ -435,6 +483,14 @@ Module 117 ./JFMC_CalibWriter_wBP 117 +Module 118 +./CuFluo_analysis 118 G0 /mnt/pcmoench_jungfrau_calib/data/Module_118_Calib pedeG0_M118_2018-05-23 CuFluoG0_M118_2018-05-23 +./CuFluo_analysis 118 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_118_Calib pedeHG0_M118_2018-05-23 CuFluoHG0_M118_2018-05-23 +./BP_analysis 118 /mnt/pcmoench_jungfrau_calib/data/Module_118_Calib/BP_M118_2018-05-24 +./CS_analysis 118 /mnt/pcmoench_jungfrau_calib/data/Module_118_Calib CS_M118_2018-05-23 +./JFMC_CalibWriter_wBP 118 + + Module 119 ./CuFluo_analysis 119 G0 /mnt/pcmoench_jungfrau_data/Module_119_2017-11-22_Calib pedeG0_1735 CuFluo_G0 ./CuFluo_analysis 119 HG0 /mnt/pcmoench_jungfrau_data/Module_119_2017-11-22_Calib pedeHG0_1745 CuFluo_HG0 @@ -451,6 +507,14 @@ Module 121 ./JFMC_CalibWriter_wBP 121 +Module 122 +./CuFluo_analysis 122 G0 /mnt/pcmoench_jungfrau_calib/data/Module_122_Calib pedeG0_M122_2018-05-23 CuFluoG0_M122_2018-05-23 +./CuFluo_analysis 122 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_122_Calib pedeHG0_M122_2018-05-23 CuFluoHG0_M122_2018-05-23 +./BP_analysis 122 /mnt/pcmoench_jungfrau_calib/data/Module_122_Calib/BP_M122_2018-05-24 +./CS_analysis 122 /mnt/pcmoench_jungfrau_calib/data/Module_122_Calib CS_M122_2018-05-23 +./JFMC_CalibWriter_wBP 122 + + Module 124 ./CuFluo_analysis 124 G0 /mnt/pcmoench_jungfrau_data/Module_124_Calib pedeG0_M124_2018-02-27 CuFluo_G0_M124_2018-02-27 ./CuFluo_analysis 124 HG0 /mnt/pcmoench_jungfrau_data/Module_124_Calib pedeHG0_M124_2018-02-27 CuFluo_HG0_M124_2018-02-27