Remove alpaka procModfier from workflows in which it is no longer useful

Alignment/OfflineValidation/python/TkAlAllInOneTool/defaultInputFiles_cff.py

@@ -20,7 +20,7 @@
     '/store/relval/CMSSW_12_5_3/RelValMinBias_14TeV/ALCARECO/TkAlMinBias-125X_mcRun4_realistic_v5_2026D88PU-v1/2590000/27b7ab93-1d2b-4f4a-a98e-68386c314b5e.root',
 )
 
-filesDefaultMC_DoubleMuonPUPhase_string = '/store/mc/Phase2Fall22DRMiniAOD/DYJetsToMuMu_M-50_TuneCP5_14TeV-madgraphMLM-pythia8/ALCARECO/TkAlZMuMu-PU200ALCA_TkAlPU200_125X_mcRun4_realistic_v5-v1/60000/9382696c-70fd-4b37-8a0f-24bd02aeda5f.root'
+filesDefaultMC_DoubleMuonPUPhase_string = '/store/mc/Phase2Spring24DIGIRECOMiniAOD/DYJetsToMuMu_M-50_TuneCP5_14TeV-madgraphMLM-pythia8/ALCARECO/TkAlZMuMu-noPUALCA_TkAlnoPU_140X_mcRun4_realistic_v6_ext1-v2/110000/1022ba4a-65f7-4409-9069-f35247a7a8e3.root'
 
 filesDefaultMC_MinBiasPUPhase2RECO = cms.untracked.vstring(
     '/store/relval/CMSSW_14_1_0_pre6/RelValMinBias_14TeV/GEN-SIM-RECO/PU_141X_mcRun4_realistic_v1_STD_2026D110_PU-v3/2560000/c22f1cbd-50e3-458e-aba9-b0a327e4c971.root'

Alignment/OfflineValidation/test/testingScripts/test_unitMiscellanea.sh

@@ -5,7 +5,7 @@ echo "TESTING inspect ALCARECO data ..."
 cmsRun ${CMSSW_BASE}/src/Alignment/OfflineValidation/test/inspectData_cfg.py unitTest=True isCosmics=True trackCollection=ALCARECOTkAlCosmicsCTF0T || die "Failure running inspectData_cfg.py" $?
 
 echo "TESTING inspect Phase2 ALCARECO data ..."
-cmsRun ${CMSSW_BASE}/src/Alignment/OfflineValidation/test/inspectData_cfg.py unitTest=True isCosmics=False globalTag='' trackCollection=ALCARECOTkAlZMuMu isDiMuonData=True Detector='Run4D98' || die "Failure running inspectData_cfg.py on Phase-2 input" $?
+cmsRun ${CMSSW_BASE}/src/Alignment/OfflineValidation/test/inspectData_cfg.py unitTest=True isCosmics=False globalTag='' trackCollection=ALCARECOTkAlZMuMu isDiMuonData=True Detector='Run4D110' || die "Failure running inspectData_cfg.py on Phase-2 input" $?
 
 echo "TESTING G4e refitter ..."
 cmsRun ${CMSSW_BASE}/src/Alignment/OfflineValidation/test/testG4Refitter_cfg.py maxEvents=10  || die "Failure running testG4Refitter_cfg.py" $?

Calibration/HcalCalibAlgos/macros/CalibFitPlots.C

@@ -48,8 +48,6 @@
 //           text0 is the text for general title added within ()
 //           type=0 plots response distributions and MPV of response vs ieta
 //               =1 plots MPV of response vs RBX #
-//           *drawStatBox* is of type *int* here specifying the index for
-//           calling SetOptStat and SetOptFit
 //
 //             For plotting stored histograms from CalibTree
 //  PlotFiveHists(infile, text0, prefix0, type, iname, drawStatBox, normalize,
@@ -61,8 +59,6 @@
 //           text0 is the text for general title added within ()
 //           prefix0 is the tag attached to the canvas name
 //           type has the same meaning as in PlotTwoHists
-//           *drawStatBox* is of type *int* here specifying the index for
-//           calling SetOptStat and SetOptFit
 //
 //  PlotHistCorrResults(infile, text, prefixF, save);
 //      Defaults: save=0
@@ -177,6 +173,7 @@
 //            For plotting ratio of correction factors as defined in a file
 //            give by infileX for 2 depths (depth1, depth2) as a function of
 //            ieta obaned from 2 sources of data (defined by text1 and text2)
+//
 //  PlotHistCorrRatio(infile1, text1, infile2, text2, depth1, depth2, prefix,
 //                    text0, etaMin, etaMax, doFit, isRealData, year, iformat,
 //                    range, save)
@@ -676,7 +673,7 @@ results fitDoubleSidedCrystalball(TH1D* hist, bool /* fitTwice */, bool debug) {
   return results(value, error, width, werror);
 }
 
-void readCorrFactors(char* infile,
+void readCorrFactors(std::string infile,
                      double scale,
                      std::map<int, cfactors>& cfacs,
                      int& etamin,
@@ -685,7 +682,7 @@ void readCorrFactors(char* infile,
                      int iformat = 0,
                      bool debug = false) {
   cfacs.clear();
-  std::ifstream fInput(infile);
+  std::ifstream fInput(infile.c_str());
   if (!fInput.good()) {
     std::cout << "Cannot open file " << infile << std::endl;
   } else {
@@ -2313,7 +2310,7 @@ void PlotHistCorrResults(std::string infile, std::string text, std::string prefi
   }
 }
 
-void PlotHistCorrFactor(char* infile,
+void PlotHistCorrFactor(std::string infile,
                         std::string text,
                         std::string prefixF,
                         double scale = 1.0,
@@ -2457,7 +2454,7 @@ void PlotHistCorrFactor(char* infile,
   }
 }
 
-void PlotHistCorrFactor(char* infile,
+void PlotHistCorrFactor(std::string infile,
                         std::string text,
                         int depth,
                         std::string prefixF,
@@ -2600,7 +2597,7 @@ void PlotHistCorrFactor(char* infile,
 }
 
 void PlotHistCorrAsymmetry(
-    char* infile, std::string text, std::string prefixF = "", int depth = -1, int iformat = 0, int save = 0) {
+    std::string infile, std::string text, std::string prefixF = "", int depth = -1, int iformat = 0, int save = 0) {
   std::map<int, cfactors> cfacs;
   int etamin(100), etamax(-100), maxdepth(0);
   double scale(1.0);
@@ -2702,29 +2699,29 @@ void PlotHistCorrAsymmetry(
   }
 }
 
-void PlotHistCorrFactors(char* infile1,
+void PlotHistCorrFactors(std::string infile1,
                          std::string text1,
-                         char* infile2,
+                         std::string infile2,
                          std::string text2,
-                         char* infile3,
+                         std::string infile3,
                          std::string text3,
-                         char* infile4,
+                         std::string infile4,
                          std::string text4,
-                         char* infile5,
+                         std::string infile5,
                          std::string text5,
                          std::string prefixF,
-                         bool ratio = false,
-                         bool drawStatBox = true,
+                         bool ratio = true,
+                         bool drawStatBox = false,
                          int nmin = 100,
-                         bool isRealData = false,
+                         bool isRealData = true,
                          const char* year = "2025",
                          int iformat = 0,
-                         int range = 1,
+                         int range = 0,
                          int save = 0) {
   std::map<int, cfactors> cfacs[5];
   std::vector<std::string> texts;
   int nfile(0), etamin(100), etamax(-100), maxdepth(0);
-  const char* blank("");
+  std::string blank("");
   if (infile1 != blank) {
     readCorrFactors(infile1, 1.0, cfacs[nfile], etamin, etamax, maxdepth, iformat);
     if (cfacs[nfile].size() > 0) {
@@ -2814,7 +2811,7 @@ void PlotHistCorrFactors(char* infile1,
             if (dep == j + 1) {
               int ieta = (itr->second).ieta;
               int bin = ieta - etamin + 1;
-              float val = (itr->second).corrf / (ktr->second).corrf;
+              float val = (ktr->second).corrf / (itr->second).corrf;
               float dvl =
                   val *
                   sqrt((((itr->second).dcorr * (itr->second).dcorr) / ((itr->second).corrf * (itr->second).corrf)) +
@@ -2836,9 +2833,9 @@ void PlotHistCorrFactors(char* infile1,
           h->SetMarkerSize(0.9);
           h->GetXaxis()->SetTitle("i#eta");
           if (nfile > 2)
-            sprintf(name, "CF_{%s}/CF_{Set}", texts[0].c_str());
+            sprintf(name, "CF_{Set}/CF_{%s}", texts[0].c_str());
           else
-            sprintf(name, "CF_{%s}/CF_{%s}", texts[0].c_str(), texts[ih].c_str());
+            sprintf(name, "CF_{%s}/CF_{%s}", texts[ih].c_str(), texts[0].c_str());
           h->GetYaxis()->SetTitle(name);
           h->GetYaxis()->SetLabelOffset(0.005);
           h->GetYaxis()->SetTitleSize(0.036);
@@ -2940,7 +2937,7 @@ void PlotHistCorrFactors(char* infile1,
         }
         sprintf(name, "Depth %d (%s)", depths[k], texts[k1].c_str());
       } else {
-        sprintf(name, "Depth %d (Mean[CF_{%s}/CF_{%s}] = %5.3f)", depths[k], text1.c_str(), texts[k1].c_str(), fitr[k]);
+        sprintf(name, "Depth %d (Mean[CF_{%s}/CF_{%s}] = %5.3f)", depths[k], texts[k1].c_str(), text1.c_str(), fitr[k]);
       }
       if ((depths[k] == 1) || (k1 <= 1) || (maxdepth <= 4))
         legend->AddEntry(hists[k], name, "lp");
@@ -2977,9 +2974,9 @@ void PlotHistCorrFactors(char* infile1,
   }
 }
 
-void PlotHistCorr2Factors(char* infile1,
+void PlotHistCorr2Factors(std::string infile1,
                           std::string text1,
-                          char* infile2,
+                          std::string infile2,
                           std::string text2,
                           int depth,
                           std::string prefixF,
@@ -2994,7 +2991,7 @@ void PlotHistCorr2Factors(char* infile1,
   std::map<int, cfactors> cfacs[5];
   std::vector<std::string> texts;
   int nfile(0), etamin(100), etamax(-100), maxdepth(0);
-  const char* blank("");
+  std::string blank("");
   if (infile1 != blank) {
     readCorrFactors(infile1, 1.0, cfacs[nfile], etamin, etamax, maxdepth, iformat);
     if (cfacs[nfile].size() > 0) {
@@ -3208,15 +3205,15 @@ void PlotHistCorr2Factors(char* infile1,
   }
 }
 
-void PlotHistCorrDFactors(char* infile1,
+void PlotHistCorrDFactors(std::string infile1,
                           std::string text1,
-                          char* infile2,
+                          std::string infile2,
                           std::string text2,
-                          char* infile3,
+                          std::string infile3,
                           std::string text3,
-                          char* infile4,
+                          std::string infile4,
                           std::string text4,
-                          char* infile5,
+                          std::string infile5,
                           std::string text5,
                           int depth,
                           std::string prefixF,
@@ -3231,7 +3228,7 @@ void PlotHistCorrDFactors(char* infile1,
   std::map<int, cfactors> cfacs[5];
   std::vector<std::string> texts;
   int nfile(0), etamin(100), etamax(-100), maxdepth(0);
-  const char* blank("");
+  std::string blank("");
   if (infile1 != blank) {
     readCorrFactors(infile1, 1.0, cfacs[nfile], etamin, etamax, maxdepth, iformat);
     if (cfacs[nfile].size() > 0) {
@@ -3320,7 +3317,7 @@ void PlotHistCorrDFactors(char* infile1,
           if (dep == depth) {
             int ieta = (itr->second).ieta;
             int bin = ieta - etamin + 1;
-            float val = (itr->second).corrf / (ktr->second).corrf;
+            float val = (ktr->second).corrf / (itr->second).corrf;
             float dvl =
                 val * sqrt((((itr->second).dcorr * (itr->second).dcorr) / ((itr->second).corrf * (itr->second).corrf)) +
                            (((ktr->second).dcorr * (ktr->second).dcorr) / ((ktr->second).corrf * (ktr->second).corrf)));
@@ -3341,9 +3338,9 @@ void PlotHistCorrDFactors(char* infile1,
         h->SetMarkerSize(0.9);
         h->GetXaxis()->SetTitle("i#eta");
         if (nfile > 2)
-          sprintf(name, "CF_{%s}/CF_{Set}", texts[0].c_str());
+          sprintf(name, "CF_{Set}/CF_{%s}", texts[0].c_str());
         else
-          sprintf(name, "CF_{%s}/CF_{%s}", texts[0].c_str(), texts[ih].c_str());
+          sprintf(name, "CF_{%s}/CF_{%s}", texts[ih].c_str(), texts[0].c_str());
         h->GetYaxis()->SetTitle(name);
         h->GetYaxis()->SetLabelOffset(0.005);
         h->GetYaxis()->SetTitleSize(0.036);
@@ -3434,7 +3431,7 @@ void PlotHistCorrDFactors(char* infile1,
         }
         sprintf(name, "Depth %d (%s)", depth, texts[k1].c_str());
       } else {
-        sprintf(name, "Depth %d (Mean[CF_{%s}/CF_{%s}] = %5.3f)", depth, text1.c_str(), texts[k1].c_str(), fitr[k]);
+        sprintf(name, "Depth %d (Mean[CF_{%s}/CF_{%s}] = %5.3f)", depth, texts[k1].c_str(), text1.c_str(), fitr[k]);
       }
       legend->AddEntry(hists[k], name, "lp");
     }
@@ -3676,8 +3673,8 @@ void PlotHistCorrLumis(std::string infilec, int conds, double lumi, int save = 0
   }
 }
 
-void PlotHistCorrRel(char* infile1,
-                     char* infile2,
+void PlotHistCorrRel(std::string infile1,
+                     std::string infile2,
                      std::string text1,
                      std::string text2,
                      int iformat1 = 0,
@@ -3804,8 +3801,8 @@ void PlotHistCorrRel(char* infile1,
   }
 }
 
-void PlotHistCorrDepth(char* infile1,
-                       char* infile2,
+void PlotHistCorrDepth(std::string infile1,
+                       std::string infile2,
                        std::string text1,
                        std::string text2,
                        int depth,
@@ -4185,7 +4182,7 @@ void PlotPUCorrHists(std::string infile = "corrfac.root",
   }
 }
 
-void PlotHistCorr(const char* infile,
+void PlotHistCorr(std::string infile,
                   std::string prefix,
                   std::string text0,
                   int eta = 0,
@@ -4206,7 +4203,7 @@ void PlotHistCorr(const char* infile,
   std::string text[3] = {"Uncorrected no PU", "Uncorrected PU", "Corrected PU"};
   int colors[3] = {1, 4, 2};
   int styles[3] = {1, 3, 2};
-  TFile* file = new TFile(infile);
+  TFile* file = new TFile(infile.c_str());
   if (mode < 0 || mode > 2)
     mode = 1;
   int etamin = (eta == 0) ? -27 : eta;
@@ -4283,7 +4280,7 @@ void PlotHistCorr(const char* infile,
   }
 }
 
-void PlotPropertyHist(const char* infile,
+void PlotPropertyHist(std::string infile,
                       std::string prefix,
                       std::string text,
                       int etaMax = 25,
@@ -4320,7 +4317,7 @@ void PlotPropertyHist(const char* infile,
     gStyle->SetOptStat(0);
   gStyle->SetOptFit(0);
 
-  TFile* file = new TFile(infile);
+  TFile* file = new TFile(infile.c_str());
   char name[100], namep[100];
   for (int k = 1; k <= etaMax; ++k) {
     for (int j = 0; j < 3; ++j) {
@@ -4619,15 +4616,15 @@ void PlotMeanError(const std::string infilest, int reg = 3, bool resol = false,
   }
 }
 
-void PlotDepthCorrFactor(char* infile,
+void PlotDepthCorrFactor(std::string infile,
                          std::string text,
                          std::string prefix = "",
                          bool isRealData = true,
                          bool drawStatBox = true,
                          int save = 0) {
   std::map<int, cfactors> cfacs;
   int etamin(100), etamax(-100), maxdepth(0);
-  std::ifstream ifile(infile);
+  std::ifstream ifile(infile.c_str());
   if (!ifile.is_open()) {
     std::cout << "Cannot open duplicate file " << infile << std::endl;
   } else {
@@ -4836,7 +4833,7 @@ void DrawHistPhiSymmetry(TH1D* hist0, bool isRealData, bool drawStatBox, bool sa
 }
 
 void PlotPhiSymmetryResults(
-    char* infile, bool isRealData = true, bool drawStatBox = true, bool debug = false, bool save = false) {
+    std::string infile, bool isRealData = true, bool drawStatBox = true, bool debug = false, bool save = false) {
   const int maxDepthHB(4), maxDepthHE(7);
   const double cfacMin(0.70), cfacMax(1.5);
   const int nbin = (100.0 * (cfacMax - cfacMin));
@@ -4866,7 +4863,7 @@ void PlotPhiSymmetryResults(
       std::cout << "Book " << h->GetName() << " Title " << h->GetTitle() << " range " << nbin << ":" << cfacMin << ":"
                 << cfacMax << std::endl;
   }
-  std::ifstream fInput(infile);
+  std::ifstream fInput(infile.c_str());
   if (!fInput.good()) {
     std::cout << "Cannot open file " << infile << std::endl;
   } else {
@@ -4946,9 +4943,9 @@ void PlotPhiSymmetryResults(
   }
 }
 
-void PlotHistCorrRatio(char* infile1,
+void PlotHistCorrRatio(std::string infile1,
                        std::string text1,
-                       char* infile2,
+                       std::string infile2,
                        std::string text2,
                        int depth1,
                        int depth2,
@@ -4965,7 +4962,7 @@ void PlotHistCorrRatio(char* infile1,
   std::map<int, cfactors> cfacs[2];
   std::vector<std::string> texts;
   int nfile(0), etamin(100), etamax(-100), maxdepth(0);
-  const char* blank("");
+  std::string blank("");
   if (infile1 != blank) {
     readCorrFactors(infile1, 1.0, cfacs[nfile], etamin, etamax, maxdepth, iformat);
     if (cfacs[nfile].size() > 0) {

Calibration/HcalCalibAlgos/macros/CalibFitPlotsRootFit.C

@@ -1,6 +1,7 @@
 //////////////////////////////////////////////////////////////////////////////
 // Usage:
 // .L CalibFitPlotsRooFit.C+g
+//
 //             For extended set of histograms from CalibMonitor using RooFit
 //  FitHistExtended_RootFit(infile, outfile, prefix, numb, type, append,
 //			    fiteta, iname, debug);
@@ -10,7 +11,7 @@
 //             For plotting stird histograms from FitHistExtended_RootFit
 //  PlotHist_RooFit(infile, prefix, text, modePlot, kopt, lumi, ener,
 //		    isRealData, drawStatBox, save, debug);
-//      Defaults: modePlot=4, kopt=100, lumi=0, ener=13.6, isRealData=false,
+//      Defaults: modePlot=4, kopt=100, lumi=0, ener="13.6", isRealData=false,
 //                drawStatBox=true, save=0, debug=false
 //
 //
@@ -20,7 +21,7 @@
 //  prefix   (std::string)  = Prefix for the histogram names
 //  mode     (int)          = Flag to check which set of histograms to be
 //                            done. It has the format lthdo where each of
-//                            l, t,h,d,o can have a value 0 or 1 to select
+//                            l,t,h,d,o can have a value 0 or 1 to select
 //                            or deselect. l,t,h,d,o for momentum range
 //                            60-100, 30-40, all, 20-30, 40-60 Gev (11111)
 //  type     (int)          = defines eta binning type (see CalibMonitor)
@@ -1023,7 +1024,7 @@ void PlotHist_RooFit(const char* infile,
   if (mode < 0 || mode > 5)
     mode = 0;
   if (drawStatBox) {
-    int iopt = (mode != 0 ? 10 : 1110);
+    int iopt = (mode != 0) ? 10 : 1110;
     gStyle->SetOptStat(iopt);
     gStyle->SetOptFit(1);
   } else {