From 0e899cbbea4c69d12dd8822b3da4938a50917677 Mon Sep 17 00:00:00 2001 From: Sunanda Date: Tue, 20 Sep 2022 14:11:11 +0200 Subject: [PATCH] Modify some of the scripts to enable running the IsoTrack calibration of the HCAL Code check --- Calibration/HcalCalibAlgos/macros/CalibMain.C | 88 +++++++++---------- Calibration/HcalCalibAlgos/macros/CalibTree.C | 3 +- 2 files changed, 46 insertions(+), 45 deletions(-) diff --git a/Calibration/HcalCalibAlgos/macros/CalibMain.C b/Calibration/HcalCalibAlgos/macros/CalibMain.C index af69f09b2dbe3..eb25c5126f1e8 100644 --- a/Calibration/HcalCalibAlgos/macros/CalibMain.C +++ b/Calibration/HcalCalibAlgos/macros/CalibMain.C @@ -64,21 +64,21 @@ int main(Int_t argc, Char_t* argv[]) { int usescale = (argc > 14) ? std::atoi(argv[14]) : 0; int etalo = (argc > 15) ? std::atoi(argv[15]) : 0; int etahi = (argc > 16) ? std::atoi(argv[16]) : 30; - const char* corrfile = (argc > 17) ? argv[17] : ""; - const char* dupfile = (argc > 18) ? argv[18] : ""; - const char* comfile = (argc > 19) ? argv[19] : ""; - const char* outfile = (argc > 20) ? argv[20] : ""; - const char* rcorfile = (argc > 21) ? argv[21] : ""; - int runlo = (argc > 22) ? std::atoi(argv[22]) : 0; - int runhi = (argc > 23) ? std::atoi(argv[23]) : 99999999; - int phimin = (argc > 24) ? std::atoi(argv[24]) : 1; - int phimax = (argc > 25) ? std::atoi(argv[25]) : 72; - int zside = (argc > 26) ? std::atoi(argv[26]) : 1; - int nvxlo = (argc > 27) ? std::atoi(argv[27]) : 0; - int nvxhi = (argc > 28) ? std::atoi(argv[28]) : 1000; - int rbx = (argc > 29) ? std::atoi(argv[29]) : 0; - bool exclude = (argc > 30) ? (std::atoi(argv[30]) > 0) : false; - bool etamax = (argc > 31) ? (std::atoi(argv[31]) > 0) : false; + int runlo = (argc > 17) ? std::atoi(argv[17]) : 0; + int runhi = (argc > 18) ? std::atoi(argv[18]) : 99999999; + int phimin = (argc > 19) ? std::atoi(argv[19]) : 1; + int phimax = (argc > 20) ? std::atoi(argv[20]) : 72; + int zside = (argc > 21) ? std::atoi(argv[21]) : 1; + int nvxlo = (argc > 22) ? std::atoi(argv[22]) : 0; + int nvxhi = (argc > 23) ? std::atoi(argv[23]) : 1000; + int rbx = (argc > 24) ? std::atoi(argv[24]) : 0; + bool exclude = (argc > 25) ? (std::atoi(argv[25]) > 0) : false; + bool etamax = (argc > 26) ? (std::atoi(argv[26]) > 0) : false; + const char* corrfile = (argc > 27) ? argv[27] : ""; + const char* dupfile = (argc > 28) ? argv[28] : ""; + const char* comfile = (argc > 29) ? argv[29] : ""; + const char* outfile = (argc > 30) ? argv[30] : ""; + const char* rcorfile = (argc > 31) ? argv[31] : ""; bool append = (argc > 32) ? (std::atoi(argv[32]) > 0) : true; bool all = (argc > 33) ? (std::atoi(argv[33]) > 0) : true; CalibMonitor c1(infile, @@ -119,19 +119,19 @@ int main(Int_t argc, Char_t* argv[]) { int usescale = (argc > 13) ? std::atoi(argv[13]) : 0; int etalo = (argc > 14) ? std::atoi(argv[14]) : 0; int etahi = (argc > 15) ? std::atoi(argv[15]) : 30; - const char* corrfile = (argc > 16) ? argv[16] : ""; - const char* dupfile = (argc > 17) ? argv[17] : ""; - const char* rcorfile = (argc > 182) ? argv[18] : ""; - int runlo = (argc > 19) ? std::atoi(argv[19]) : 0; - int runhi = (argc > 20) ? std::atoi(argv[20]) : 99999999; - int phimin = (argc > 21) ? std::atoi(argv[21]) : 1; - int phimax = (argc > 22) ? std::atoi(argv[22]) : 72; - int zside = (argc > 23) ? std::atoi(argv[23]) : 1; - int nvxlo = (argc > 24) ? std::atoi(argv[24]) : 0; - int nvxhi = (argc > 25) ? std::atoi(argv[25]) : 1000; - int rbx = (argc > 26) ? std::atoi(argv[26]) : 0; - bool exclude = (argc > 27) ? (std::atoi(argv[27]) > 0) : false; - bool etamax = (argc > 28) ? (std::atoi(argv[28]) > 0) : false; + int runlo = (argc > 16) ? std::atoi(argv[16]) : 0; + int runhi = (argc > 17) ? std::atoi(argv[17]) : 99999999; + int phimin = (argc > 18) ? std::atoi(argv[18]) : 1; + int phimax = (argc > 19) ? std::atoi(argv[19]) : 72; + int zside = (argc > 20) ? std::atoi(argv[20]) : 1; + int nvxlo = (argc > 21) ? std::atoi(argv[21]) : 0; + int nvxhi = (argc > 22) ? std::atoi(argv[22]) : 1000; + int rbx = (argc > 23) ? std::atoi(argv[23]) : 0; + bool exclude = (argc > 24) ? (std::atoi(argv[24]) > 0) : false; + bool etamax = (argc > 25) ? (std::atoi(argv[25]) > 0) : false; + const char* corrfile = (argc > 26) ? argv[26] : ""; + const char* dupfile = (argc > 27) ? argv[27] : ""; + const char* rcorfile = (argc > 28) ? argv[28] : ""; bool append = (argc > 29) ? (std::atoi(argv[29]) > 0) : true; bool all = (argc > 30) ? (std::atoi(argv[30]) > 0) : true; bool debug(false); @@ -180,22 +180,22 @@ int main(Int_t argc, Char_t* argv[]) { int sysmode = (argc > 23) ? std::atoi(argv[23]) : -1; int rcorform = (argc > 24) ? std::atoi(argv[24]) : 0; bool usegen = (argc > 25) ? (std::atoi(argv[25]) < 1) : false; - const char* treename = (argc > 26) ? argv[26] : "CalibTree"; - const char* dupfile = (argc > 27) ? argv[27] : ""; - const char* rcorfile = (argc > 28) ? argv[28] : ""; - int runlo = (argc > 29) ? std::atoi(argv[29]) : 0; - int runhi = (argc > 30) ? std::atoi(argv[30]) : 99999999; - int phimin = (argc > 31) ? std::atoi(argv[31]) : 1; - int phimax = (argc > 32) ? std::atoi(argv[32]) : 72; - int zside = (argc > 33) ? std::atoi(argv[33]) : 0; - int nvxlo = (argc > 34) ? std::atoi(argv[34]) : 0; - int nvxhi = (argc > 35) ? std::atoi(argv[35]) : 1000; - int rbx = (argc > 36) ? std::atoi(argv[36]) : 0; - bool exclude = (argc > 37) ? (std::atoi(argv[37]) > 0) : false; - int higheta = (argc > 38) ? std::atoi(argv[38]) : 1; - double fraction = (argc > 39) ? std::atof(argv[39]) : 1.0; - bool writehisto = (argc > 40) ? (std::atoi(argv[40]) > 0) : false; - bool debug = (argc > 41) ? (std::atoi(argv[41]) > 0) : false; + int runlo = (argc > 26) ? std::atoi(argv[26]) : 0; + int runhi = (argc > 27) ? std::atoi(argv[27]) : 99999999; + int phimin = (argc > 28) ? std::atoi(argv[28]) : 1; + int phimax = (argc > 29) ? std::atoi(argv[29]) : 72; + int zside = (argc > 30) ? std::atoi(argv[30]) : 0; + int nvxlo = (argc > 31) ? std::atoi(argv[31]) : 0; + int nvxhi = (argc > 32) ? std::atoi(argv[32]) : 1000; + int rbx = (argc > 33) ? std::atoi(argv[33]) : 0; + bool exclude = (argc > 34) ? (std::atoi(argv[34]) > 0) : false; + int higheta = (argc > 35) ? std::atoi(argv[35]) : 1; + double fraction = (argc > 36) ? std::atof(argv[36]) : 1.0; + bool writehisto = (argc > 37) ? (std::atoi(argv[37]) > 0) : false; + bool debug = (argc > 38) ? (std::atoi(argv[38]) > 0) : false; + const char* treename = (argc > 39) ? argv[39] : "CalibTree"; + const char* dupfile = (argc > 40) ? argv[40] : ""; + const char* rcorfile = (argc > 41) ? argv[41] : ""; char name[500]; sprintf(name, "%s/%s", dirname, treename); diff --git a/Calibration/HcalCalibAlgos/macros/CalibTree.C b/Calibration/HcalCalibAlgos/macros/CalibTree.C index 01cd784a5bb66..c0bd54360a653 100644 --- a/Calibration/HcalCalibAlgos/macros/CalibTree.C +++ b/Calibration/HcalCalibAlgos/macros/CalibTree.C @@ -925,6 +925,7 @@ Double_t CalibTree::Loop(int loop, std::cout << "cafctors: " << cfactors.size() << ":" << maxch << std::endl; kount = 0; std::map >::const_iterator itr = cfactors.begin(); + const double factorMin(0.1); for (; itr != cfactors.end(); ++itr, ++kount) { unsigned int detid = itr->first; int subdet, depth, zside, ieta, iphi; @@ -932,7 +933,7 @@ Double_t CalibTree::Loop(int loop, double id = ieta * zside + 0.25 * (depth - 1); double factor = (itr->second).first; double dfac = (itr->second).second; - if (ieta > ietaMax) { + if ((ieta > ietaMax) || (factor < factorMin)) { factor = 1; dfac = 0; }