diff --git a/JFMC_CurrentSourceScan.cpp b/JFMC_CurrentSourceScan.cpp index 0d398b3..25363f9 100644 --- a/JFMC_CurrentSourceScan.cpp +++ b/JFMC_CurrentSourceScan.cpp @@ -68,6 +68,8 @@ int main(int argc, char* argv[]) { pixelMaskObject->maskChip(2,pixel_mask); pixelMaskObject->maskChip(3,pixel_mask); pixelMaskObject->maskChip(4,pixel_mask); + } else if (module_str == "002" || module_str == "003") { + pixelMaskObject->maskChip(3, pixel_mask); } else if (module_str == "006") { pixelMaskObject->maskChip(6, pixel_mask); pixelMaskObject->maskSupercolumn(4,1, pixel_mask); @@ -296,6 +298,8 @@ int main(int argc, char* argv[]) { nfiles = 4; } else if (module_str == "021" || 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 == "124" || module_str == "126") { nfiles = 7; + } else if (module_str == "002" || module_str == "003") { + nfiles = 6; } for (int filei = 0; filei < nfiles; filei++) { @@ -395,6 +399,8 @@ int main(int argc, char* argv[]) { last_frame = 24319; } else if (module_str == "040") { last_frame = 21759; + } else if (module_str == "002" || module_str == "003") { + last_frame = 59519; } if (j%640 == 0 || j == last_frame) { @@ -689,6 +695,19 @@ int main(int argc, char* argv[]) { for (int i = 0; i < 15; i++) { filter[i+9+11+10+10+11+10+10+11] = 110.+(i*10.); } + } else if (module_str == "002" || module_str == "003") { + for (int i = 0; i < 10; i++) { + filter[i] = 0.2+(i*0.2); + } + for (int i = 0; i < 8; i++) { + filter[i+10] = 3+(i*1); + } + for (int i = 0; i < 25; i++) { + filter[i+10+8] = 12+(i*2); + } + for (int i = 0; i < 47; i++) { + filter[i+10+8+25] = 80+(i*20); + } } else { for (int i = 0; i < 9; i++) { filter[i] = 0.05+(i*0.025); @@ -734,6 +753,8 @@ int main(int argc, char* argv[]) { m_max = 51; } else if (module_str == "021" || 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 == "124" || module_str == "126") { m_max = 97; + } else if (module_str == "002" || module_str == "003") { + m_max = 90; } for (int m = 0; m < m_max; m++) { @@ -777,7 +798,11 @@ int main(int argc, char* argv[]) { grap_g0 = new TGraphErrors(r0_adc.size(),&(r0_filter[0]),&(r0_adc[0]),&(r0_ferr[0]),&(r0_adcerr[0])); - rangemin_g0 = 0.15; + if (module_str == "003") { + rangemin_g0 = 2.0; + } else { + rangemin_g0 = 0.15; + } rangemax_g0 = *max_element(r0_filter.begin(),r0_filter.end()); fit_g0 = new TF1("fit_g0","[0]+[1]*x",rangemin_g0, rangemax_g0); fit_g0->SetParameter(0, 3000.); @@ -880,9 +905,9 @@ int main(int argc, char* argv[]) { rangemin_g1 = 0; if (module_str == "032") { rangemin_g1 = 0.75; - } else if (module_str == "008" || module_str == "040" || module_str == "044") { + } 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 == "006" || module_str == "021" || module_str == "022" || 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 == "124" || module_str == "126") { + } else if (module_str == "002" || module_str == "006" || module_str == "021" || module_str == "022" || 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 == "124" || module_str == "126") { rangemin_g1 = 2.; } rangemax_g1 = *max_element(r1_filter.begin(),r1_filter.end()); @@ -1183,7 +1208,9 @@ int main(int argc, char* argv[]) { if (module_str == "021" || 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 == "124" || module_str == "126") { grap_g1->GetXaxis()->SetLimits(0.009,5E2); - } else { + } else if (module_str == "002" || module_str == "003") { + grap_g1->GetXaxis()->SetLimits(0.09,1.1E3); + } else { grap_g1->GetXaxis()->SetLimits(0.009,1.1E2); } grap_g1->SetMinimum(0); @@ -1410,6 +1437,8 @@ int main(int argc, char* argv[]) { g1map->GetYaxis()->SetTitleOffset(0.7); if (module_str == "032") { g1map->GetZaxis()->SetRangeUser(-12000,-4000); + } else if (module_str == "002") { + g1map->GetZaxis()->SetRangeUser(-400,-100); } else { g1map->GetZaxis()->SetRangeUser(-3000,0); } @@ -1425,6 +1454,8 @@ int main(int argc, char* argv[]) { g2map->GetYaxis()->SetTitleOffset(0.7); if (module_str == "032") { g2map->GetZaxis()->SetRangeUser(-800,-400); + } else if (module_str == "002") { + g2map->GetZaxis()->SetRangeUser(-35,-10); } else { g2map->GetZaxis()->SetRangeUser(-200,-50); } @@ -1438,7 +1469,11 @@ int main(int argc, char* argv[]) { g0overg1map->GetXaxis()->SetTitle("Column"); g0overg1map->GetYaxis()->SetTitle("Row"); g0overg1map->GetYaxis()->SetTitleOffset(0.7); - g0overg1map->GetZaxis()->SetRangeUser(-50,0); + if (module_str == "003") { + g0overg1map->GetZaxis()->SetRangeUser(-35,-30); + } else { + g0overg1map->GetZaxis()->SetRangeUser(-50,0); + } g0overg1map->Draw("colz"); pave->Clear(); pave->AddText("G0/G1"); diff --git a/run_JFModuleCalib_CuFBDCS.txt b/run_JFModuleCalib_CuFBDCS.txt index c9a5e7e..381f0fe 100644 --- a/run_JFModuleCalib_CuFBDCS.txt +++ b/run_JFModuleCalib_CuFBDCS.txt @@ -2,6 +2,11 @@ scripts and setup to run version 1 of the jungfrau calibration CuFDBCS = copper fluorescence, direct beam, current source +Module 002 +./JFMC_CurrentSourceScan 002 /mnt/pcmoench_jungfrau_data/test_module002_cal_source_15062016 scan5 +./JFMC_CurrentSourceScan 003 /mnt/pcmoench_jungfrau_data/test_module002_cal_source_15062016 scan6 !! note using 003 as proxy + + Module 004 ./JFMC_CuFluoPeak 004 HG0 /mnt/pcmoench_jungfrau_data/test_PH_Cu_01022016 pede_10us_phase65_HG0 Cu_10us_phase65_HG0