From 19f90a6d39791da502932496670bdf7cf73d659c Mon Sep 17 00:00:00 2001 From: redford_s Date: Tue, 7 Aug 2018 16:44:29 +0200 Subject: [PATCH] Calibrated another 4M. Recalibrated module 223. 231 only calibrated for G0. --- CS_analysis.cpp | 6 +++++ JFMC_ModuleComp.cpp | 7 +++++ run_JFCalibration.txt | 62 ++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 71 insertions(+), 4 deletions(-) diff --git a/CS_analysis.cpp b/CS_analysis.cpp index 1fd1125..afeec4f 100644 --- a/CS_analysis.cpp +++ b/CS_analysis.cpp @@ -141,6 +141,7 @@ int main(int argc, char* argv[]) { scan_v6.push_back("200"); scan_v6.push_back("201"); scan_v6.push_back("202"); + scan_v6.push_back("203"); scan_v6.push_back("204"); scan_v6.push_back("205"); scan_v6.push_back("206"); @@ -148,8 +149,13 @@ int main(int argc, char* argv[]) { scan_v6.push_back("209"); scan_v6.push_back("210"); scan_v6.push_back("212"); + scan_v6.push_back("214"); scan_v6.push_back("215"); + scan_v6.push_back("216"); + scan_v6.push_back("217"); + scan_v6.push_back("218"); scan_v6.push_back("219"); + scan_v6.push_back("221"); scan_v6.push_back("222"); scan_v6.push_back("223"); scan_v6.push_back("224"); diff --git a/JFMC_ModuleComp.cpp b/JFMC_ModuleComp.cpp index b27b9dc..382779c 100644 --- a/JFMC_ModuleComp.cpp +++ b/JFMC_ModuleComp.cpp @@ -117,6 +117,7 @@ int main(int argc, char* argv[]) { modules.push_back(200); modules.push_back(201); modules.push_back(202); + modules.push_back(203); modules.push_back(204); modules.push_back(205); modules.push_back(206); @@ -124,14 +125,20 @@ int main(int argc, char* argv[]) { modules.push_back(209); modules.push_back(210); modules.push_back(212); + modules.push_back(214); modules.push_back(215); + modules.push_back(216); + modules.push_back(217); + modules.push_back(218); modules.push_back(219); + modules.push_back(221); modules.push_back(222); modules.push_back(223); modules.push_back(224); modules.push_back(226); modules.push_back(227); modules.push_back(229); + modules.push_back(231); modules.push_back(232); modules.push_back(233); modules.push_back(234); diff --git a/run_JFCalibration.txt b/run_JFCalibration.txt index 51f0bc7..59810e8 100644 --- a/run_JFCalibration.txt +++ b/run_JFCalibration.txt @@ -761,6 +761,14 @@ Module 202 ./JFMC_CalibWriter_wBP 202 +Module 203 +./CuFluo_analysis 203 G0 /mnt/pcmoench_jungfrau_calib/data/Module_203_Calib pedeG0_M203_2018-08-03 CuFluoG0_M203_2018-08-03 +./CuFluo_analysis 203 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_203_Calib pedeHG0_M203_2018-08-03 CuFluoHG0_M203_2018-08-03 +./BP_analysis 203 /mnt/pcmoench_jungfrau_calib/data/Module_203_Calib/BP_M203_2018-08-06 +./CS_analysis 203 /mnt/pcmoench_jungfrau_calib/data/Module_203_Calib CS_M203_2018-08-03 +./JFMC_CalibWriter_wBP 203 + + 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 @@ -817,6 +825,14 @@ Module 212 ./JFMC_CalibWriter_wBP 212 +Module 214 +./CuFluo_analysis 214 G0 /mnt/pcmoench_jungfrau_calib/data/Module_214_Calib pedeG0_M214_2018-08-03 CuFluoG0_M214_2018-08-03 +./CuFluo_analysis 214 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_214_Calib pedeHG0_M214_2018-08-03 CuFluoHG0_M214_2018-08-03 +./BP_analysis 214 /mnt/pcmoench_jungfrau_calib/data/Module_214_Calib/BP_M214_2018-08-06 +./CS_analysis 214 /mnt/pcmoench_jungfrau_calib/data/Module_214_Calib CS_M214_2018-08-03 +./JFMC_CalibWriter_wBP 214 + + Module 215 ./CuFluo_analysis 215 G0 /mnt/pcmoench_jungfrau_calib/data/Module_215_Calib pedeG0_M215_2018-07-31 CuFluoG0_M215_2018-07-31 ./CuFluo_analysis 215 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_215_Calib pedeHG0_M215_2018-07-31 CuFluoHG0_M215_2018-07-31 @@ -825,6 +841,30 @@ Module 215 ./JFMC_CalibWriter_wBP 215 +Module 216 +./CuFluo_analysis 216 G0 /mnt/pcmoench_jungfrau_calib/data/Module_216_Calib pedeG0_M216_2018-08-03 CuFluoG0_M216_2018-08-03 +./CuFluo_analysis 216 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_216_Calib pedeHG0_M216_2018-08-03 CuFluoHG0_M216_2018-08-03 +./BP_analysis 216 /mnt/pcmoench_jungfrau_calib/data/Module_216_Calib/BP_M216_2018-08-06 +./CS_analysis 216 /mnt/pcmoench_jungfrau_calib/data/Module_216_Calib CS_M216_2018-08-03 +./JFMC_CalibWriter_wBP 216 + + +Module 217 +./CuFluo_analysis 217 G0 /mnt/pcmoench_jungfrau_calib/data/Module_217_Calib pedeG0_M217_2018-08-03 CuFluoG0_M217_2018-08-03 +./CuFluo_analysis 217 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_217_Calib pedeHG0_M217_2018-08-03 CuFluoHG0_M217_2018-08-03 +./BP_analysis 217 /mnt/pcmoench_jungfrau_calib/data/Module_217_Calib/BP_M217_2018-08-06 +./CS_analysis 217 /mnt/pcmoench_jungfrau_calib/data/Module_217_Calib CS_M217_2018-08-03 +./JFMC_CalibWriter_wBP 217 + + +Module 218 +./CuFluo_analysis 218 G0 /mnt/pcmoench_jungfrau_calib/data/Module_218_Calib pedeG0_M218_2018-08-03 CuFluoG0_M218_2018-08-03 +./CuFluo_analysis 218 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_218_Calib pedeHG0_M218_2018-08-03 CuFluoHG0_M218_2018-08-03 +./BP_analysis 218 /mnt/pcmoench_jungfrau_calib/data/Module_218_Calib/BP_M218_2018-08-06 +./CS_analysis 218 /mnt/pcmoench_jungfrau_calib/data/Module_218_Calib CS_M218_2018-08-03 +./JFMC_CalibWriter_wBP 218 + + Module 219 ./CuFluo_analysis 219 G0 /mnt/pcmoench_jungfrau_calib/data/Module_219_Calib pedeG0_M219_2018-05-14 CuFluoG0_M219_2018-05-14 ./CuFluo_analysis 219 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_219_Calib pedeHG0_M219_2018-05-14 CuFluoHG0_M219_2018-05-14 @@ -833,6 +873,14 @@ Module 219 ./JFMC_CalibWriter_wBP 219 +Module 221 +./CuFluo_analysis 221 G0 /mnt/pcmoench_jungfrau_calib/data/Module_221_Calib pedeG0_M221_2018-08-03 CuFluoG0_M221_2018-08-03 +./CuFluo_analysis 221 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_221_Calib pedeHG0_M221_2018-08-03 CuFluoHG0_M221_2018-08-03 +./BP_analysis 221 /mnt/pcmoench_jungfrau_calib/data/Module_221_Calib/BP_M221_2018-08-06 +./CS_analysis 221 /mnt/pcmoench_jungfrau_calib/data/Module_221_Calib CS_M221_2018-08-03 +./JFMC_CalibWriter_wBP 221 + + Module 222 ./CuFluo_analysis 222 G0 /mnt/pcmoench_jungfrau_data/Module_222_Calib pedeG0_M222_2018-05-02 CuFluoG0_M222_2018-05-02 ./CuFluo_analysis 222 HG0 /mnt/pcmoench_jungfrau_data/Module_222_Calib pedeHG0_M222_2018-05-02 CuFluoHG0_M222_2018-05-02 @@ -842,10 +890,10 @@ Module 222 Module 223 -./CuFluo_analysis 223 G0 /mnt/pcmoench_jungfrau_calib/data/Module_223_Calib pedeG0_M223_2018-07-31 CuFluoG0_M223_2018-07-31 -./CuFluo_analysis 223 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_223_Calib pedeHG0_M223_2018-07-31 CuFluoHG0_M223_2018-07-31 -./BP_analysis 223 /mnt/pcmoench_jungfrau_calib/data/Module_223_Calib/BP_M223_2018-07-30 -./CS_analysis 223 /mnt/pcmoench_jungfrau_calib/data/Module_223_Calib CS_M223_2018-07-30 +./CuFluo_analysis 223 G0 /mnt/pcmoench_jungfrau_calib/data/Module_223_Calib pedeG0_M223_2018-08-03 CuFluoG0_M223_2018-08-03 +./CuFluo_analysis 223 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_223_Calib pedeHG0_M223_2018-08-03 CuFluoHG0_M223_2018-08-03 +./BP_analysis 223 /mnt/pcmoench_jungfrau_calib/data/Module_223_Calib/BP_M223_2018-08-06 +./CS_analysis 223 /mnt/pcmoench_jungfrau_calib/data/Module_223_Calib CS_M223_2018-08-03 ./JFMC_CalibWriter_wBP 223 @@ -881,6 +929,12 @@ Module 229 ./JFMC_CalibWriter_wBP 229 +Module 231 +./CuFluo_analysis 231 G0 /mnt/pcmoench_jungfrau_calib/data/Module_231_Calib pedeG0_M231_2018-08-03 CuFluoG0_M231_2018-08-03 +./CuFluo_analysis 231 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_231_Calib pedeHG0_M231_2018-08-03 CuFluoHG0_M231_2018-08-03 +./JFMC_CalibWriter_wBP 231 + + 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