From e9c785f9ebabc1ace623ca8a073b756573132bae Mon Sep 17 00:00:00 2001 From: redford_s Date: Tue, 10 Oct 2017 09:18:51 +0200 Subject: [PATCH] Moved file locations into run script, rather than in analysis. Also made the location right (data1_ib). --- JFMC_BackplanePulsing.cpp | 34 ++++------------------------------ run_JFModuleCalib_CuFBPCS.txt | 28 ++++++++++++++-------------- 2 files changed, 18 insertions(+), 44 deletions(-) diff --git a/JFMC_BackplanePulsing.cpp b/JFMC_BackplanePulsing.cpp index 357cb43..3e710a6 100644 --- a/JFMC_BackplanePulsing.cpp +++ b/JFMC_BackplanePulsing.cpp @@ -20,13 +20,15 @@ int main(int argc, char* argv[]) { gROOT->SetBatch(1); gStyle->SetOptFit(11); - if (argc != 2) { + if (argc != 3) { cout << "Correct usage:" << endl; cout << "arg 1: specify module number" << endl; + cout << "arg 2: specify data location" << endl; exit(1); } string module_str = argv[1]; + string data_loc = argv[2]; int createHistos = 0; @@ -123,35 +125,7 @@ int main(int argc, char* argv[]) { } // data file - if (module_str == "006") { - sprintf(filename,"/mnt/pcmoench_jungfrau_data/Module_006_vbackpulse/scan4_170217_%%6.6d.dat"); - } else if (module_str == "021") { - sprintf(filename,"/mnt/pcmoench_jungfrau_data/Module_021_vbackpulse/bpp_scan1_20170303_%%6.6d.dat"); - } else if (module_str == "022") { - sprintf(filename,"/mnt/pcmoench_jungfrau_data/Module_022_vbackpulse/bpp_scan1_20170303_%%6.6d.dat"); - } else if (module_str == "027") { - sprintf(filename,"/mnt/pcmoench_jungfrau_data/Module_027_Calib/BackplanePulsing_scan1_2017-10-09_%%6.6d.dat"); - } else if (module_str == "040") { - sprintf(filename,"/mnt/pcmoench_jungfrau_data/Module_040_Calib/BP_240322_scan_%%6.6d.dat"); - } else if (module_str == "044") { - sprintf(filename,"/mnt/pcmoench_jungfrau_data/Module_044_vbackpulse/bpp_scan2_20170303_%%6.6d.dat"); - } else if (module_str == "045") { - sprintf(filename,"/mnt/pcmoench_jungfrau_data/Module_045_Calib/BP_HS_NF_500Hz_scan3_%%6.6d.dat"); - } else if (module_str == "055") { - sprintf(filename,"/mnt/pcmoench_jungfrau_data1_ib/Module_055_2017-09-21_Calib/VbackplanePulsing_scan1_%%6.6d.dat"); - } else if (module_str == "065") { - sprintf(filename,"/mnt/pcmoench_jungfrau_data1_ib/Module_065_2017-08-29_Calib/Vbackplane_scan1%%6.6d.dat"); - } else if (module_str == "069") { - sprintf(filename,"/mnt/pcmoench_jungfrau_data1_ib/Module_069_2017-09-18_Calib/vbackpulse_scan1_%%6.6d.dat"); - } else if (module_str == "079") { - sprintf(filename,"/mnt/pcmoench_jungfrau_data1_ib/Module_079_2017-09-18_Calib/vbackpulse_scan1_%%6.6d.dat"); - } else if (module_str == "068") { - sprintf(filename,"/mnt/pcmoench_jungfrau_data1_ib/Module_068_2017-09-19_Calib/VbackplanePulsing_scan1_%%6.6d.dat"); - } else if (module_str == "088") { - sprintf(filename,"/mnt/pcmoench_jungfrau_data1_ib/Module_088_2017-09-19_Calib/VbackplanePulsing_scan1_%%6.6d.dat"); - } else if (module_str == "059") { - sprintf(filename,"/mnt/pcmoench_jungfrau_data1_ib/Module_059_2017-10-09_Calib/BackplanePulsing_scan2_%%6.6d.dat"); - } + sprintf(filename,"%s_%%6.6d.dat", data_loc.c_str()); int framecounter = 0; diff --git a/run_JFModuleCalib_CuFBPCS.txt b/run_JFModuleCalib_CuFBPCS.txt index f8bf65c..fa908f3 100644 --- a/run_JFModuleCalib_CuFBPCS.txt +++ b/run_JFModuleCalib_CuFBPCS.txt @@ -2,70 +2,70 @@ scripts and setup to run version 2 of the jungfrau calibration CuFBPCS = copper fluorescence, backplane pulsing, current source Module 006 - ESRF -./JFMC_BackplanePulsing 006 +./JFMC_BackplanePulsing 006 /mnt/pcmoench_jungfrau_data1_ib/Module_006_vbackpulse/scan4_170217 ./JFMC_CalibWriter 006 Module 021 - 1M top LCLS, PX -./JFMC_BackplanePulsing 021 +./JFMC_BackplanePulsing 021 /mnt/pcmoench_jungfrau_data1_ib/Module_021_vbackpulse/bpp_scan1_20170303 ./JFMC_CalibWriter 021 Module 022 - 1M bottom LCLS, PX -./JFMC_BackplanePulsing 022 +./JFMC_BackplanePulsing 022 /mnt/pcmoench_jungfrau_data1_ib/Module_022_vbackpulse/bpp_scan1_20170303 ./JFMC_CalibWriter 022 Module 027 - old HDI (no current source scan). sent to ESRF with Paolo -./JFMC_BackplanePulsing 027 +./JFMC_BackplanePulsing 027 /mnt/pcmoench_jungfrau_data1_ib/Module_027_Calib/BackplanePulsing_scan1_2017-10-09 ./JFMC_CalibWriter 027 Module 040 - partly etched. sent to ESRF with Paolo -./JFMC_BackplanePulsing 040 +./JFMC_BackplanePulsing 040 /mnt/pcmoench_jungfrau_data1_ib/Module_040_Calib/BP_240322_scan ./JFMC_CalibWriter 040 Module 044 - added to the 1M to make the 1.5M, cSAXS -./JFMC_BackplanePulsing 044 +./JFMC_BackplanePulsing 044 /mnt/pcmoench_jungfrau_data1_ib/Module_044_vbackpulse/bpp_scan2_20170303 ./JFMC_CalibWriter 044 Module 045 - replaces M021 in the 1M -./JFMC_BackplanePulsing 045 +./JFMC_BackplanePulsing 045 /mnt/pcmoench_jungfrau_data1_ib/Module_045_Calib/BP_HS_NF_500Hz_scan3 ./JFMC_CalibWriter 045 Module 055 - replaces M045 in the 1M -./JFMC_BackplanePulsing 055 +./JFMC_BackplanePulsing 055 /mnt/pcmoench_jungfrau_data1_ib/Module_055_2017-09-21_Calib/VbackplanePulsing_scan1 ./JFMC_CalibWriter 055 Module 059 - for the 1M -./JFMC_BackplanePulsing 059 +./JFMC_BackplanePulsing 059 /mnt/pcmoench_jungfrau_data1_ib/Module_059_2017-10-09_Calib/BackplanePulsing_scan2 ./JFMC_CalibWriter 059 Module 065 - for SOLEIL -./JFMC_BackplanePulsing 065 +./JFMC_BackplanePulsing 065 /mnt/pcmoench_jungfrau_data1_ib/Module_065_2017-08-29_Calib/Vbackplane_scan1 ./JFMC_CalibWriter 065 Module 069 - 1M for SLAC - not good enough -./JFMC_BackplanePulsing 069 +./JFMC_BackplanePulsing 069 /mnt/pcmoench_jungfrau_data1_ib/Module_069_2017-09-18_Calib/vbackpulse_scan1 ./JFMC_CalibWriter 069 Module 079 - 1M for SLAC - not good enough -./JFMC_BackplanePulsing 079 +./JFMC_BackplanePulsing 079 /mnt/pcmoench_jungfrau_data1_ib/Module_079_2017-09-18_Calib/vbackpulse_scan1 ./JFMC_CalibWriter 079 Module 068 - 1M for SLAC -./JFMC_BackplanePulsing 068 +./JFMC_BackplanePulsing 068 /mnt/pcmoench_jungfrau_data1_ib/Module_068_2017-09-19_Calib/VbackplanePulsing_scan1 ./JFMC_CalibWriter 068 Module 088 - 1M for SLAC -./JFMC_BackplanePulsing 088 +./JFMC_BackplanePulsing 088 /mnt/pcmoench_jungfrau_data1_ib/Module_088_2017-09-19_Calib/VbackplanePulsing_scan1 ./JFMC_CalibWriter 088