From ae9ebeaad0233c92baa8d7c534f1c34ff9a9e061 Mon Sep 17 00:00:00 2001 From: redford_s Date: Wed, 22 Feb 2017 16:17:33 +0100 Subject: [PATCH] Added calibration for module 044. Some small changes in data paths. --- JFMC_CuFluoPeak.cpp | 2 +- JFMC_CuFluoPeakFit.cpp | 8 +++--- JFMC_CurrentSourceScan.cpp | 46 +++++++++++++++++++++++------------ JFMC_DirectBeamScan.cpp | 18 ++++++-------- run_JFModuleCalib_CuFBDCS.txt | 16 +++++++++--- 5 files changed, 53 insertions(+), 37 deletions(-) diff --git a/JFMC_CuFluoPeak.cpp b/JFMC_CuFluoPeak.cpp index fd085be..8542bf7 100644 --- a/JFMC_CuFluoPeak.cpp +++ b/JFMC_CuFluoPeak.cpp @@ -241,7 +241,7 @@ int main(int argc, char* argv[]) { } thisfile->close(); - sprintf(savename,"%s_ana_M%s/Fluo_file%d.root", data_loc.c_str(), module_str.c_str(), filen); + sprintf(savename,"/mnt/pcmoench_jungfrau_data/jungfrau_ana_sophie/M%s_CalibAna/Fluo_file%d.root", module_str.c_str(), filen); TFile* saved_file = new TFile((const char *)(savename),"RECREATE"); adc2d_1->Write(); adc2d_2->Write(); diff --git a/JFMC_CuFluoPeakFit.cpp b/JFMC_CuFluoPeakFit.cpp index 8a48535..7c928da 100644 --- a/JFMC_CuFluoPeakFit.cpp +++ b/JFMC_CuFluoPeakFit.cpp @@ -21,23 +21,21 @@ int main(int argc, char* argv[]) { jungfrauStyle(); gStyle->SetOptFit(11); - if (argc != 3) { + if (argc != 2) { cout << "Correct usage:" << endl; cout << "arg 1: specify module number" << endl; - cout << "arg 2: specify data location" << endl; - cout << "eg: ./JFMC_FluoCalibFit 006 /data_pool/Module_006_161116" << endl; + cout << "eg: ./JFMC_FluoCalibFit 006" << endl; cout << " " << endl; exit(1); } string module_str = argv[1]; - string data_loc = argv[2]; char histoname[128]; char savename[128]; TCanvas* c1 = new TCanvas("c1",""); - sprintf(savename,"%s_ana_M%s/Fluo_comb.root", data_loc.c_str(), module_str.c_str()); + sprintf(savename,"/mnt/pcmoench_jungfrau_data/jungfrau_ana_sophie/M%s_CalibAna/Fluo_comb.root", module_str.c_str()); TFile* comb_file = new TFile((const char *)(savename),"READ"); TH1F* peak_fit_pos = new TH1F("peak_fit_pos","",100,250,400); diff --git a/JFMC_CurrentSourceScan.cpp b/JFMC_CurrentSourceScan.cpp index fd1f545..d8a5707 100644 --- a/JFMC_CurrentSourceScan.cpp +++ b/JFMC_CurrentSourceScan.cpp @@ -84,14 +84,26 @@ int main(int argc, char* argv[]) { } double filter[35]; - for (int i = 0; i < 9; i++) { - filter[i] = 0.05+(i*0.025); - } - for (int i = 0; i < 9; i++) { - filter[i+9] = 0.5+(i*0.25); - } - for (int i = 0; i < 17; i++) { - filter[i+9+9] = 5.+(i*2.5); + if (module_str == "044") { + for (int i = 0; i < 5; i++) { + filter[i] = 0.05+(i*0.05); + } + for (int i = 0; i < 9; i++) { + filter[i+5] = 0.5+(i*0.25); + } + for (int i = 0; i < 17; i++) { + filter[i+5+9] = 5.+(i*2.5); + } + } else { + for (int i = 0; i < 9; i++) { + filter[i] = 0.05+(i*0.025); + } + for (int i = 0; i < 9; i++) { + filter[i+9] = 0.5+(i*0.25); + } + for (int i = 0; i < 17; i++) { + filter[i+9+9] = 5.+(i*2.5); + } } static double adcmeans_g1[NCH][35]; @@ -151,7 +163,7 @@ int main(int argc, char* argv[]) { int f_max = 0; if (module_str == "032" || module_str == "021" || module_str == "022") { f_max = 3; - } else if (module_str == "006" || module_str == "008") { + } else if (module_str == "006" || module_str == "008" || module_str == "044") { f_max = 4; } @@ -234,6 +246,8 @@ int main(int argc, char* argv[]) { last_frame = 19199; } else if (module_str == "006" || module_str == "008") { last_frame = 24319; + } else if (module_str == "044") { + last_frame = 24319; } if (j%640 == 0 || j == last_frame) { @@ -339,13 +353,13 @@ int main(int argc, char* argv[]) { TH1F *g1_avg; if (module_str == "032") { g1_avg = new TH1F("g1_avg","",100,-12000,-4000); - } else if (module_str == "022" || module_str == "021" || module_str == "006" || module_str == "008") { + } else if (module_str == "022" || module_str == "021" || module_str == "006" || module_str == "008" || module_str == "044") { g1_avg = new TH1F("g1_avg","",100,-3000,0); } TH1F *g2_avg; if (module_str == "032") { g2_avg = new TH1F("g2_avg","",100,-1000,-200); - } else if (module_str == "022" || module_str == "021" || module_str == "006" || module_str == "008") { + } else if (module_str == "022" || module_str == "021" || module_str == "006" || module_str == "008" || module_str == "044") { g2_avg = new TH1F("g2_avg","",100,-300,0); } @@ -389,7 +403,7 @@ int main(int argc, char* argv[]) { // filter out points at zero int m_max = 0; - if (module_str == "032" || module_str == "021" || module_str == "022") { + if (module_str == "032" || module_str == "021" || module_str == "022" || module_str == "044") { m_max = 27; } else if (module_str == "006" || module_str == "008") { m_max = 35; @@ -428,7 +442,7 @@ int main(int argc, char* argv[]) { if (module_str == "032") { rangemin2 = 0.75; rangemax2 = *max_element(r1_filter.begin(),r1_filter.end()); - } else if (module_str == "022" || module_str == "021" || module_str == "006" || module_str == "008") { + } else if (module_str == "022" || module_str == "021" || module_str == "006" || module_str == "008" || module_str == "044") { rangemin2 = 0.075; rangemax2 = 2.5; } @@ -461,7 +475,7 @@ int main(int argc, char* argv[]) { if (module_str == "032" || module_str == "022" || module_str == "021") { rangemin3 = 5; rangemax3 = *max_element(r3_filter.begin(),r3_filter.end()); - } else if (module_str == "006" || module_str == "008") { + } else if (module_str == "006" || module_str == "008" || module_str == "044") { rangemin3 = 7.5; rangemax3 = *max_element(r3_filter.begin(),r3_filter.end()); } @@ -642,7 +656,7 @@ int main(int argc, char* argv[]) { g1map_avg->GetYaxis()->SetTitleOffset(0.7); if (module_str == "032") { g1map_avg->GetZaxis()->SetRangeUser(-12000,-4000); - } else if (module_str == "022" || module_str == "021" || module_str == "006" || module_str == "008") { + } else if (module_str == "022" || module_str == "021" || module_str == "006" || module_str == "008" || module_str == "044") { g1map_avg->GetZaxis()->SetRangeUser(-3000,0); } g1map_avg->Draw("colz"); @@ -654,7 +668,7 @@ int main(int argc, char* argv[]) { g2map_avg->GetYaxis()->SetTitleOffset(0.7); if (module_str == "032") { g2map_avg->GetZaxis()->SetRangeUser(-800,-400); - } else if (module_str == "022" || module_str == "021" || module_str == "006" || module_str == "008") { + } else if (module_str == "022" || module_str == "021" || module_str == "006" || module_str == "008" || module_str == "044") { g2map_avg->GetZaxis()->SetRangeUser(-300,0); } g2map_avg->Draw("colz"); diff --git a/JFMC_DirectBeamScan.cpp b/JFMC_DirectBeamScan.cpp index 6f4b054..f58ba5a 100644 --- a/JFMC_DirectBeamScan.cpp +++ b/JFMC_DirectBeamScan.cpp @@ -528,19 +528,16 @@ int main(int argc, char* argv[]) { TF1 *fit2_e; if (r0_adc.size() > 1) { - //if (runAnalysis == 2) { if (module_str == "028") { fit1 = new TF1("fit1","[0]+[1]*x",2,10); - //} else if (runAnalysis == 3 || runAnalysis == 4) { } else if (module_str == "021" || module_str == "022") { fit1 = new TF1("fit1","[0]+[1]*x",2,8); - //fit1 = new TF1("fit1","[0]+[1]*x",2,8); - //} else if (runAnalysis == 5) { } else if (module_str == "006") { fit1 = new TF1("fit1","[0]+[1]*x",4,14); - //} else if (runAnalysis == 6) { } else if (module_str == "008") { fit1 = new TF1("fit1","[0]+[1]*x",2,20); + } else if (module_str == "044") { + fit1 = new TF1("fit1","[0]+[1]*x",2,20); } fit1->SetParameter(0, 100.); fit1->SetParameter(1, 1); @@ -556,15 +553,14 @@ int main(int argc, char* argv[]) { fit1_e->SetLineStyle(2); } if (r1_adc.size() > 1) { - //if (runAnalysis == 2 || runAnalysis == 3 || runAnalysis == 4) { if (module_str == "028" || module_str == "021" || module_str == "022") { fit2 = new TF1("fit2","[0]+[1]*x",40,80); - //} else if (runAnalysis == 5) { } else if (module_str == "006") { fit2 = new TF1("fit2","[0]+[1]*x",60,80); - //} else if (runAnalysis == 6) { } else if (module_str == "008") { fit2 = new TF1("fit2","[0]+[1]*x",60,80); + } else if (module_str == "044") { + fit2 = new TF1("fit2","[0]+[1]*x",60,80); } fit2->SetParameter(0, 1000.); fit2->SetParameter(1, -0.1); @@ -594,7 +590,7 @@ int main(int argc, char* argv[]) { fit1->Draw("same"); fit1_e->Draw("same"); } - if ((i > 51900 && i < 51910) || (i > 52150 && i < 52160)) { + if ((i > 51900 && i < 51910) || (i > 52150 && i < 52160) || (i > 513000 && i < 513010)) { sprintf(savename,"plots/M%s/DirectBeam/grap0_%d.png", module_str.c_str(), i); mapcanvas->SaveAs((const char *)(savename)); } @@ -607,7 +603,7 @@ int main(int argc, char* argv[]) { fit2->Draw("same"); fit2_e->Draw("same"); } - if ((i > 51900 && i < 51910) || (i > 52150 && i < 52160)) { + if ((i > 51900 && i < 51910) || (i > 52150 && i < 52160) || (i > 513000 && i < 513010)) { sprintf(savename,"plots/M%s/DirectBeam/grap1_%d.png", module_str.c_str(), i); mapcanvas->SaveAs((const char *)(savename)); } @@ -630,7 +626,7 @@ int main(int argc, char* argv[]) { grap_g2->Draw("P"); } - if ((i > 51900 && i < 51910) || (i > 52150 && i < 52160) || (i > 123880 && i < 123890)) { + if ((i > 51900 && i < 51910) || (i > 52150 && i < 52160) || (i > 123880 && i < 123890) || (i > 513000 && i < 513010)) { sprintf(savename,"plots/M%s/DirectBeam/graps_%d.png", module_str.c_str(), i); mapcanvas->SaveAs((const char *)(savename)); } diff --git a/run_JFModuleCalib_CuFBDCS.txt b/run_JFModuleCalib_CuFBDCS.txt index d9529c5..1d46a09 100644 --- a/run_JFModuleCalib_CuFBDCS.txt +++ b/run_JFModuleCalib_CuFBDCS.txt @@ -3,7 +3,7 @@ CuFDBCS = copper fluorescence, direct beam, current source Module 006 - ESRF ./JFMC_CuFluoPeak 006 /data_pool/Module_006_161116 10us_500Hz_QS_allgain_pede 10us_500Hz_QS_G0_Cu -./JFMC_CuFluoPeakFit 006 /data_pool/Module_006_161116 +./JFMC_CuFluoPeakFit 006 ./JFMC_DirectBeamScan 006 /data_pool/Module_006_161116 100us_500Hz_QS_allgain_pede_1055 100us_500Hz_QS_beam_scan_a ./JFMC_CurrentSourceScan 006 /data_pool/Module_006_161116 Current_source_scan_a ./JFMC_CalibWriter 006 @@ -11,7 +11,7 @@ Module 006 - ESRF Module 008 - Pohang ./JFMC_CuFluoPeak 008 /data_pool/Module_008_181116 10us_500Hz_QS_allgain_pede_1558 10us_500Hz_QS_G0_Cu_2 -./JFMC_CuFluoPeakFit 008 /data_pool/Module_008_181116 +./JFMC_CuFluoPeakFit 008 ./JFMC_DirectBeamScan 008 /data_pool/Module_008_181116 150us_500Hz_QS_allgain_pede_1332 150us_500Hz_QS_beam_scan_b ./JFMC_CurrentSourceScan 008 /data_pool/Module_008_181116 Current_source_scan_a ./JFMC_CalibWriter 008 @@ -19,7 +19,7 @@ Module 008 - Pohang Module 021 - 1M top LCLS, PX ./JFMC_CuFluoPeak 021 /data_pool/1M_021_022_150916 10us_200Hz_QS_allgain_pede__B 10us_200Hz_QS_G0_Cu__B -./JFMC_CuFluoPeakFit 021 /data_pool/1M_021_022_150916 +./JFMC_CuFluoPeakFit 021 ./JFMC_DirectBeamScan 021 /data_pool/1M_021_022_150916 200us_200Hz_QS_allgain_pede_scan_d_B 200us_200Hz_QS_beam_scan_d_B ./JFMC_CurrentSourceScan 021 /data_pool/1M_021_022_150916 Current_source_scan_a_B ./JFMC_CalibWriter 021 @@ -27,12 +27,20 @@ Module 021 - 1M top LCLS, PX Module 022 - 1M bottom LCLS, PX ./JFMC_CuFluoPeak 022 /data_pool/1M_021_022_150916 10us_200Hz_QS_allgain_pede__A 10us_200Hz_QS_G0_Cu__A -./JFMC_CuFluoPeakFit 022 /data_pool/1M_021_022_150916 +./JFMC_CuFluoPeakFit 022 ./JFMC_DirectBeamScan 022 /data_pool/1M_021_022_150916 200us_200Hz_QS_allgain_pede_scan_d_A 200us_200Hz_QS_beam_scan_d_A ./JFMC_CurrentSourceScan 022 /data_pool/1M_021_022_150916 Current_source_scan_a_A ./JFMC_CalibWriter 022 +Module 044 - added to the 1M to make the 1.5M, cSAXS +./JFMC_CuFluoPeak 044 /data_pool/Module044 allpede_10us_500Hz_QS_G0_1500 CuFluo_10us_500Hz_QS_G0 +./JFMC_CuFluoPeakFit 044 +./JFMC_DirectBeamScan 044 /data_pool/Module044 allpede_150us_500Hz_QS_1620 DB_170221_scan1 +./JFMC_CurrentSourceScan 044 /data_pool/Module044 CS_170221_scan2 +./JFMC_CalibWriter 044 + + Module 028 direct beam scan data only ./JFMC_DirectBeamScan 028 /data_pool/test_module028_direct_beam_scan__01092016 200us_scan_a_pedestal_QS 200us_scan_a_beam_QS