From f8861d52802558529fe6f174a38bd6c45e36e58c Mon Sep 17 00:00:00 2001 From: redford_s Date: Mon, 30 Apr 2018 09:00:23 +0200 Subject: [PATCH] CS analysis of a 4M. --- CS_analysis.cpp | 16 +++++++++++----- run_JFCalibration.txt | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 5 deletions(-) diff --git a/CS_analysis.cpp b/CS_analysis.cpp index 84f8369..714f2b2 100644 --- a/CS_analysis.cpp +++ b/CS_analysis.cpp @@ -76,6 +76,9 @@ 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("072"); + scan_v6.push_back("074"); + scan_v6.push_back("076"); scan_v6.push_back("080"); scan_v6.push_back("086"); scan_v6.push_back("100"); @@ -90,6 +93,11 @@ int main(int argc, char* argv[]) { scan_v6.push_back("121"); scan_v6.push_back("124"); scan_v6.push_back("126"); + scan_v6.push_back("131"); + scan_v6.push_back("204"); + scan_v6.push_back("205"); + scan_v6.push_back("208"); + scan_v6.push_back("212"); scan_v6.push_back("226"); jungfrauFile *thisfile = new jungfrauFile(); @@ -968,13 +976,11 @@ int main(int argc, char* argv[]) { grap_g1 = new TGraphErrors(r1_adc.size(),&(r1_filter[0]),&(r1_adc[0]),&(r1_ferr[0]),&(r1_adcerr[0])); - rangemin_g1 = 0; + rangemin_g1 = 2.; if (module_str == "032") { rangemin_g1 = 0.75; } else if (module_str == "003" || module_str == "008" || module_str == "040" || module_str == "044") { rangemin_g1 = *min_element(r1_filter.begin(),r1_filter.end()); - } else if (module_str == "002" || module_str == "006" || module_str == "021" || module_str == "022" || module_str == "029" || module_str == "035" || module_str == "039" || module_str == "045" || module_str == "065" || module_str == "069" || module_str == "079" || module_str == "068" || module_str == "088" || module_str == "055" || module_str == "059" || module_str == "094" || module_str == "066" || module_str == "048" || module_str == "050" || module_str == "057" || module_str == "062" || module_str == "064" || module_str == "067" || module_str == "080" || module_str == "086" || module_str == "100" || module_str == "102" || module_str == "103" || module_str == "104" || module_str == "108" || module_str == "109" || module_str == "110" || module_str == "113" || module_str == "119" || module_str == "121" || module_str == "124" || module_str == "126" || module_str == "226") { - rangemin_g1 = 2.; } rangemax_g1 = *max_element(r1_filter.begin(),r1_filter.end()); fit_g1 = new TF1("fit_g1","[0]+[1]*x",rangemin_g1,rangemax_g1); @@ -1277,9 +1283,9 @@ int main(int argc, char* argv[]) { grap_g2->FindObject("stats")->Delete(); } - if (module_str == "021" || module_str == "029" || module_str == "035" || module_str == "039" || module_str == "045" || module_str == "048" || module_str == "050" || module_str == "057" || module_str == "062" || module_str == "064" || module_str == "067" || module_str == "080" || module_str == "086" || module_str == "100" || module_str == "102" || module_str == "103" || module_str == "104" || module_str == "108" || module_str == "109" || module_str == "110" || module_str == "113" || module_str == "119" || module_str == "121" || module_str == "124" || module_str == "126" || module_str == "226") { + if (find(scan_v6.begin(), scan_v6.end(), module_str) != scan_v6.end()) { grap_g1->GetXaxis()->SetLimits(0.009,5E2); - } else if (module_str == "002" || module_str == "003") { + } else if (find(scan_v1.begin(), scan_v1.end(), module_str) != scan_v1.end()) { grap_g1->GetXaxis()->SetLimits(0.09,1.1E3); } else { grap_g1->GetXaxis()->SetLimits(0.009,1.1E2); diff --git a/run_JFCalibration.txt b/run_JFCalibration.txt index e2ce335..71f08d1 100644 --- a/run_JFCalibration.txt +++ b/run_JFCalibration.txt @@ -210,6 +210,18 @@ Module 069 ./JFMC_CalibWriter_wBP 069 +Module 072 +./CS_analysis 072 /mnt/pcmoench_jungfrau_data/Module_072_Calib CS_M072_2018-04-26 + + +Module 074 +./CS_analysis 074 /mnt/pcmoench_jungfrau_data/Module_074_Calib CS_M074_2018-04-26 + + +Module 076 +./CS_analysis 076 /mnt/pcmoench_jungfrau_data/Module_076_Calib CS_M076_2018-04-26 + + Module 079 ./CuFluo_analysis 079 G0 /mnt/pcmoench_jungfrau_data/Module_079_2017-09-18_Calib pedeG0_1655 CuFluo_10us_500Hz ./BP_analysis 079 /mnt/pcmoench_jungfrau_data/Module_079_2017-09-18_Calib/vbackpulse_scan1 @@ -352,6 +364,26 @@ Module 126 ./JFMC_CalibWriter_wBP 126 +Module 131 +./CS_analysis 131 /mnt/pcmoench_jungfrau_data/Module_131_Calib CS_M131_2018-04-26 + + +Module 204 +./CS_analysis 204 /mnt/pcmoench_jungfrau_data/Module_204_Calib CS_M204_2018-04-26 + + +Module 205 +./CS_analysis 205 /mnt/pcmoench_jungfrau_data/Module_205_Calib CS_M205_2018-04-26 + + +Module 208 +./CS_analysis 208 /mnt/pcmoench_jungfrau_data/Module_208_Calib CS_M208_2018-04-27 + + +Module 212 +./CS_analysis 212 /mnt/pcmoench_jungfrau_data/Module_212_Calib CS_M212_2018-04-26 + + Module 226 ./CuFluo_analysis 226 G0 /mnt/pcmoench_jungfrau_data/Module_226_Calib pedeG0_2018-04-25 CuFluoG0_2018-04-25 ./CuFluo_analysis 226 HG0 /mnt/pcmoench_jungfrau_data/Module_226_Calib pedeHG0_2018-04-25 CuFluoHG0_2018-04-25