From 56098adb4fdf791b7e0c22803b4ec30f7e6d6d92 Mon Sep 17 00:00:00 2001 From: l_mozzanica Date: Wed, 27 Nov 2019 15:13:03 +0100 Subject: [PATCH] added history_aldo.txt and changed default for int createPerStepHistos = 0; --- BP_analysis.cpp | 4 ++-- CS_analysis.cpp | 7 +++++-- history_aldo.txt | 35 +++++++++++++++++++++++++++++++++++ run_JFCalibration.txt | 7 +++++++ 4 files changed, 49 insertions(+), 4 deletions(-) create mode 100644 history_aldo.txt diff --git a/BP_analysis.cpp b/BP_analysis.cpp index 31313e7..9a0a5e8 100644 --- a/BP_analysis.cpp +++ b/BP_analysis.cpp @@ -41,8 +41,8 @@ int main(int argc, char* argv[]) { string module_str = argv[1]; string data_loc = argv[2]; - int createHistos = 0; - int createPerStepHistos = 0; + int createHistos = 1; // set to 0 to do a fit-only run + int createPerStepHistos = 0; //debug jungfrauFile *thisfile = new jungfrauFile(); diff --git a/CS_analysis.cpp b/CS_analysis.cpp index 900111f..b0270f8 100644 --- a/CS_analysis.cpp +++ b/CS_analysis.cpp @@ -208,6 +208,7 @@ int main(int argc, char* argv[]) { scan_v6.push_back("276"); scan_v6.push_back("278"); scan_v6.push_back("281"); + scan_v6.push_back("282"); scan_v6.push_back("283"); scan_v6.push_back("285"); scan_v6.push_back("286"); @@ -219,6 +220,8 @@ int main(int argc, char* argv[]) { scan_v6.push_back("294"); scan_v6.push_back("296"); scan_v6.push_back("299"); + + jungfrauFile *thisfile = new jungfrauFile(); @@ -242,8 +245,8 @@ int main(int argc, char* argv[]) { char savename[128]; - int createHistoFile = 0; - int createPerStepHistos = 0; + int createHistoFile = 1; //set 0 for a fit-only run + int createPerStepHistos = 0; //debug // open first file sprintf(savename,"%s/%s_%%6.6d.dat", data_loc.c_str(), data_file.c_str()); diff --git a/history_aldo.txt b/history_aldo.txt new file mode 100644 index 0000000..c4b69e9 --- /dev/null +++ b/history_aldo.txt @@ -0,0 +1,35 @@ +cd /afs/psi.ch/project/mythen/sophie/JFCalibration/ + +#important, add the module to the run_JFCalibration.txt file, a kind of history. +emacs run_JFCalibration.txt & + +emacs BP_analysis.cpp +#check int createHistoFile = 1; //set 0 for a fit-only run +# int createPerStepHistos = 0; //debug + + make BP_analysis + mkdir /mnt/pcmoench_jungfrau_data/jungfrau_ana_sophie/M282_CalibAna/ + chmod 777 /mnt/pcmoench_jungfrau_data/jungfrau_ana_sophie/M282_CalibAna/ + + mkdir data/M282 + mkdir plots/M282 + mkdir plots/M282/BackplanePulsing + + ./BP_analysis 282 /mnt/pcmoench_jungfrau_calib/data/Module_282_Calib/BP_M282_2019-11-26 + + gwenview plots/M282/BackplanePulsing/ + + +emacs CS_analysis.cpp +#check int createHistoFile = 1; //set 0 for a fit-only run +# int createPerStepHistos = 0; //debug +# add scan_v6.push_back("XXX"); + + + make CS_analysis + + mkdir plots/M282/CurrentSource + + ./CS_analysis 282 /mnt/pcmoench_jungfrau_calib/data/Module_282_Calib CS_M282_2019-11-26 + + diff --git a/run_JFCalibration.txt b/run_JFCalibration.txt index d3a2973..779d3bf 100644 --- a/run_JFCalibration.txt +++ b/run_JFCalibration.txt @@ -1281,6 +1281,13 @@ Module 281 ./JFMC_CalibWriter_wBP 281 +Module 282 + +./BP_analysis 282 /mnt/pcmoench_jungfrau_calib/data/Module_282_Calib/BP_M282_2019-11-26 +./CS_analysis 282 /mnt/pcmoench_jungfrau_calib/data/Module_282_Calib CS_M282_2019-11-26 + + + Module 283 ./CuFluo_analysis 283 G0 /mnt/pcmoench_jungfrau_calib/data/Module_283_Calib pedeG0_M283_2019-08-12 CuFluoG0_M283_2019-08-12 ./CuFluo_analysis 283 HG0 /mnt/pcmoench_jungfrau_calib/data/Module_283_Calib pedeHG0_M283_2019-08-12 CuFluoHG0_M283_2019-08-12