Merge pull request #30568 from kpedro88/Phase2-WF58

Fix L1T bugs and add workflows

Configuration/PyReleaseValidation/python/relval_2026.py

@@ -26,6 +26,8 @@
 numWFIB.extend([22434.0]) #2026D47
 numWFIB.extend([22834.0]) #2026D48
 numWFIB.extend([23234.0,23234.1001,23434.1001]) #2026D49, TestOldDigi, TestOldDigi w/ PU
+numWFIB.extend([23234.1002,23434.1002]) #2026D49 TestOldDigiProdLike, TestOldDigiProdLike w/ PU
+numWFIB.extend([23234.21,23434.21]) #2026D49 prodlike, prodlike PU
 numWFIB.extend([23634.0]) #2026D51
 numWFIB.extend([24834.0]) #2026D54
 numWFIB.extend([26234.0]) #2026D55

Configuration/PyReleaseValidation/python/relval_upgrade.py

@@ -60,7 +60,7 @@ def makeStepName(key,frag,step,suffix):
                     elif (specialType is not 'baseline') and ( ('PU' in step and step.replace('PU','') in specialWF.PU) or (step in specialWF.steps) ):
                         stepList[specialType].append(stepMaker(key,frag[:-4],step,specialWF.suffix))
                         # hack to add an extra step
-                        if specialType == 'ProdLike' and 'RecoFullGlobal' in step:
+                        if (specialType == 'ProdLike' or specialType == 'TestOldDigiProdLike') and 'RecoFullGlobal' in step:
                             stepList[specialType].append(stepMaker(key,frag[:-4],step.replace('RecoFullGlobal','MiniAODFullGlobal'),specialWF.suffix))
                         elif specialType == 'ProdLike' and 'RecoFull' in step:
                             stepList[specialType].append(stepMaker(key,frag[:-4],step.replace('RecoFull','MiniAODFullGlobal'),specialWF.suffix))

Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py

@@ -694,18 +694,37 @@ class UpgradeWorkflow_TestOldDigi(UpgradeWorkflow):
     def setup_(self, step, stepName, stepDict, k, properties):
         if 'Reco' in step:
             # use existing DIGI-RAW file from old release
-            stepDict[stepName][k] = merge([{'--filein': 'das:/RelValTTbar_14TeV/CMSSW_11_0_0_pre13-110X_mcRun4_realistic_v2_2026D49noPU-v1/GEN-SIM-DIGI-RAW'}, stepDict[step][k]])
+            # re-emulate the full L1 trigger when running on 11_0 DIGI, i.e. replace L1Reco with L1TrackTrigger,L1
+            mods = {
+                '--filein': 'das:/RelValTTbar_14TeV/CMSSW_11_0_0_pre13-110X_mcRun4_realistic_v2_2026D49noPU-v1/GEN-SIM-DIGI-RAW',
+                '--customise': "L1Trigger/Configuration/customisePhase2TTNoMC.customisePhase2TTNoMC",
+            }
+            # for prodlike case
+            if self.prodlike:
+                mods['-s'] = 'RAW2DIGI,L1TrackTrigger,L1,RECO,RECOSIM'
+                mods['--datatier'] = 'AODSIM'
+                mods['--eventcontent'] = 'AODSIM'
+            else:
+                mods['-s'] = stepDict[step][k]['-s'].replace("L1Reco","L1TrackTrigger,L1")
+            stepDict[stepName][k] = merge([mods, stepDict[step][k]])
             # handle separate PU input
             stepNamePU = step + 'PU' + self.suffix
-            stepDict[stepNamePU][k] = merge([{'--filein': 'das:/RelValTTbar_14TeV/CMSSW_11_0_0_pre13-PU25ns_110X_mcRun4_realistic_v2_2026D49PU200-v2/GEN-SIM-DIGI-RAW'},stepDict[stepName][k]])
-            ## Use re-emulate the full L1 trigger when running on 11_0 DIGI. Ie. Replace L1Reco with L1TrackTrigger,L1. 
-            stepDict[stepName][k] = merge([{'-s': stepDict[stepName][k]['-s'].replace("L1Reco","L1TrackTrigger,L1")}, stepDict[stepName][k]])
-            stepDict[stepNamePU][k] = merge([{'-s': stepDict[stepNamePU][k]['-s'].replace("L1Reco","L1TrackTrigger,L1")}, stepDict[stepNamePU][k]])
-            stepDict[stepName][k] = merge([{'--customise': "L1Trigger/Configuration/customisePhase2TTNoMC.customisePhase2TTNoMC"}, stepDict[stepName][k]])
-            stepDict[stepNamePU][k] = merge([{'--customise': "L1Trigger/Configuration/customisePhase2TTNoMC.customisePhase2TTNoMC"}, stepDict[stepNamePU][k]])
+            mods['--filein'] = 'das:/RelValTTbar_14TeV/CMSSW_11_0_0_pre13-PU25ns_110X_mcRun4_realistic_v2_2026D49PU200-v2/GEN-SIM-DIGI-RAW'
+            stepDict[stepNamePU][k] = merge([mods,stepDict[stepName][k]])
         elif 'GenSim' in step or 'Digi' in step:
             # remove step
             stepDict[stepName][k] = None
+
+        # other prodlike adjustments
+        if self.prodlike:
+            if 'MiniAOD' in step and self.prodlike:
+                # the separate miniAOD step is used here
+                stepDict[stepName][k] = deepcopy(stepDict[step][k])
+            elif 'ALCA' in step or 'HARVEST' in step:
+                # remove step
+                stepDict[stepName][k] = None
+            elif 'Nano' in step:
+                stepDict[stepName][k] = merge([{'--filein':'file:step4.root'}, stepDict[step][k]])
     def condition(self, fragment, stepList, key, hasHarvest):
         # limited to HLT TDR production geometry
         return fragment=="TTbar_14TeV" and '2026D49' in key
@@ -725,6 +744,26 @@ def workflow_(self, workflows, num, fragment, stepList):
     suffix = '_TestOldDigi',
     offset = 0.1001,
 )
+upgradeWFs['TestOldDigi'].prodlike = False
+upgradeWFs['TestOldDigiProdLike'] = UpgradeWorkflow_TestOldDigi(
+    steps = [
+        'GenSimHLBeamSpotFull',
+        'GenSimHLBeamSpotFull14',
+        'DigiFullTrigger',
+        'RecoFullGlobal',
+        'HARVESTFullGlobal',
+        'MiniAODFullGlobal',
+    ],
+    PU = [
+        'DigiFullTrigger',
+        'RecoFullGlobal',
+        'HARVESTFullGlobal',
+        'MiniAODFullGlobal',
+    ],
+    suffix = '_TestOldDigiProdLike',
+    offset = 0.1002,
+)
+upgradeWFs['TestOldDigiProdLike'].prodlike = True
 
 class UpgradeWorkflow_DD4hep(UpgradeWorkflow):
     def setup_(self, step, stepName, stepDict, k, properties):

L1Trigger/Configuration/python/customisePhase2TTNoMC.py

@@ -1,4 +1,8 @@
+import FWCore.ParameterSet.Config as cms
+
 def customisePhase2TTNoMC(process):
     process.L1TrackTrigger.replace(process.L1PromptExtendedHybridTracksWithAssociators, process.L1PromptExtendedHybridTracks)
     process.L1TrackTrigger.remove(process.TrackTriggerAssociatorClustersStubs)
+    process.load('SimCalorimetry.HcalTrigPrimProducers.hcaltpdigi_cff')
+
     return process

L1Trigger/L1CaloTrigger/plugins/BuildFile.xml

@@ -15,9 +15,6 @@
 <use   name="DataFormats/HcalRecHit"/>
 <use   name="DataFormats/EcalDigi"/>
 <use   name="DataFormats/HcalDigi"/>
-<use   name="DataFormats/Phase2L1CaloTrig"/>
-<use   name="SimCalorimetry/EcalEBTrigPrimProducers"/>
-<use   name="RecoLocalCalo/Configuration"/>
 <use   name="FastSimulation/CaloGeometryTools"/>
 <use   name="CalibFormats/CaloTPG"/>
 <use   name="L1Trigger/L1CaloTrigger"/>

L1Trigger/L1CaloTrigger/python/L1EGammaCrystalsEmulatorProducer_cfi.py

@@ -28,3 +28,8 @@
    ),
 )
 
+from Configuration.ProcessModifiers.premix_stage2_cff import premix_stage2
+premix_stage2.toModify(L1EGammaClusterEmuProducer,
+    ecalTPEB = cms.InputTag("DMEcalEBTriggerPrimitiveDigis","","HLT"),
+    hcalTP = cms.InputTag("DMHcalTriggerPrimitiveDigis","","HLT"),
+)

L1Trigger/Phase2L1ParticleFlow/src/RegionMapper.cc

@@ -56,7 +56,6 @@ RegionMapper::RegionMapper(const edm::ParameterSet &iConfig) : useRelativeRegion
       throw cms::Exception(
           "Configuration",
           "Unsupported value for trackRegionMode: " + trackRegionMode + " (allowed are 'atVertex', 'atCalo', 'any')");
-    std::cout << "L1 RegionMapper: made " << regions_.size() << " regions" << std::endl;
   } else {
     // start off with a dummy region
     unsigned int ncalomax = 0, nemcalomax = 0, ntrackmax = 0, nmuonmax = 0, npfmax = 0, npuppimax = 0;