detectors/JFCalibration
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added current source scans for modules 066 and 094.

Browse Source
This commit is contained in:
redford_s
2017-10-24 18:05:32 +02:00
parent 085e9d85ed
commit 3121ec956d
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
JFMC_CurrentSourceScan.cpp
View File

@@ -76,6 +76,8 @@ int main(int argc, char* argv[]) {
pixelMaskObject->maskSupercolumn(4,2, pixel_mask);
} else if (module_str == "065") {
pixelMaskObject->maskChip(5,pixel_mask);
} else if (module_str == "094") {
pixelMaskObject->maskChip(6,pixel_mask);
}
for (int i = 0; i < 640; i++) {
@@ -262,7 +264,7 @@ int main(int argc, char* argv[]) {
nfiles = 2;
} else if (module_str == "008" || module_str == "040" || module_str == "044") {
nfiles = 3;
} else if (module_str == "006" || module_str == "045" || module_str == "022" || module_str == "065" || module_str == "069" || module_str == "079" || module_str == "068" || module_str == "088" || module_str == "055" || module_str == "059") {
} else if (module_str == "006" || module_str == "045" || module_str == "022" || 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") {
nfiles = 4;
}
@@ -552,7 +554,7 @@ int main(int argc, char* argv[]) {
for (int i = 0; i < 17; i++) {
filter[i+5+9] = 5.+(i*2.5);
}
} else if (module_str == "006" || module_str == "045" || module_str == "022" || module_str == "065" || module_str == "069" || module_str == "079" || module_str == "068" || module_str == "088" || module_str == "055" || module_str == "059") {
} else if (module_str == "006" || module_str == "045" || module_str == "022" || 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") {
for (int i = 0; i < 9; i++) {
filter[i] = 0.05+(i*0.05);
}
@@ -596,7 +598,7 @@ int main(int argc, char* argv[]) {
m_max = 27;
} else if (module_str == "008") {
m_max = 35;
} else if (module_str == "006" || module_str == "045" || module_str == "022" || module_str == "065" || module_str == "069" || module_str == "079" || module_str == "068" || module_str == "088" || module_str == "055" || module_str == "059") {
} else if (module_str == "006" || module_str == "045" || module_str == "022" || 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") {
m_max = 51;
}
@@ -626,7 +628,7 @@ int main(int argc, char* argv[]) {
rangemin2 = 0.75;
} else if (module_str == "008" || module_str == "021" || module_str == "040" || module_str == "044") {
rangemin2 = *min_element(r1_filter.begin(),r1_filter.end());
} else if (module_str == "006" || module_str == "022" || module_str == "045" || module_str == "065" || module_str == "069" || module_str == "079" || module_str == "068" || module_str == "088" || module_str == "055" || module_str == "059") {
} else if (module_str == "006" || module_str == "022" || 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") {
rangemin2 = 2.;
}
double rangemax2 = *max_element(r1_filter.begin(),r1_filter.end());

8
run_JFModuleCalib_CuFBDCS.txt
View File

@@ -77,6 +77,10 @@ Module 065 - for SOLEIL
./JFMC_CurrentSourceScan 065 /mnt/pcmoench_jungfrau_data1_ib/Module_065_2017-08-29_Calib CurrentSource_scan1
Module 066 - replacing 027 at ESRF
./JFMC_CurrentSourceScan 066 /mnt/pcmoench_jungfrau_data1_ib/Module_066_2017-10-24_Calib CS_scan1
Module 069 - in 1M for SLAC - not good enough
./JFMC_CuFluoPeak 069 /mnt/pcmoench_jungfrau_data1_ib/Module_069_2017-09-18_Calib pedeG0_1630 CuFluo_10us_500Hz
./JFMC_CuFluoPeakFit 069
@@ -101,6 +105,10 @@ Module 088 - in the 1M for SLAC
./JFMC_CurrentSourceScan 088 /mnt/pcmoench_jungfrau_data1_ib/Module_088_2017-09-19_Calib CurrentSource_scan1
Module 094
./JFMC_CurrentSourceScan 094 /mnt/pcmoench_jungfrau_data1_ib/Module_094_2017-10-24_Calib CS_scan1
Module 028
direct beam scan data only
./JFMC_DirectBeamScan 028 /mnt/pcmoench_jungfrau_data/test_module028_direct_beam_scan__01092016 200us_scan_a_pedestal_QS 200us_scan_a_beam_QS