diff --git a/CS_analysis.cpp b/CS_analysis.cpp index c465719..b4f5046 100644 --- a/CS_analysis.cpp +++ b/CS_analysis.cpp @@ -67,6 +67,7 @@ int main(int argc, char* argv[]) { vector scan_v6; scan_v6.push_back("011"); scan_v6.push_back("021"); + scan_v6.push_back("023"); scan_v6.push_back("029"); scan_v6.push_back("035"); scan_v6.push_back("039"); @@ -84,6 +85,7 @@ int main(int argc, char* argv[]) { scan_v6.push_back("060"); scan_v6.push_back("061"); scan_v6.push_back("062"); + scan_v6.push_back("063"); scan_v6.push_back("064"); scan_v6.push_back("067"); scan_v6.push_back("070"); @@ -133,15 +135,21 @@ int main(int argc, char* argv[]) { scan_v6.push_back("131"); scan_v6.push_back("132"); scan_v6.push_back("133"); + scan_v6.push_back("200"); + scan_v6.push_back("202"); scan_v6.push_back("204"); scan_v6.push_back("205"); + scan_v6.push_back("206"); scan_v6.push_back("208"); scan_v6.push_back("209"); + scan_v6.push_back("210"); scan_v6.push_back("212"); scan_v6.push_back("219"); scan_v6.push_back("222"); scan_v6.push_back("224"); scan_v6.push_back("226"); + scan_v6.push_back("227"); + scan_v6.push_back("232"); scan_v6.push_back("234"); scan_v6.push_back("235"); scan_v6.push_back("236"); diff --git a/JFMC_ModuleComp.cpp b/JFMC_ModuleComp.cpp index 772b590..92aceb5 100644 --- a/JFMC_ModuleComp.cpp +++ b/JFMC_ModuleComp.cpp @@ -54,6 +54,7 @@ int main(int argc, char* argv[]) { modules.push_back(60); modules.push_back(61); modules.push_back(62); + modules.push_back(63); modules.push_back(64); modules.push_back(65); modules.push_back(66); @@ -101,6 +102,7 @@ int main(int argc, char* argv[]) { modules.push_back(119); modules.push_back(120); modules.push_back(121); + modules.push_back(122); modules.push_back(123); modules.push_back(124); modules.push_back(126); @@ -109,16 +111,21 @@ int main(int argc, char* argv[]) { modules.push_back(131); modules.push_back(132); modules.push_back(133); + modules.push_back(200); + modules.push_back(202); modules.push_back(204); modules.push_back(205); modules.push_back(206); modules.push_back(208); modules.push_back(209); + modules.push_back(210); modules.push_back(212); modules.push_back(219); modules.push_back(222); modules.push_back(224); modules.push_back(226); + modules.push_back(227); + modules.push_back(232); modules.push_back(234); modules.push_back(235); modules.push_back(236); diff --git a/run_JFCalibration.txt b/run_JFCalibration.txt index f3707b3..95587d7 100644 --- a/run_JFCalibration.txt +++ b/run_JFCalibration.txt @@ -57,6 +57,14 @@ Module 022 ./JFMC_CalibWriter_wBP 022 +Module 023 +./CuFluo_analysis 023 G0 /mnt/pcmoench_jungfrau_calib/data/Module_023_Calib pedeG0_M023_2018-07-27 CuFluoG0_M023_2018-07-27 +./CuFluo_analysis 023 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_023_Calib pedeHG0_M023_2018-07-27 CuFluoHG0_M023_2018-07-27 +./BP_analysis 023 /mnt/pcmoench_jungfrau_calib/data/Module_023_Calib/BP_M023_2018-07-27 +./CS_analysis 023 /mnt/pcmoench_jungfrau_calib/data/Module_023_Calib CS_M023_2018-07-27 +./JFMC_CalibWriter_wBP 023 + + Module 027 ./CuFluo_analysis 027 G0 /mnt/pcmoench_jungfrau_data/Module_027_Calib FCu_40kvp_60mA_10us_500Hz_QS_pede FCu_40kvp_60mA_10us_500Hz_QS_beam ./CuFluo_analysis 027 G0 /mnt/pcmoench_jungfrau_data/Module_027_Calib pedeG0_2017-11-24_1425 CuFluo_G0_2017-11-24 @@ -243,6 +251,14 @@ Module 062 ./JFMC_CalibWriter_wBP 062 +Module 063 +./CuFluo_analysis 063 G0 /mnt/pcmoench_jungfrau_calib/data/Module_063_Calib pedeG0_M063_2018-07-27 CuFluoG0_M063_2018-07-27 +./CuFluo_analysis 063 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_063_Calib pedeHG0_M063_2018-07-27 CuFluoHG0_M063_2018-07-27 +./BP_analysis 063 /mnt/pcmoench_jungfrau_calib/data/Module_063_Calib/BP_M063_2018-07-27 +./CS_analysis 063 /mnt/pcmoench_jungfrau_calib/data/Module_063_Calib CS_M063_2018-07-27 +./JFMC_CalibWriter_wBP 063 + + Module 064 ./CuFluo_analysis 064 G0 /mnt/pcmoench_jungfrau_data/Module_064_Calib M064_2018-03-19_pedeG0 M064_2018-03-19_CuFluoG0 ./CuFluo_analysis 064 HG0 /mnt/pcmoench_jungfrau_data/Module_064_Calib M064_2018-03-19_pedeHG0 M064_2018-03-19_CuFluoHG0 @@ -697,6 +713,22 @@ Module 133 ./JFMC_CalibWriter_wBP 133 +Module 200 +./CuFluo_analysis 200 G0 /mnt/pcmoench_jungfrau_calib/data/Module_200_Calib pedeG0_M200_2018-07-27 CuFluoG0_M200_2018-07-27 +./CuFluo_analysis 200 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_200_Calib pedeHG0_M200_2018-07-27 CuFluoHG0_M200_2018-07-27 +./BP_analysis 200 /mnt/pcmoench_jungfrau_calib/data/Module_200_Calib/BP_M200_2018-07-27 +./CS_analysis 200 /mnt/pcmoench_jungfrau_calib/data/Module_200_Calib CS_M200_2018-07-27 +./JFMC_CalibWriter_wBP 200 + + +Module 202 +./CuFluo_analysis 202 G0 /mnt/pcmoench_jungfrau_calib/data/Module_202_Calib pedeG0_M202_2018-07-27 CuFluoG0_M202_2018-07-27 +./CuFluo_analysis 202 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_202_Calib pedeHG0_M202_2018-07-27 CuFluoHG0_M202_2018-07-27 +./BP_analysis 202 /mnt/pcmoench_jungfrau_calib/data/Module_202_Calib/BP_M202_2018-07-26 +./CS_analysis 202 /mnt/pcmoench_jungfrau_calib/data/Module_202_Calib CS_M202_2018-07-26 +./JFMC_CalibWriter_wBP 202 + + Module 204 ./CuFluo_analysis 204 G0 /mnt/pcmoench_jungfrau_data/Module_204_Calib pedeG0_M204_2018-05-02 CuFluoG0_M204_2018-05-02 ./CuFluo_analysis 204 HG0 /mnt/pcmoench_jungfrau_data/Module_204_Calib pedeHG0_M204_2018-05-02 CuFluoHG0_M204_2018-05-02 @@ -713,6 +745,14 @@ Module 205 ./JFMC_CalibWriter_wBP 205 +Module 206 +./CuFluo_analysis 206 G0 /mnt/pcmoench_jungfrau_calib/data/Module_206_Calib pedeG0_M206_2018-07-27 CuFluoG0_M206_2018-07-27 +./CuFluo_analysis 206 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_206_Calib pedeHG0_M206_2018-07-27 CuFluoHG0_M206_2018-07-27 +./BP_analysis 206 /mnt/pcmoench_jungfrau_calib/data/Module_206_Calib/BP_M206_2018-07-26 +./CS_analysis 206 /mnt/pcmoench_jungfrau_calib/data/Module_206_Calib CS_M206_2018-07-26 +./JFMC_CalibWriter_wBP 206 + + Module 208 ./CuFluo_analysis 208 G0 /mnt/pcmoench_jungfrau_data/Module_208_Calib pedeG0_M208_2018-05-02 CuFluoG0_M208_2018-05-02 ./CuFluo_analysis 208 HG0 /mnt/pcmoench_jungfrau_data/Module_208_Calib pedeHG0_M208_2018-05-02 CuFluoHG0_M208_2018-05-02 @@ -729,6 +769,14 @@ Module 209 ./JFMC_CalibWriter_wBP 209 +Module 210 +./CuFluo_analysis 210 G0 /mnt/pcmoench_jungfrau_calib/data/Module_210_Calib pedeG0_M210_2018-07-27 CuFluoG0_M210_2018-07-27 +./CuFluo_analysis 210 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_210_Calib pedeHG0_M210_2018-07-27 CuFluoHG0_M210_2018-07-27 +./BP_analysis 210 /mnt/pcmoench_jungfrau_calib/data/Module_210_Calib/BP_M210_2018-07-27 +./CS_analysis 210 /mnt/pcmoench_jungfrau_calib/data/Module_210_Calib CS_M210_2018-07-27 +./JFMC_CalibWriter_wBP 210 + + Module 212 ./CuFluo_analysis 212 G0 /mnt/pcmoench_jungfrau_data/Module_212_Calib pedeG0_M212_2018-05-02 CuFluoG0_M212_2018-05-02 ./CuFluo_analysis 212 HG0 /mnt/pcmoench_jungfrau_data/Module_212_Calib pedeHG0_M212_2018-05-02 CuFluoHG0_M212_2018-05-02 @@ -769,6 +817,22 @@ Module 226 ./JFMC_CalibWriter_wBP 226 +Module 227 +./CuFluo_analysis 227 G0 /mnt/pcmoench_jungfrau_calib/data/Module_227_Calib pedeG0_M227_2018-07-27 CuFluoG0_M227_2018-07-27 +./CuFluo_analysis 227 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_227_Calib pedeHG0_M227_2018-07-27 CuFluoHG0_M227_2018-07-27 +./BP_analysis 227 /mnt/pcmoench_jungfrau_calib/data/Module_227_Calib/BP_M227_2018-07-26 +./CS_analysis 227 /mnt/pcmoench_jungfrau_calib/data/Module_227_Calib CS_M227_2018-07-26 +./JFMC_CalibWriter_wBP 227 + + +Module 232 +./CuFluo_analysis 232 G0 /mnt/pcmoench_jungfrau_calib/data/Module_232_Calib pedeG0_M232_2018-07-27 CuFluoG0_M232_2018-07-27 +./CuFluo_analysis 232 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_232_Calib pedeHG0_M232_2018-07-27 CuFluoHG0_M232_2018-07-27 +./BP_analysis 232 /mnt/pcmoench_jungfrau_calib/data/Module_232_Calib/BP_M232_2018-07-26 +./CS_analysis 232 /mnt/pcmoench_jungfrau_calib/data/Module_232_Calib CS_M232_2018-07-26 +./JFMC_CalibWriter_wBP 232 + + 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