From 68c0f21bd261cb0a0bb18e9e613186edcaa67ff3 Mon Sep 17 00:00:00 2001 From: redford_s Date: Thu, 26 Jul 2018 09:07:21 +0200 Subject: [PATCH] Calibrated another 4M. --- CS_analysis.cpp | 8 ++++++ JFMC_ModuleComp.cpp | 8 ++++++ run_JFCalibration.txt | 64 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 80 insertions(+) diff --git a/CS_analysis.cpp b/CS_analysis.cpp index f4df083..c465719 100644 --- a/CS_analysis.cpp +++ b/CS_analysis.cpp @@ -86,6 +86,7 @@ int main(int argc, char* argv[]) { scan_v6.push_back("062"); scan_v6.push_back("064"); scan_v6.push_back("067"); + scan_v6.push_back("070"); scan_v6.push_back("071"); scan_v6.push_back("072"); scan_v6.push_back("073"); @@ -112,19 +113,26 @@ int main(int argc, char* argv[]) { scan_v6.push_back("108"); scan_v6.push_back("109"); scan_v6.push_back("110"); + scan_v6.push_back("111"); scan_v6.push_back("112"); scan_v6.push_back("113"); scan_v6.push_back("114"); + scan_v6.push_back("115"); scan_v6.push_back("116"); scan_v6.push_back("117"); scan_v6.push_back("118"); scan_v6.push_back("119"); + scan_v6.push_back("120"); scan_v6.push_back("121"); scan_v6.push_back("122"); scan_v6.push_back("123"); scan_v6.push_back("124"); scan_v6.push_back("126"); + scan_v6.push_back("129"); + scan_v6.push_back("130"); scan_v6.push_back("131"); + scan_v6.push_back("132"); + scan_v6.push_back("133"); scan_v6.push_back("204"); scan_v6.push_back("205"); scan_v6.push_back("208"); diff --git a/JFMC_ModuleComp.cpp b/JFMC_ModuleComp.cpp index 721b47c..772b590 100644 --- a/JFMC_ModuleComp.cpp +++ b/JFMC_ModuleComp.cpp @@ -60,6 +60,7 @@ int main(int argc, char* argv[]) { modules.push_back(67); modules.push_back(68); modules.push_back(69); + modules.push_back(70); modules.push_back(71); modules.push_back(72); modules.push_back(73); @@ -89,18 +90,25 @@ int main(int argc, char* argv[]) { modules.push_back(108); modules.push_back(109); modules.push_back(110); + modules.push_back(111); modules.push_back(112); modules.push_back(113); modules.push_back(114); + modules.push_back(115); modules.push_back(116); modules.push_back(117); modules.push_back(118); modules.push_back(119); + modules.push_back(120); modules.push_back(121); modules.push_back(123); modules.push_back(124); modules.push_back(126); + modules.push_back(129); + modules.push_back(130); modules.push_back(131); + modules.push_back(132); + modules.push_back(133); modules.push_back(204); modules.push_back(205); modules.push_back(206); diff --git a/run_JFCalibration.txt b/run_JFCalibration.txt index db9f56e..f3707b3 100644 --- a/run_JFCalibration.txt +++ b/run_JFCalibration.txt @@ -290,6 +290,14 @@ Module 069 ./JFMC_CalibWriter_wBP 069 +Module 070 +./CuFluo_analysis 070 G0 /mnt/pcmoench_jungfrau_calib/data/Module_070_Calib pedeG0_M070_2018-07-25 CuFluoG0_M070_2018-07-25 +./CuFluo_analysis 070 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_070_Calib pedeHG0_M070_2018-07-25 CuFluoHG0_M070_2018-07-25 +./BP_analysis 070 /mnt/pcmoench_jungfrau_calib/data/Module_070_Calib/BP_M070_2018-07-24 +./CS_analysis 070 /mnt/pcmoench_jungfrau_calib/data/Module_070_Calib CS_M070_2018-07-24 +./JFMC_CalibWriter_wBP 070 + + Module 071 ./CuFluo_analysis 071 G0 /mnt/pcmoench_jungfrau_calib/data/Module_071_Calib pedeG0_M071_2018-05-14 CuFluoG0_M071_2018-05-14 ./CuFluo_analysis 071 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_071_Calib pedeHG0_M071_2018-05-14 CuFluoHG0_M071_2018-05-14 @@ -529,6 +537,14 @@ Module 110 ./JFMC_CalibWriter_wBP 110 +Module 111 +./CuFluo_analysis 111 G0 /mnt/pcmoench_jungfrau_calib/data/Module_111_Calib pedeG0_M111_2018-07-25 CuFluoG0_M111_2018-07-25 +./CuFluo_analysis 111 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_111_Calib pedeHG0_M111_2018-07-25 CuFluoHG0_M111_2018-07-25 +./BP_analysis 111 /mnt/pcmoench_jungfrau_calib/data/Module_111_Calib/BP_M111_2018-07-24 +./CS_analysis 111 /mnt/pcmoench_jungfrau_calib/data/Module_111_Calib CS_M111_2018-07-24 +./JFMC_CalibWriter_wBP 111 + + Module 112 ./CuFluo_analysis 112 G0 /mnt/pcmoench_jungfrau_calib/data/Module_112_Calib pedeG0_M112_2018-05-16 CuFluoG0_M112_2018-05-16 ./CuFluo_analysis 112 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_112_Calib pedeHG0_M112_2018-05-16 CuFluoHG0_M112_2018-05-16 @@ -553,6 +569,14 @@ Module 114 ./JFMC_CalibWriter_wBP 114 +Module 115 +./CuFluo_analysis 115 G0 /mnt/pcmoench_jungfrau_calib/data/Module_115_Calib pedeG0_M115_2018-07-25 CuFluoG0_M115_2018-07-25 +./CuFluo_analysis 115 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_115_Calib pedeHG0_M115_2018-07-25 CuFluoHG0_M115_2018-07-25 +./BP_analysis 115 /mnt/pcmoench_jungfrau_calib/data/Module_115_Calib/BP_M115_2018-07-24 +./CS_analysis 115 /mnt/pcmoench_jungfrau_calib/data/Module_115_Calib CS_M115_2018-07-24 +./JFMC_CalibWriter_wBP 115 + + Module 116 ./CuFluo_analysis 116 G0 /mnt/pcmoench_jungfrau_calib/data/Module_116_Calib pedeG0_M116_2018-05-16 CuFluoG0_M116_2018-05-16 ./CuFluo_analysis 116 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_116_Calib pedeHG0_M116_2018-05-16 CuFluoHG0_M116_2018-05-16 @@ -585,6 +609,14 @@ Module 119 ./JFMC_CalibWriter_wBP 119 +Module 120 +./CuFluo_analysis 120 G0 /mnt/pcmoench_jungfrau_calib/data/Module_120_Calib pedeG0_M120_2018-07-25 CuFluoG0_M120_2018-07-25 +./CuFluo_analysis 120 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_120_Calib pedeHG0_M120_2018-07-25 CuFluoHG0_M120_2018-07-25 +./BP_analysis 120 /mnt/pcmoench_jungfrau_calib/data/Module_120_Calib/BP_M120_2018-07-24 +./CS_analysis 120 /mnt/pcmoench_jungfrau_calib/data/Module_120_Calib CS_M120_2018-07-24 +./JFMC_CalibWriter_wBP 120 + + Module 121 ./CuFluo_analysis 121 G0 /mnt/pcmoench_jungfrau_data/Module_121_Calib M121_2018-04-17_pedeG0 M121_2018-04-17_CuFluoG0 ./CuFluo_analysis 121 HG0 /mnt/pcmoench_jungfrau_data/Module_121_Calib M121_2018-04-17_pedeHG0 M121_2018-04-17_CuFluoHG0 @@ -625,6 +657,22 @@ Module 126 ./JFMC_CalibWriter_wBP 126 +Module 129 +./CuFluo_analysis 129 G0 /mnt/pcmoench_jungfrau_calib/data/Module_129_Calib pedeG0_M129_2018-07-25 CuFluoG0_M129_2018-07-25 +./CuFluo_analysis 129 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_129_Calib pedeHG0_M129_2018-07-25 CuFluoHG0_M129_2018-07-25 +./BP_analysis 129 /mnt/pcmoench_jungfrau_calib/data/Module_129_Calib/BP_M129_2018-07-24 +./CS_analysis 129 /mnt/pcmoench_jungfrau_calib/data/Module_129_Calib CS_M129_2018-07-24 +./JFMC_CalibWriter_wBP 129 + + +Module 130 +./CuFluo_analysis 130 G0 /mnt/pcmoench_jungfrau_calib/data/Module_130_Calib pedeG0_M130_2018-07-25 CuFluoG0_M130_2018-07-25 +./CuFluo_analysis 130 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_130_Calib pedeHG0_M130_2018-07-25 CuFluoHG0_M130_2018-07-25 +./BP_analysis 130 /mnt/pcmoench_jungfrau_calib/data/Module_130_Calib/BP_M130_2018-07-24 +./CS_analysis 130 /mnt/pcmoench_jungfrau_calib/data/Module_130_Calib CS_M130_2018-07-24 +./JFMC_CalibWriter_wBP 130 + + Module 131 ./CuFluo_analysis 131 G0 /mnt/pcmoench_jungfrau_data/Module_131_Calib pedeG0_M131_2018-05-02 CuFluoG0_M131_2018-05-02 ./CuFluo_analysis 131 HG0 /mnt/pcmoench_jungfrau_data/Module_131_Calib pedeHG0_M131_2018-05-02 CuFluoHG0_M131_2018-05-02 @@ -633,6 +681,22 @@ Module 131 ./JFMC_CalibWriter_wBP 131 +Module 132 +./CuFluo_analysis 132 G0 /mnt/pcmoench_jungfrau_calib/data/Module_132_Calib pedeG0_M132_2018-07-25 CuFluoG0_M132_2018-07-25 +./CuFluo_analysis 132 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_132_Calib pedeHG0_M132_2018-07-25 CuFluoHG0_M132_2018-07-25 +./BP_analysis 132 /mnt/pcmoench_jungfrau_calib/data/Module_132_Calib/BP_M132_2018-07-24 +./CS_analysis 132 /mnt/pcmoench_jungfrau_calib/data/Module_132_Calib CS_M132_2018-07-24 +./JFMC_CalibWriter_wBP 132 + + +Module 133 +./CuFluo_analysis 133 G0 /mnt/pcmoench_jungfrau_calib/data/Module_133_Calib pedeG0_M133_2018-07-25 CuFluoG0_M133_2018-07-25 +./CuFluo_analysis 133 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_133_Calib pedeHG0_M133_2018-07-25 CuFluoHG0_M133_2018-07-25 +./BP_analysis 133 /mnt/pcmoench_jungfrau_calib/data/Module_133_Calib/BP_M133_2018-07-24 +./CS_analysis 133 /mnt/pcmoench_jungfrau_calib/data/Module_133_Calib CS_M133_2018-07-24 +./JFMC_CalibWriter_wBP 133 + + 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