From 6cea634f4cc3a56cc2454779a3daca28e3239293 Mon Sep 17 00:00:00 2001 From: redford_s Date: Mon, 11 Jun 2018 08:55:19 +0200 Subject: [PATCH] Calibrated another 4M and a strixel module for SwissFEL. --- CS_analysis.cpp | 8 +++++ JFMC_ModuleComp.cpp | 8 +++++ run_JFCalibration.txt | 69 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 85 insertions(+) diff --git a/CS_analysis.cpp b/CS_analysis.cpp index 9fbef37..02e9805 100644 --- a/CS_analysis.cpp +++ b/CS_analysis.cpp @@ -79,6 +79,7 @@ int main(int argc, char* argv[]) { scan_v6.push_back("054"); scan_v6.push_back("057"); scan_v6.push_back("058"); + scan_v6.push_back("061"); scan_v6.push_back("062"); scan_v6.push_back("064"); scan_v6.push_back("067"); @@ -91,6 +92,12 @@ int main(int argc, char* argv[]) { scan_v6.push_back("080"); scan_v6.push_back("086"); scan_v6.push_back("089"); + scan_v6.push_back("090"); + scan_v6.push_back("091"); + scan_v6.push_back("092"); + scan_v6.push_back("093"); + scan_v6.push_back("095"); + scan_v6.push_back("097"); scan_v6.push_back("098"); scan_v6.push_back("099"); scan_v6.push_back("100"); @@ -111,6 +118,7 @@ int main(int argc, char* argv[]) { scan_v6.push_back("119"); 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("131"); diff --git a/JFMC_ModuleComp.cpp b/JFMC_ModuleComp.cpp index 5563917..ce264e2 100644 --- a/JFMC_ModuleComp.cpp +++ b/JFMC_ModuleComp.cpp @@ -49,6 +49,7 @@ int main(int argc, char* argv[]) { modules.push_back(57); modules.push_back(58); modules.push_back(59); + modules.push_back(61); modules.push_back(62); modules.push_back(64); modules.push_back(65); @@ -67,7 +68,13 @@ int main(int argc, char* argv[]) { modules.push_back(86); modules.push_back(88); modules.push_back(89); + modules.push_back(90); + modules.push_back(91); + modules.push_back(92); + modules.push_back(93); modules.push_back(94); + modules.push_back(95); + modules.push_back(97); modules.push_back(98); modules.push_back(99); modules.push_back(100); @@ -87,6 +94,7 @@ int main(int argc, char* argv[]) { modules.push_back(118); modules.push_back(119); modules.push_back(121); + modules.push_back(123); modules.push_back(124); modules.push_back(126); modules.push_back(131); diff --git a/run_JFCalibration.txt b/run_JFCalibration.txt index 8b4fb55..e3b616b 100644 --- a/run_JFCalibration.txt +++ b/run_JFCalibration.txt @@ -203,6 +203,14 @@ Module 059 ./JFMC_CalibWriter_wBP 059 +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 +./BP_analysis 061 /mnt/pcmoench_jungfrau_calib/data/Module_061_Calib/BP_M061_2018-06-08 +./CS_analysis 061 /mnt/pcmoench_jungfrau_calib/data/Module_061_Calib CS_M061_2018-06-08 +./JFMC_CalibWriter_wBP 061 + + Module 062 ./CuFluo_analysis 062 G0 /mnt/pcmoench_jungfrau_data/Module_062_Calib pedeG0_M062_2018-02-27 CuFluo_G0_M062_2018-02-27 ./CuFluo_analysis 062 HG0 /mnt/pcmoench_jungfrau_data/Module_062_Calib pedeHG0_M062_2018-02-27 CuFluo_HG0_M062_2018-02-27 @@ -329,6 +337,11 @@ Module 086 ./JFMC_CalibWriter_wBP 086 +Module 087 +./CuFluo_analysis 087 G0 /mnt/pcmoench_jungfrau_calib/data/Module_087_Calib pedeG0_M087_2018-06-07 CuFluoG0_M087_2018-06-07 +./CuFluo_analysis 087 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_087_Calib pedeHG0_M087_2018-06-07 CuFluoHG0_M087_2018-06-07 + + Module 088 ./CuFluo_analysis 088 G0 /mnt/pcmoench_jungfrau_data/Module_088_2017-09-19_Calib pedeG0_1805 CuFluo_10us_500Hz ./BP_analysis 088 /mnt/pcmoench_jungfrau_data/Module_088_2017-09-19_Calib/VbackplanePulsing_scan1 @@ -344,6 +357,38 @@ Module 089 ./JFMC_CalibWriter_wBP 089 +Module 090 +./CuFluo_analysis 090 G0 /mnt/pcmoench_jungfrau_calib/data/Module_090_Calib pedeG0_M090_2018-06-07 CuFluoG0_M090_2018-06-07 +./CuFluo_analysis 090 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_090_Calib pedeHG0_M090_2018-06-07 CuFluoHG0_M090_2018-06-07 +./BP_analysis 090 /mnt/pcmoench_jungfrau_calib/data/Module_090_Calib/BP_M090_2018-06-08 +./CS_analysis 090 /mnt/pcmoench_jungfrau_calib/data/Module_090_Calib CS_M090_2018-06-08 +./JFMC_CalibWriter_wBP 090 + + +Module 091 +./CuFluo_analysis 091 G0 /mnt/pcmoench_jungfrau_calib/data/Module_091_Calib pedeG0_M091_2018-06-07 CuFluoG0_M091_2018-06-07 +./CuFluo_analysis 091 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_091_Calib pedeHG0_M091_2018-06-07 CuFluoHG0_M091_2018-06-07 +./BP_analysis 091 /mnt/pcmoench_jungfrau_calib/data/Module_091_Calib/BP_M091_2018-06-08 +./CS_analysis 091 /mnt/pcmoench_jungfrau_calib/data/Module_091_Calib CS_M091_2018-06-08 +./JFMC_CalibWriter_wBP 091 + + +Module 092 +./CuFluo_analysis 092 G0 /mnt/pcmoench_jungfrau_calib/data/Module_092_Calib pedeG0_M092_2018-06-07 CuFluoG0_M092_2018-06-07 +./CuFluo_analysis 092 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_092_Calib pedeHG0_M092_2018-06-07 CuFluoHG0_M092_2018-06-07 +./BP_analysis 092 /mnt/pcmoench_jungfrau_calib/data/Module_092_Calib/BP_M092_2018-06-08 +./CS_analysis 092 /mnt/pcmoench_jungfrau_calib/data/Module_092_Calib CS_M092_2018-06-08 +./JFMC_CalibWriter_wBP 092 + + +Module 093 +./CuFluo_analysis 093 G0 /mnt/pcmoench_jungfrau_calib/data/Module_093_Calib pedeG0_M093_2018-06-07 CuFluoG0_M093_2018-06-07 +./CuFluo_analysis 093 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_093_Calib pedeHG0_M093_2018-06-07 CuFluoHG0_M093_2018-06-07 +./BP_analysis 093 /mnt/pcmoench_jungfrau_calib/data/Module_093_Calib/BP_M093_2018-06-08 +./CS_analysis 093 /mnt/pcmoench_jungfrau_calib/data/Module_093_Calib CS_M093_2018-06-08 +./JFMC_CalibWriter_wBP 093 + + 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 @@ -353,6 +398,22 @@ Module 094 ./JFMC_CalibWriter_wBP 094 +Module 095 +./CuFluo_analysis 095 G0 /mnt/pcmoench_jungfrau_calib/data/Module_095_Calib pedeG0_M095_2018-06-07 CuFluoG0_M095_2018-06-07 +./CuFluo_analysis 095 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_095_Calib pedeHG0_M095_2018-06-07 CuFluoHG0_M095_2018-06-07 +./BP_analysis 095 /mnt/pcmoench_jungfrau_calib/data/Module_095_Calib/BP_M095_2018-06-08 +./CS_analysis 095 /mnt/pcmoench_jungfrau_calib/data/Module_095_Calib CS_M095_2018-06-08 +./JFMC_CalibWriter_wBP 095 + + +Module 097 +./CuFluo_analysis 097 G0 /mnt/pcmoench_jungfrau_calib/data/Module_097_Calib pedeG0_M097_2018-06-07 CuFluoG0_M097_2018-06-07 +./CuFluo_analysis 097 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_097_Calib pedeHG0_M097_2018-06-07 CuFluoHG0_M097_2018-06-07 +./BP_analysis 097 /mnt/pcmoench_jungfrau_calib/data/Module_097_Calib/BP_M097_2018-06-08 +./CS_analysis 097 /mnt/pcmoench_jungfrau_calib/data/Module_097_Calib CS_M097_2018-06-08 +./JFMC_CalibWriter_wBP 097 + + Module 098 ./CuFluo_analysis 098 G0 /mnt/pcmoench_jungfrau_calib/data/Module_098_Calib pedeG0_M098_2018-05-14 CuFluoG0_M098_2018-05-14 ./CuFluo_analysis 098 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_098_Calib pedeHG0_M098_2018-05-14 CuFluoHG0_M098_2018-05-14 @@ -515,6 +576,14 @@ Module 122 ./JFMC_CalibWriter_wBP 122 +Module 123 +./CuFluo_analysis 123 G0 /mnt/pcmoench_jungfrau_calib/data/Module_123_Calib pedeG0_M123_2018-06-07 CuFluoG0_M123_2018-06-07 +./CuFluo_analysis 123 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_123_Calib pedeHG0_M123_2018-06-07 CuFluoHG0_M123_2018-06-07 +./BP_analysis 123 /mnt/pcmoench_jungfrau_calib/data/Module_123_Calib/BP_M123_2018-06-08 +./CS_analysis 123 /mnt/pcmoench_jungfrau_calib/data/Module_123_Calib CS_M123_2018-06-08 +./JFMC_CalibWriter_wBP 123 + + 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