Merge branch 'cms-sw:master' into master

Author: michele-mormile

Alignment/MillePedeAlignmentAlgorithm/python/alignmentsetup/ConfigureAlignmentProducer.py

@@ -54,7 +54,7 @@ def setConfiguration(process, collection, mode, monitorFile, binaryFile,
     ## Tracktype specific ##
     ########################
 
-    if collection == "ALCARECOTkAlZMuMu" or collection == "ALCARECOTkAlZMuMuHI" or collection == "ALCARECOTkAlZMuMuPA":
+    if collection == "ALCARECOTkAlZMuMu" or collection == "ALCARECOTkAlZMuMuHI" or collection == "ALCARECOTkAlZMuMuPA" or collection == "ALCARECOTkAlDiMuon":
         process.AlignmentProducer.algoConfig.TrajectoryFactory = cms.PSet(
              process.TwoBodyDecayTrajectoryFactory
         )
@@ -67,11 +67,20 @@ def setConfiguration(process, collection, mode, monitorFile, binaryFile,
         process.AlignmentProducer.algoConfig.TrajectoryFactory = cms.PSet(
              process.TwoBodyDecayTrajectoryFactory
         )
-        process.AlignmentProducer.algoConfig.TrajectoryFactory.ParticleProperties.PrimaryMass =  9.4502
+        process.AlignmentProducer.algoConfig.TrajectoryFactory.ParticleProperties.PrimaryMass = 9.4502
         process.AlignmentProducer.algoConfig.TrajectoryFactory.ParticleProperties.PrimaryWidth = 0.0644
         process.AlignmentProducer.algoConfig.TrajectoryFactory.MaterialEffects = "LocalGBL"
         # to account for multiple scattering in these layers
         process.AlignmentProducer.algoConfig.TrajectoryFactory.UseInvalidHits = True
+    elif collection == "ALCARECOTkAlJpsiMuMu":
+        process.AlignmentProducer.algoConfig.TrajectoryFactory = cms.PSet(
+             process.TwoBodyDecayTrajectoryFactory
+        )
+        process.AlignmentProducer.algoConfig.TrajectoryFactory.ParticleProperties.PrimaryMass = 3.0969
+        process.AlignmentProducer.algoConfig.TrajectoryFactory.ParticleProperties.PrimaryWidth = 0.03
+        process.AlignmentProducer.algoConfig.TrajectoryFactory.MaterialEffects = "LocalGBL"
+        # to account for multiple scattering in these layers
+        process.AlignmentProducer.algoConfig.TrajectoryFactory.UseInvalidHits = True
     elif collection == "ALCARECOTkAlCosmicsCTF0T" and cosmicsZeroTesla:
         process.AlignmentProducer.algoConfig.TrajectoryFactory = cms.PSet(
             process.BrokenLinesBzeroTrajectoryFactory

CalibTracker/SiStripLorentzAngle/interface/SiStripLorentzAngleCalibrationHelpers.h

@@ -23,18 +23,16 @@ namespace siStripLACalibration {
     if (detid.subDetector() == SiStripDetId::TIB) {
       subdet = "TIB";
       layer = tTopo->layer(mod);
-    }
-
-    if (detid.subDetector() == SiStripDetId::TOB) {
+    } else if (detid.subDetector() == SiStripDetId::TOB) {
       subdet = "TOB";
       layer = tTopo->layer(mod);
     }
 
-    std::string type = (detid.stereo() ? "s" : "a");
-    std::string d_l_t = Form("%s_L%d%s", subdet.c_str(), layer, type.c_str());
-
     if (layer == 0)
       return subdet;
+
+    std::string type = (detid.stereo() ? "s" : "a");
+    std::string d_l_t = Form("%s_L%d%s", subdet.c_str(), layer, type.c_str());
     return d_l_t;
   }
 

CalibTracker/SiStripLorentzAngle/plugins/SiStripLorentzAnglePCLHarvester.cc

@@ -36,7 +36,6 @@
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "Geometry/Records/interface/IdealGeometryRecord.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
-#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "MagneticField/Engine/interface/MagneticField.h"

CalibTracker/SiStripLorentzAngle/plugins/SiStripLorentzAnglePCLMonitor.cc

@@ -44,7 +44,6 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h"
-#include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "MagneticField/Engine/interface/MagneticField.h"
 #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
@@ -248,13 +247,15 @@ void SiStripLorentzAnglePCLMonitor::analyze(const edm::Event& iEvent, const edm:
     iHists_.h1_["track_eta"]->Fill(track->eta());
     iHists_.h1_["track_phi"]->Fill(track->phi());
     iHists_.h1_["track_validhits"]->Fill(track->numberOfValidHits());
-    iHists_.h1_["track_chi2ndof"]->Fill((track->chi2() / track->ndof()));
-    iHists_.h2_["track_chi2xhits"]->Fill((track->chi2() / track->ndof()), track->numberOfValidHits());
+
+    const auto normChi2 = track->ndof() > 0 ? track->chi2() / track->ndof() : -1.;
+    iHists_.h1_["track_chi2ndof"]->Fill(normChi2);
+    iHists_.h2_["track_chi2xhits"]->Fill(normChi2, track->numberOfValidHits());
     iHists_.h2_["track_ptxhits"]->Fill(track->pt(), track->numberOfValidHits());
     iHists_.h2_["track_etaxhits"]->Fill(track->eta(), track->numberOfValidHits());
-    iHists_.h2_["track_ptxchi2"]->Fill(track->pt(), (track->chi2() / track->ndof()));
+    iHists_.h2_["track_ptxchi2"]->Fill(track->pt(), normChi2);
     iHists_.h2_["track_ptxeta"]->Fill(track->pt(), track->eta());
-    iHists_.h2_["track_etaxchi2"]->Fill(track->eta(), (track->chi2() / track->ndof()));
+    iHists_.h2_["track_etaxchi2"]->Fill(track->eta(), normChi2);
 
     edm::LogInfo("SiStripLorentzAnglePCLMonitor")
         << " track pT()" << track->pt() << " track eta()" << track->eta() << std::endl;

Configuration/Generator/python/concurrentLumisDisable.py

@@ -5,6 +5,7 @@
     "CosMuoGenProducer",
     "ExhumeGeneratorFilter",
     "Herwig7GeneratorFilter",
+    "Herwig7HadronizerFilter",
     "HydjetGeneratorFilter",
     "Hydjet2GeneratorFilter",
     "PyquenGeneratorFilter",

Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py

@@ -776,7 +776,7 @@ def condition(self, fragment, stepList, key, hasHarvest):
 #   - 2022 conditions (labelled "2021"), Z->mumu
 #   - 2023 conditions, TTbar
 #   - 2023 conditions, Z->mumu
-#   - 2026D88 conditions, TTbar
+#   - 2026 conditions, TTbar
 class PatatrackWorkflow(UpgradeWorkflow):
     def __init__(self, digi = {}, reco = {}, mini = {}, harvest = {}, **kwargs):
         # adapt the parameters for the UpgradeWorkflow init method
@@ -837,7 +837,7 @@ def condition(self, fragment, stepList, key, hasHarvest):
             ('2018' in key and fragment == "ZMM_13"),
             ('2021' in key and fragment == "ZMM_14" and 'FS' not in key),
             ('2023' in key and fragment == "ZMM_14" and 'FS' not in key),
-            ('2026D88' in key and fragment == "TTbar_14TeV" and "PixelOnly" in self.suffix),
+            ('2026' in key and fragment == "TTbar_14TeV"),
             (('HI' in key) and 'Hydjet' in fragment and "PixelOnly" in self.suffix )
         ]
         result = any(selected) and hasHarvest
@@ -858,6 +858,13 @@ def setup_(self, step, stepName, stepDict, k, properties):
               stepDict[stepName][k] = None
             else:
               stepDict[stepName][k] = merge([self.__reco, stepDict[step][k]])
+            if 'Phase2' in stepDict[stepName][k]['--era']:
+                if 'DQM:@standardDQM+@ExtraHLT' in stepDict[stepName][k]['-s']:
+                    stepDict[stepName][k]['-s'] = stepDict[stepName][k]['-s'].replace('DQM:@standardDQM+@ExtraHLT','DQM:@phase2')
+                if 'VALIDATION:@standardValidation' in stepDict[stepName][k]['-s']:
+                    stepDict[stepName][k]['-s'] = stepDict[stepName][k]['-s'].replace('VALIDATION:@standardValidation','VALIDATION:@phase2Validation')
+
+
         elif 'MiniAOD' in step:
             if self.__mini is None:
               stepDict[stepName][k] = None

Configuration/PyReleaseValidation/scripts/runTheMatrix.py

@@ -92,11 +92,12 @@ def runSelected(opt):
                      11634.911, #2021 DD4hep ttbar reading geometry from XML
                      11634.914, #2021 DDD ttbar reading geometry from the DB
                      11634.0, #2021 ttbar (switching to DD4hep by default)
-                     11834.0, #2021 ttbar PU
                      13234.0, #2021 ttbar fastsim
-                     13434.0, #2021 ttbar PU fastsim
                      12434.0, #2023 ttbar
+                     12634.0, #2023 ttbar PU
                      12434.7, #2023 ttbar mkFit
+                     14034.0, #2023 ttbar fastsim
+                     14234.0, #2023 ttbar PU fastsim
                      24834.0, #2026D98 ttbar (Phase-2 baseline)
                      24834.911, #2026D98 ttbar DD4hep XML
                      25034.999, #2026D98 ttbar premixing stage1+stage2, PU50
@@ -105,6 +106,7 @@ def runSelected(opt):
                      23234.0, #2026D94 ttbar (exercise with HFNose)
                      25202.0, #2016 ttbar UP15 PU
                      250202.181, #2018 ttbar stage1 + stage2 premix
+                     141.044 # 2023D JetMET PD
                      ],
         'jetmc': [5.1, 13, 15, 25, 38, 39], #MC
         'metmc' : [5.1, 15, 25, 37, 38, 39], #MC

Configuration/Skimming/python/PbPb_EMuSkim_cff.py

@@ -3,7 +3,7 @@
 # HLT dimuon trigger
 import HLTrigger.HLTfilters.hltHighLevel_cfi
 hltEMuHI = HLTrigger.HLTfilters.hltHighLevel_cfi.hltHighLevel.clone()
-hltEMuHI.HLTPaths = ["HLT_HIL1Mu5Eta2p5_Ele20Gsf_v*"]
+hltEMuHI.HLTPaths = ["HLT_HIEle*Gsf_v*","HLT_HIL3SingleMu*_Open_v*"]
 hltEMuHI.throw = False
 hltEMuHI.andOr = True
 
@@ -17,12 +17,12 @@
 # single lepton selector                                                                                                                                               
 electronSelectorForEMu = cms.EDFilter("GsfElectronRefSelector",
                                    src = cms.InputTag("gedGsfElectrons"),
-                                   cut = cms.string("pt > 20 && abs(eta)<1.44")
+                                   cut = cms.string("pt > 20")
                                    )
 
 muonSelectorForEMu = cms.EDFilter("MuonSelector",
                                   src = cms.InputTag("muons"),
-                                  cut = cms.string("(isTrackerMuon && isGlobalMuon) && pt > 20."),
+                                  cut = cms.string("isPFMuon && isGlobalMuon && pt > 20."),
                                   filter = cms.bool(True)
     )
 

Configuration/Skimming/python/PbPb_ZEESkim_cff.py

@@ -4,7 +4,7 @@
 # HLT dimuon trigger
 import HLTrigger.HLTfilters.hltHighLevel_cfi
 hltZEEHI = HLTrigger.HLTfilters.hltHighLevel_cfi.hltHighLevel.clone()
-hltZEEHI.HLTPaths = ["HLT_HIDoubleEle10Gsf_v*"]
+hltZEEHI.HLTPaths = ["HLT_HIEle*Gsf_v*"]
 hltZEEHI.throw = False
 hltZEEHI.andOr = True
 
@@ -18,14 +18,14 @@
 # single lepton selector
 goodElectronsForZEE = cms.EDFilter("GsfElectronRefSelector",
                                    src = cms.InputTag("gedGsfElectrons"),
-                                   cut = cms.string("pt > 25 && abs(eta)<1.44")
+                                   cut = cms.string("pt > 25")
                                    )
 
 ## dilepton selectors
 diElectronsForZEE = cms.EDProducer("CandViewShallowCloneCombiner",
                                    decay       = cms.string("goodElectronsForZEE goodElectronsForZEE"),
                                    checkCharge = cms.bool(False),
-                                   cut         = cms.string("mass > 80 && mass < 110")
+                                   cut         = cms.string("mass > 60")
                                    )
 
 # dilepton counter

Configuration/Skimming/python/PbPb_ZMMSkim_cff.py

@@ -3,7 +3,7 @@
 # HLT dimuon trigger
 import HLTrigger.HLTfilters.hltHighLevel_cfi
 hltZMMPbPb = HLTrigger.HLTfilters.hltHighLevel_cfi.hltHighLevel.clone()
-hltZMMPbPb.HLTPaths = ["HLT_HIL1DoubleMu10_v*"]
+hltZMMPbPb.HLTPaths = ["HLT_HIL3SingleMu*_Open_v*"]
 hltZMMPbPb.throw = False
 hltZMMPbPb.andOr = True
 
@@ -17,7 +17,7 @@
 # selection of dimuons with mass in Z range
 muonSelectorForZMM = cms.EDFilter("MuonSelector",
     src = cms.InputTag("muons"),
-    cut = cms.string("(isTrackerMuon && isGlobalMuon) && pt > 25."),
+    cut = cms.string("(isPFMuon && isGlobalMuon) && pt > 20."),
     filter = cms.bool(True)
     )
 
@@ -28,7 +28,7 @@
 
 dimuonMassCutForZMM = cms.EDProducer("CandViewShallowCloneCombiner",
     checkCharge = cms.bool(True),
-    cut = cms.string(' 80 < mass < 110'),
+    cut = cms.string('mass > 60'),
     decay = cms.string("muonSelectorForZMM@+ muonSelectorForZMM@-")
     )