From 9959975f1f492ae9660e77b320b417b5e633cc58 Mon Sep 17 00:00:00 2001 From: redford_s Date: Thu, 2 Aug 2018 10:51:50 +0200 Subject: [PATCH] Calibrated another 4M. --- BP_analysis.cpp | 6 ++++ CS_analysis.cpp | 14 ++++++++++ CuFluo_analysis.cpp | 6 ++++ JFMC_ModuleComp.cpp | 8 ++++++ run_JFCalibration.txt | 64 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 98 insertions(+) diff --git a/BP_analysis.cpp b/BP_analysis.cpp index 4496523..f7d15f7 100644 --- a/BP_analysis.cpp +++ b/BP_analysis.cpp @@ -67,6 +67,12 @@ int main(int argc, char* argv[]) { pixelMaskObject->maskChip(1,pixel_mask); } else if (module_str == "124") { pixelMaskObject->maskChip(1,pixel_mask); + } else if (module_str == "125") { + pixelMaskObject->maskChip(7,pixel_mask); + } else if (module_str == "223") { + pixelMaskObject->maskChip(2,pixel_mask); + } else if (module_str == "233") { + pixelMaskObject->maskChip(7,pixel_mask); } jungfrauPedestal *pedestalObjectG0 = new jungfrauPedestal(); diff --git a/CS_analysis.cpp b/CS_analysis.cpp index b4f5046..72ad225 100644 --- a/CS_analysis.cpp +++ b/CS_analysis.cpp @@ -129,13 +129,17 @@ int main(int argc, char* argv[]) { scan_v6.push_back("122"); scan_v6.push_back("123"); scan_v6.push_back("124"); + scan_v6.push_back("125"); 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("134"); + scan_v6.push_back("135"); scan_v6.push_back("200"); + scan_v6.push_back("201"); scan_v6.push_back("202"); scan_v6.push_back("204"); scan_v6.push_back("205"); @@ -144,12 +148,16 @@ 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("215"); scan_v6.push_back("219"); scan_v6.push_back("222"); + scan_v6.push_back("223"); scan_v6.push_back("224"); scan_v6.push_back("226"); scan_v6.push_back("227"); + scan_v6.push_back("229"); scan_v6.push_back("232"); + scan_v6.push_back("233"); scan_v6.push_back("234"); scan_v6.push_back("235"); scan_v6.push_back("236"); @@ -216,8 +224,14 @@ int main(int argc, char* argv[]) { pixelMaskObject->maskChip(1,pixel_mask); } else if (module_str == "124") { pixelMaskObject->maskChip(1,pixel_mask); + } else if (module_str == "125") { + pixelMaskObject->maskChip(7,pixel_mask); } else if (module_str == "209") { pixelMaskObject->maskChip(8,pixel_mask); + } else if (module_str == "223") { + pixelMaskObject->maskChip(2,pixel_mask); + } else if (module_str == "233") { + pixelMaskObject->maskChip(7,pixel_mask); } for (int i = 0; i < 640; i++) { diff --git a/CuFluo_analysis.cpp b/CuFluo_analysis.cpp index 80b7a9c..dd394e5 100644 --- a/CuFluo_analysis.cpp +++ b/CuFluo_analysis.cpp @@ -114,6 +114,12 @@ int main(int argc, char* argv[]) { pixelMaskObject->maskChip(1, pixel_mask); } else if (module_str == "124") { pixelMaskObject->maskChip(1, pixel_mask); + } else if (module_str == "125") { + pixelMaskObject->maskChip(7,pixel_mask); + } else if (module_str == "223") { + pixelMaskObject->maskChip(2,pixel_mask); + } else if (module_str == "233") { + pixelMaskObject->maskChip(7,pixel_mask); } int nevents = 0; diff --git a/JFMC_ModuleComp.cpp b/JFMC_ModuleComp.cpp index 92aceb5..b27b9dc 100644 --- a/JFMC_ModuleComp.cpp +++ b/JFMC_ModuleComp.cpp @@ -105,13 +105,17 @@ int main(int argc, char* argv[]) { modules.push_back(122); modules.push_back(123); modules.push_back(124); + modules.push_back(125); 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(134); + modules.push_back(135); modules.push_back(200); + modules.push_back(201); modules.push_back(202); modules.push_back(204); modules.push_back(205); @@ -120,12 +124,16 @@ int main(int argc, char* argv[]) { modules.push_back(209); modules.push_back(210); modules.push_back(212); + modules.push_back(215); modules.push_back(219); 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(232); + modules.push_back(233); modules.push_back(234); modules.push_back(235); modules.push_back(236); diff --git a/run_JFCalibration.txt b/run_JFCalibration.txt index 95587d7..51f0bc7 100644 --- a/run_JFCalibration.txt +++ b/run_JFCalibration.txt @@ -665,6 +665,14 @@ Module 124 ./JFMC_CalibWriter_wBP 124 +Module 125 +./CuFluo_analysis 125 G0 /mnt/pcmoench_jungfrau_calib/data/Module_125_Calib pedeG0_M125_2018-07-31 CuFluoG0_M125_2018-07-31 +./CuFluo_analysis 125 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_125_Calib pedeHG0_M125_2018-07-31 CuFluoHG0_M125_2018-07-31 +./BP_analysis 125 /mnt/pcmoench_jungfrau_calib/data/Module_125_Calib/BP_M125_2018-07-30 +./CS_analysis 125 /mnt/pcmoench_jungfrau_calib/data/Module_125_Calib CS_M125_2018-07-30 +./JFMC_CalibWriter_wBP 125 + + Module 126 ./CuFluo_analysis 126 G0 /mnt/pcmoench_jungfrau_data/Module_126_2017-11-22_Calib pedeG0_1820 CuFluo_G0 ./CuFluo_analysis 126 HG0 /mnt/pcmoench_jungfrau_data/Module_126_2017-11-22_Calib pedeHG0_1828 CuFluo_HG0 @@ -713,6 +721,22 @@ Module 133 ./JFMC_CalibWriter_wBP 133 +Module 134 +./CuFluo_analysis 134 G0 /mnt/pcmoench_jungfrau_calib/data/Module_134_Calib pedeG0_M134_2018-07-31 CuFluoG0_M134_2018-07-31 +./CuFluo_analysis 134 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_134_Calib pedeHG0_M134_2018-07-31 CuFluoHG0_M134_2018-07-31 +./BP_analysis 134 /mnt/pcmoench_jungfrau_calib/data/Module_134_Calib/BP_M134_2018-07-30 +./CS_analysis 134 /mnt/pcmoench_jungfrau_calib/data/Module_134_Calib CS_M134_2018-07-30 +./JFMC_CalibWriter_wBP 134 + + +Module 135 +./CuFluo_analysis 135 G0 /mnt/pcmoench_jungfrau_calib/data/Module_135_Calib pedeG0_M135_2018-07-31 CuFluoG0_M135_2018-07-31 +./CuFluo_analysis 135 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_135_Calib pedeHG0_M135_2018-07-31 CuFluoHG0_M135_2018-07-31 +./BP_analysis 135 /mnt/pcmoench_jungfrau_calib/data/Module_135_Calib/BP_M135_2018-07-30 +./CS_analysis 135 /mnt/pcmoench_jungfrau_calib/data/Module_135_Calib CS_M135_2018-07-30 +./JFMC_CalibWriter_wBP 135 + + 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 @@ -721,6 +745,14 @@ Module 200 ./JFMC_CalibWriter_wBP 200 +Module 201 +./CuFluo_analysis 201 G0 /mnt/pcmoench_jungfrau_calib/data/Module_201_Calib pedeG0_M201_2018-07-31 CuFluoG0_M201_2018-07-31 +./CuFluo_analysis 201 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_201_Calib pedeHG0_M201_2018-07-31 CuFluoHG0_M201_2018-07-31 +./BP_analysis 201 /mnt/pcmoench_jungfrau_calib/data/Module_201_Calib/BP_M201_2018-07-30 +./CS_analysis 201 /mnt/pcmoench_jungfrau_calib/data/Module_201_Calib CS_M201_2018-07-30 +./JFMC_CalibWriter_wBP 201 + + 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 @@ -785,6 +817,14 @@ Module 212 ./JFMC_CalibWriter_wBP 212 +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 +./BP_analysis 215 /mnt/pcmoench_jungfrau_calib/data/Module_215_Calib/BP_M215_2018-07-30 +./CS_analysis 215 /mnt/pcmoench_jungfrau_calib/data/Module_215_Calib CS_M215_2018-07-30 +./JFMC_CalibWriter_wBP 215 + + 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 @@ -801,6 +841,14 @@ Module 222 ./JFMC_CalibWriter_wBP 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 +./JFMC_CalibWriter_wBP 223 + + Module 224 ./CuFluo_analysis 224 G0 /mnt/pcmoench_jungfrau_calib/data/Module_224_Calib pedeG0_M224_2018-05-14 CuFluoG0_M224_2018-05-14 ./CuFluo_analysis 224 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_224_Calib pedeHG0_M224_2018-05-14 CuFluoHG0_M224_2018-05-14 @@ -825,6 +873,14 @@ Module 227 ./JFMC_CalibWriter_wBP 227 +Module 229 +./CuFluo_analysis 229 G0 /mnt/pcmoench_jungfrau_calib/data/Module_229_Calib pedeG0_M229_2018-07-31 CuFluoG0_M229_2018-07-31 +./CuFluo_analysis 229 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_229_Calib pedeHG0_M229_2018-07-31 CuFluoHG0_M229_2018-07-31 +./BP_analysis 229 /mnt/pcmoench_jungfrau_calib/data/Module_229_Calib/BP_M229_2018-07-30 +./CS_analysis 229 /mnt/pcmoench_jungfrau_calib/data/Module_229_Calib CS_M229_2018-07-30 +./JFMC_CalibWriter_wBP 229 + + 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 @@ -833,6 +889,14 @@ Module 232 ./JFMC_CalibWriter_wBP 232 +Module 233 +./CuFluo_analysis 233 G0 /mnt/pcmoench_jungfrau_calib/data/Module_233_Calib pedeG0_M233_2018-07-31 CuFluoG0_M233_2018-07-31 +./CuFluo_analysis 233 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_233_Calib pedeHG0_M233_2018-07-31 CuFluoHG0_M233_2018-07-31 +./BP_analysis 233 /mnt/pcmoench_jungfrau_calib/data/Module_233_Calib/BP_M233_2018-07-30 +./CS_analysis 233 /mnt/pcmoench_jungfrau_calib/data/Module_233_Calib CS_M233_2018-07-30 +./JFMC_CalibWriter_wBP 233 + + 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