Update L1 tracking for HL-LHC (fixed)

Alignment/APEEstimation/interface/TrackerSectorStruct.h

@@ -212,8 +212,8 @@ TrackerSectorStruct::CorrelationHists TrackerSectorStruct::bookCorrHists(TString
   const std::string &o(options);
   CorrelationHists correlationHists;
 
-  if (!(o.find("n") != std::string::npos || o.find("p") != std::string::npos || o.find("h") != std::string::npos ||
-        o.find("t") != std::string::npos || o.find("r") != std::string::npos))
+  if (!(o.find('n') != std::string::npos || o.find('p') != std::string::npos || o.find('h') != std::string::npos ||
+        o.find('t') != std::string::npos || o.find('r') != std::string::npos))
     return correlationHists;
 
   TFileDirectory *directory(directory_);
@@ -228,7 +228,7 @@ TrackerSectorStruct::CorrelationHists TrackerSectorStruct::bookCorrHists(TString
                                                     minBinX,
                                                     maxBinX);
 
-  if (options.find("n") != std::string::npos)
+  if (options.find('n') != std::string::npos)
     correlationHists.NorResXVsVar =
         directory->make<TH2F>("h2_norRes" + xY + "Vs" + varName,
                               "r_{" + xy + "}/#sigma_{r," + xy + "} vs. " + labelX + ";" + labelX + "  " + unitX +
@@ -239,7 +239,7 @@ TrackerSectorStruct::CorrelationHists TrackerSectorStruct::bookCorrHists(TString
                               25,
                               -norResXMax,
                               norResXMax);
-  if (options.find("p") != std::string::npos)
+  if (options.find('p') != std::string::npos)
     correlationHists.ProbXVsVar =
         directory->make<TH2F>("h2_prob" + xY + "Vs" + varName,
                               "prob_{" + xy + "} vs. " + labelX + ";" + labelX + "  " + unitX + ";prob_{" + xy + "}",
@@ -249,7 +249,7 @@ TrackerSectorStruct::CorrelationHists TrackerSectorStruct::bookCorrHists(TString
                               60,
                               -0.1,
                               1.1);
-  if (options.find("h") != std::string::npos)
+  if (options.find('h') != std::string::npos)
     correlationHists.SigmaXHitVsVar = directory->make<TH2F>(
         "h2_sigma" + xY + "HitVs" + varName,
         "#sigma_{hit," + xy + "} vs. " + labelX + ";" + labelX + "  " + unitX + ";#sigma_{hit," + xy + "}  [#mum]",
@@ -259,7 +259,7 @@ TrackerSectorStruct::CorrelationHists TrackerSectorStruct::bookCorrHists(TString
         50,
         0 * 10000.,
         sigmaXHitMax * 10000.);
-  if (options.find("t") != std::string::npos)
+  if (options.find('t') != std::string::npos)
     correlationHists.SigmaXTrkVsVar = directory->make<TH2F>(
         "h2_sigma" + xY + "TrkVs" + varName,
         "#sigma_{trk," + xy + "} vs. " + labelX + ";" + labelX + "  " + unitX + ";#sigma_{trk," + xy + "}  [#mum]",
@@ -269,7 +269,7 @@ TrackerSectorStruct::CorrelationHists TrackerSectorStruct::bookCorrHists(TString
         50,
         0 * 10000.,
         sigmaXMax * 10000.);
-  if (options.find("r") != std::string::npos)
+  if (options.find('r') != std::string::npos)
     correlationHists.SigmaXVsVar = directory->make<TH2F>(
         "h2_sigma" + xY + "Vs" + varName,
         "#sigma_{r," + xy + "} vs. " + labelX + ";" + labelX + "  " + unitX + ";#sigma_{r," + xy + "}  [#mum]",
@@ -280,7 +280,7 @@ TrackerSectorStruct::CorrelationHists TrackerSectorStruct::bookCorrHists(TString
         0 * 10000.,
         sigmaXMax * 10000.);
 
-  if (options.find("n") != std::string::npos)
+  if (options.find('n') != std::string::npos)
     correlationHists.PNorResXVsVar =
         directory->make<TProfile>("p_norRes" + xY + "Vs" + varName,
                                   "r_{" + xy + "}/#sigma_{r," + xy + "} vs. " + labelX + ";" + labelX + "  " + unitX +
@@ -289,29 +289,29 @@ TrackerSectorStruct::CorrelationHists TrackerSectorStruct::bookCorrHists(TString
                                   minBinX,
                                   maxBinX,
                                   "s");
-  if (options.find("p") != std::string::npos)
+  if (options.find('p') != std::string::npos)
     correlationHists.PProbXVsVar = directory->make<TProfile>(
         "p_prob" + xY + "Vs" + varName,
         "prob_{" + xy + "} vs. " + labelX + ";" + labelX + "  " + unitX + ";prob_{" + xy + "}",
         nBinX2D,
         minBinX,
         maxBinX,
         "s");
-  if (options.find("h") != std::string::npos)
+  if (options.find('h') != std::string::npos)
     correlationHists.PSigmaXHitVsVar = directory->make<TProfile>(
         "p_sigma" + xY + "HitVs" + varName,
         "#sigma_{hit," + xy + "} vs. " + labelX + ";" + labelX + "  " + unitX + ";#sigma_{hit," + xy + "}  [#mum]",
         nBinX2D,
         minBinX,
         maxBinX);
-  if (options.find("t") != std::string::npos)
+  if (options.find('t') != std::string::npos)
     correlationHists.PSigmaXTrkVsVar = directory->make<TProfile>(
         "p_sigma" + xY + "TrkVs" + varName,
         "#sigma_{trk," + xy + "} vs. " + labelX + ";" + labelX + "  " + unitX + ";#sigma_{trk," + xy + "}  [#mum]",
         nBinX2D,
         minBinX,
         maxBinX);
-  if (options.find("r") != std::string::npos)
+  if (options.find('r') != std::string::npos)
     correlationHists.PSigmaXVsVar = directory->make<TProfile>(
         "p_sigma" + xY + "Vs" + varName,
         "#sigma_{r," + xy + "} vs. " + labelX + ";" + labelX + "  " + unitX + ";#sigma_{r," + xy + "}  [#mum]",
@@ -349,8 +349,8 @@ TrackerSectorStruct::CorrelationHists TrackerSectorStruct::bookCorrHists(TString
   const std::string &o(options);
   CorrelationHists correlationHists;
 
-  if (!(o.find("n") != std::string::npos || o.find("p") != std::string::npos || o.find("h") != std::string::npos ||
-        o.find("t") != std::string::npos || o.find("r") != std::string::npos))
+  if (!(o.find('n') != std::string::npos || o.find('p') != std::string::npos || o.find('h') != std::string::npos ||
+        o.find('t') != std::string::npos || o.find('r') != std::string::npos))
     return correlationHists;
 
   TFileDirectory *directory(directory_);
@@ -359,7 +359,7 @@ TrackerSectorStruct::CorrelationHists TrackerSectorStruct::bookCorrHists(TString
   if (!directory)
     return correlationHists;
 
-  if (options.find("n") != std::string::npos)
+  if (options.find('n') != std::string::npos)
     correlationHists.NorResXVsVar =
         directory->make<TH2F>("h2_norRes" + xY + "Vs" + varName,
                               "r_{" + xy + "}/#sigma_{r," + xy + "} vs. " + labelX + ";" + labelX + "  " + unitX +
@@ -370,7 +370,7 @@ TrackerSectorStruct::CorrelationHists TrackerSectorStruct::bookCorrHists(TString
                               25,
                               -norResXMax,
                               norResXMax);
-  if (options.find("p") != std::string::npos)
+  if (options.find('p') != std::string::npos)
     correlationHists.ProbXVsVar =
         directory->make<TH2F>("h2_prob" + xY + "Vs" + varName,
                               "prob_{" + xy + "} vs. " + labelX + ";" + labelX + "  " + unitX + ";prob_{" + xy + "}",
@@ -380,7 +380,7 @@ TrackerSectorStruct::CorrelationHists TrackerSectorStruct::bookCorrHists(TString
                               60,
                               -0.1,
                               1.1);
-  if (options.find("h") != std::string::npos)
+  if (options.find('h') != std::string::npos)
     correlationHists.SigmaXHitVsVar = directory->make<TH2F>(
         "h2_sigma" + xY + "HitVs" + varName,
         "#sigma_{hit," + xy + "} vs. " + labelX + ";" + labelX + "  " + unitX + ";#sigma_{hit," + xy + "}  [#mum]",
@@ -390,7 +390,7 @@ TrackerSectorStruct::CorrelationHists TrackerSectorStruct::bookCorrHists(TString
         50,
         0 * 10000.,
         sigmaXHitMax * 10000.);
-  if (options.find("t") != std::string::npos)
+  if (options.find('t') != std::string::npos)
     correlationHists.SigmaXTrkVsVar = directory->make<TH2F>(
         "h2_sigma" + xY + "TrkVs" + varName,
         "#sigma_{trk," + xy + "} vs. " + labelX + ";" + labelX + "  " + unitX + ";#sigma_{trk," + xy + "}  [#mum]",
@@ -400,7 +400,7 @@ TrackerSectorStruct::CorrelationHists TrackerSectorStruct::bookCorrHists(TString
         50,
         0 * 10000.,
         sigmaXMax * 10000.);
-  if (options.find("r") != std::string::npos)
+  if (options.find('r') != std::string::npos)
     correlationHists.SigmaXVsVar = directory->make<TH2F>(
         "h2_sigma" + xY + "Vs" + varName,
         "#sigma_{r," + xy + "} vs. " + labelX + ";" + labelX + "  " + unitX + ";#sigma_{r," + xy + "}  [#mum]",
@@ -411,7 +411,7 @@ TrackerSectorStruct::CorrelationHists TrackerSectorStruct::bookCorrHists(TString
         0 * 10000.,
         sigmaXMax * 10000.);
 
-  if (options.find("n") != std::string::npos)
+  if (options.find('n') != std::string::npos)
     correlationHists.PNorResXVsVar =
         directory->make<TProfile>("p_norRes" + xY + "Vs" + varName,
                                   "r_{" + xy + "}/#sigma_{r," + xy + "} vs. " + labelX + ";" + labelX + "  " + unitX +
@@ -420,29 +420,29 @@ TrackerSectorStruct::CorrelationHists TrackerSectorStruct::bookCorrHists(TString
                                   minBinX,
                                   maxBinX,
                                   "s");
-  if (options.find("p") != std::string::npos)
+  if (options.find('p') != std::string::npos)
     correlationHists.PProbXVsVar = directory->make<TProfile>(
         "p_prob" + xY + "Vs" + varName,
         "prob_{" + xy + "} vs. " + labelX + ";" + labelX + "  " + unitX + ";prob_{" + xy + "}",
         nBinX,
         minBinX,
         maxBinX,
         "s");
-  if (options.find("h") != std::string::npos)
+  if (options.find('h') != std::string::npos)
     correlationHists.PSigmaXHitVsVar = directory->make<TProfile>(
         "p_sigma" + xY + "HitVs" + varName,
         "#sigma_{hit," + xy + "} vs. " + labelX + ";" + labelX + "  " + unitX + ";#sigma_{hit," + xy + "}  [#mum]",
         nBinX,
         minBinX,
         maxBinX);
-  if (options.find("t") != std::string::npos)
+  if (options.find('t') != std::string::npos)
     correlationHists.PSigmaXTrkVsVar = directory->make<TProfile>(
         "p_sigma" + xY + "TrkVs" + varName,
         "#sigma_{trk," + xy + "} vs. " + labelX + ";" + labelX + "  " + unitX + ";#sigma_{trk," + xy + "}  [#mum]",
         nBinX,
         minBinX,
         maxBinX);
-  if (options.find("r") != std::string::npos)
+  if (options.find('r') != std::string::npos)
     correlationHists.PSigmaXVsVar = directory->make<TProfile>(
         "p_sigma" + xY + "Vs" + varName,
         "#sigma_{r," + xy + "} vs. " + labelX + ";" + labelX + "  " + unitX + ";#sigma_{r," + xy + "}  [#mum]",

Alignment/CommonAlignment/src/AlignableObjectId.cc

@@ -225,8 +225,9 @@ namespace {
   }
 
   constexpr enum align::StructureType stringToObjectId(char const *name, AlignableObjectId::entry const *entries) {
-    return !entries->name ? align::invalid
-                          : same(entries->name, name) ? entries->type : stringToObjectId(name, entries + 1);
+    return !entries->name              ? align::invalid
+           : same(entries->name, name) ? entries->type
+                                       : stringToObjectId(name, entries + 1);
   }
 }  // namespace
 

Alignment/MillePedeAlignmentAlgorithm/scripts/mps_alisetup.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 from __future__ import print_function
 import os

Alignment/OfflineValidation/plugins/BuildFile.xml

@@ -10,6 +10,7 @@
 <use name="CondFormats/BeamSpotObjects"/>
 <use name="CondFormats/RunInfo"/>
 <use name="CondFormats/SiPixelObjects"/>
+<use name="CalibTracker/SiStripCommon"/>
 <use name="DQM/TrackerRemapper"/>
 <use name="DQMServices/Core"/>
 <use name="DataFormats/BeamSpot"/>

Alignment/OfflineValidation/test/DiMuonVertexValidation_cfg.py

@@ -56,7 +56,7 @@ def best_match(rcd):
                   "seed number")
 
 options.register ('myfile',
-                  'root://cms-xrd-global.cern.ch//store/relval/CMSSW_10_6_1/RelValZMM_13/GEN-SIM-RECO/PU25ns_106X_mc2017_realistic_v6_HS-v1/10000/44690279-DDF3-0D43-B92D-F5CB57EF7E6A.root', # default value
+                  '/store/relval/CMSSW_10_6_1/RelValZMM_13/GEN-SIM-RECO/PU25ns_106X_mc2017_realistic_v6_HS-v1/10000/44690279-DDF3-0D43-B92D-F5CB57EF7E6A.root', # default value
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
                   "file name")

Alignment/OfflineValidation/test/submitAllJobs.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 '''Script that submits CMS Tracker Alignment Primary Vertex Validation workflows
 '''

CalibCalorimetry/CastorCalib/src/CastorDbASCIIIO.cc

@@ -24,11 +24,10 @@ namespace CastorDbASCIIIO {
       if (first.isHcalDetId()) {
         HcalDetId f1(first);
         HcalDetId s1(second);
-        return f1.zside() != s1.zside()
-                   ? f1.zside() < s1.zside()
-                   : f1.iphi() != s1.iphi()
-                         ? f1.iphi() < s1.iphi()
-                         : f1.ietaAbs() != s1.ietaAbs() ? f1.ietaAbs() < s1.ietaAbs() : f1.depth() < s1.depth();
+        return f1.zside() != s1.zside()       ? f1.zside() < s1.zside()
+               : f1.iphi() != s1.iphi()       ? f1.iphi() < s1.iphi()
+               : f1.ietaAbs() != s1.ietaAbs() ? f1.ietaAbs() < s1.ietaAbs()
+                                              : f1.depth() < s1.depth();
       } else {
         return first.rawId() < second.rawId();
       }
@@ -39,12 +38,10 @@ namespace CastorDbASCIIIO {
     bool operator()(CastorElectronicsId first, CastorElectronicsId second) const {
       return first.readoutVMECrateId() != second.readoutVMECrateId()
                  ? first.readoutVMECrateId() < second.readoutVMECrateId()
-                 : first.htrSlot() != second.htrSlot()
-                       ? first.htrSlot() < second.htrSlot()
-                       : first.htrTopBottom() != second.htrTopBottom()
-                             ? first.htrTopBottom() < second.htrTopBottom()
-                             : first.fiberIndex() != second.fiberIndex() ? first.fiberIndex() < second.fiberIndex()
-                                                                         : first.fiberChanId() < second.fiberChanId();
+             : first.htrSlot() != second.htrSlot()           ? first.htrSlot() < second.htrSlot()
+             : first.htrTopBottom() != second.htrTopBottom() ? first.htrTopBottom() < second.htrTopBottom()
+             : first.fiberIndex() != second.fiberIndex()     ? first.fiberIndex() < second.fiberIndex()
+                                                             : first.fiberChanId() < second.fiberChanId();
     }
   };
 

CalibCalorimetry/HcalAlgos/src/HcalDbASCIIIO.cc

@@ -28,11 +28,10 @@ namespace {
       if (first.isHcalDetId()) {
         HcalDetId f1(first);
         HcalDetId s1(second);
-        return f1.zside() != s1.zside()
-                   ? f1.zside() < s1.zside()
-                   : f1.iphi() != s1.iphi()
-                         ? f1.iphi() < s1.iphi()
-                         : f1.ietaAbs() != s1.ietaAbs() ? f1.ietaAbs() < s1.ietaAbs() : f1.depth() < s1.depth();
+        return f1.zside() != s1.zside()       ? f1.zside() < s1.zside()
+               : f1.iphi() != s1.iphi()       ? f1.iphi() < s1.iphi()
+               : f1.ietaAbs() != s1.ietaAbs() ? f1.ietaAbs() < s1.ietaAbs()
+                                              : f1.depth() < s1.depth();
       } else {
         return first.rawId() < second.rawId();
       }
@@ -43,12 +42,10 @@ namespace {
     bool operator()(HcalElectronicsId first, HcalElectronicsId second) const {
       return first.readoutVMECrateId() != second.readoutVMECrateId()
                  ? first.readoutVMECrateId() < second.readoutVMECrateId()
-                 : first.htrSlot() != second.htrSlot()
-                       ? first.htrSlot() < second.htrSlot()
-                       : first.htrTopBottom() != second.htrTopBottom()
-                             ? first.htrTopBottom() < second.htrTopBottom()
-                             : first.fiberIndex() != second.fiberIndex() ? first.fiberIndex() < second.fiberIndex()
-                                                                         : first.fiberChanId() < second.fiberChanId();
+             : first.htrSlot() != second.htrSlot()           ? first.htrSlot() < second.htrSlot()
+             : first.htrTopBottom() != second.htrTopBottom() ? first.htrTopBottom() < second.htrTopBottom()
+             : first.fiberIndex() != second.fiberIndex()     ? first.fiberIndex() < second.fiberIndex()
+                                                             : first.fiberChanId() < second.fiberChanId();
     }
   };
 }  // namespace

CalibCalorimetry/HcalAlgos/src/HcalLedAnalysis.cc

@@ -1003,13 +1003,11 @@ void HcalLedAnalysis::ProcessCalibEvent(int fiberChan, HcalCalibDetId calibId, c
     char name[1024];
     std::string prefix;
     if (calibId.calibFlavor() == HcalCalibDetId::CalibrationBox) {
-      std::string sector = (calibId.hcalSubdet() == HcalBarrel)
-                               ? ("HB")
-                               : (calibId.hcalSubdet() == HcalEndcap)
-                                     ? ("HE")
-                                     : (calibId.hcalSubdet() == HcalOuter)
-                                           ? ("HO")
-                                           : (calibId.hcalSubdet() == HcalForward) ? ("HF") : "";
+      std::string sector = (calibId.hcalSubdet() == HcalBarrel)    ? ("HB")
+                           : (calibId.hcalSubdet() == HcalEndcap)  ? ("HE")
+                           : (calibId.hcalSubdet() == HcalOuter)   ? ("HO")
+                           : (calibId.hcalSubdet() == HcalForward) ? ("HF")
+                                                                   : "";
       snprintf(name,
                sizeof name,
                "%s %+d iphi=%d %s",

CalibFormats/CastorObjects/interface/CastorDbService.h

@@ -17,9 +17,6 @@
 #include "CalibFormats/CastorObjects/interface/CastorCalibrationsSet.h"
 #include "CalibFormats/CastorObjects/interface/CastorCalibrationWidthsSet.h"
 
-#include "FWCore/Framework/interface/ModuleFactory.h"
-#include "FWCore/Framework/interface/ESProducer.h"
-
 #include "CondFormats/CastorObjects/interface/AllObjects.h"
 
 class CastorCalibrations;

CalibFormats/CastorObjects/src/CastorText2DetIdConverter.cc

@@ -85,9 +85,9 @@ bool CastorText2DetIdConverter::init(const std::string& fFlavor,
   field2 = strip(fField2);
   field3 = strip(fField3);
   if (flavorName.find("CASTOR_") == 0) {
-    HcalCastorDetId::Section section =
-        flavorName == "CASTOR_EM" ? HcalCastorDetId::EM
-                                  : flavorName == "CASTOR_HAD" ? HcalCastorDetId::HAD : HcalCastorDetId::Unknown;
+    HcalCastorDetId::Section section = flavorName == "CASTOR_EM"    ? HcalCastorDetId::EM
+                                       : flavorName == "CASTOR_HAD" ? HcalCastorDetId::HAD
+                                                                    : HcalCastorDetId::Unknown;
     mId = HcalCastorDetId(section, getField(1) > 0, getField(2), getField(3));
   }
 

CalibFormats/HcalObjects/interface/HcalDbService.h

@@ -14,9 +14,6 @@
 #include "CalibFormats/HcalObjects/interface/HcalCalibrationsSet.h"
 #include "CalibFormats/HcalObjects/interface/HcalCalibrationWidthsSet.h"
 
-#include "FWCore/Framework/interface/ModuleFactory.h"
-#include "FWCore/Framework/interface/ESProducer.h"
-
 #include "CondFormats/HcalObjects/interface/AllObjects.h"
 
 class HcalCalibrations;