From b0769d81467cf6457270d80a3d499d35039fb3e0 Mon Sep 17 00:00:00 2001 From: redford_s Date: Mon, 9 Oct 2017 16:04:16 +0200 Subject: [PATCH] Added the current source scan for module 059. Results look good. --- JFMC_CurrentSourceScan.cpp | 8 ++++---- run_JFModuleCalib_CuFBDCS.txt | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/JFMC_CurrentSourceScan.cpp b/JFMC_CurrentSourceScan.cpp index f6f4a0d..be0635b 100644 --- a/JFMC_CurrentSourceScan.cpp +++ b/JFMC_CurrentSourceScan.cpp @@ -262,7 +262,7 @@ int main(int argc, char* argv[]) { nfiles = 2; } else if (module_str == "008" || module_str == "040" || module_str == "044") { nfiles = 3; - } else if (module_str == "006" || module_str == "045" || module_str == "022" || module_str == "065" || module_str == "069" || module_str == "079" || module_str == "068" || module_str == "088" || module_str == "055") { + } else if (module_str == "006" || module_str == "045" || module_str == "022" || module_str == "065" || module_str == "069" || module_str == "079" || module_str == "068" || module_str == "088" || module_str == "055" || module_str == "059") { nfiles = 4; } @@ -552,7 +552,7 @@ int main(int argc, char* argv[]) { for (int i = 0; i < 17; i++) { filter[i+5+9] = 5.+(i*2.5); } - } else if (module_str == "006" || module_str == "045" || module_str == "022" || module_str == "065" || module_str == "069" || module_str == "079" || module_str == "068" || module_str == "088" || module_str == "055") { + } else if (module_str == "006" || module_str == "045" || module_str == "022" || module_str == "065" || module_str == "069" || module_str == "079" || module_str == "068" || module_str == "088" || module_str == "055" || module_str == "059") { for (int i = 0; i < 9; i++) { filter[i] = 0.05+(i*0.05); } @@ -596,7 +596,7 @@ int main(int argc, char* argv[]) { m_max = 27; } else if (module_str == "008") { m_max = 35; - } else if (module_str == "006" || module_str == "045" || module_str == "022" || module_str == "065" || module_str == "069" || module_str == "079" || module_str == "068" || module_str == "088" || module_str == "055") { + } else if (module_str == "006" || module_str == "045" || module_str == "022" || module_str == "065" || module_str == "069" || module_str == "079" || module_str == "068" || module_str == "088" || module_str == "055" || module_str == "059") { m_max = 51; } @@ -626,7 +626,7 @@ int main(int argc, char* argv[]) { rangemin2 = 0.75; } else if (module_str == "008" || module_str == "021" || module_str == "040" || module_str == "044") { rangemin2 = *min_element(r1_filter.begin(),r1_filter.end()); - } else if (module_str == "006" || module_str == "022" || module_str == "045" || module_str == "065" || module_str == "069" || module_str == "079" || module_str == "068" || module_str == "088" || module_str == "055") { + } else if (module_str == "006" || module_str == "022" || module_str == "045" || module_str == "065" || module_str == "069" || module_str == "079" || module_str == "068" || module_str == "088" || module_str == "055" || module_str == "059") { rangemin2 = 2.; } double rangemax2 = *max_element(r1_filter.begin(),r1_filter.end()); diff --git a/run_JFModuleCalib_CuFBDCS.txt b/run_JFModuleCalib_CuFBDCS.txt index 05abd5a..3f830d2 100644 --- a/run_JFModuleCalib_CuFBDCS.txt +++ b/run_JFModuleCalib_CuFBDCS.txt @@ -65,6 +65,10 @@ Module 055 - replaces M045 in the 1M ./JFMC_CurrentSourceScan 055 /mnt/pcmoench_jungfrau_data1_ib/Module_055_2017-09-21_Calib CurrentSource_scan1 +Module 059 - for 1M +./JFMC_CurrentSourceScan 059 /mnt/pcmoench_jungfrau_data1_ib/Module_059_2017-10-09_Calib CurrentSource_scan2 + + Module 065 - for SOLEIL ./JFMC_CuFluoPeak 065 /mnt/pcmoench_jungfrau_data1_ib/Module_065_2017-08-29_Calib AllPede_1621 CuFluo_10us_500Hz ./JFMC_CuFluoPeakFit 065