Merge pull request #47859 from brusale/clue-barrel-pr-rebase

TICL-barrel: run CLUE in the barrel calorimeters and first workflows

Author: cmsbuild

Configuration/EventContent/python/EventContent_cff.py

@@ -700,7 +700,8 @@ def SwapKeepAndDrop(l):
 phase2_common.toModify(FEVTDEBUGHLTEventContent,
                        outputCommands = FEVTDEBUGHLTEventContent.outputCommands+[
                            'keep *_hltHGCalRecHit_*_*',
-                           'keep *_hltHgcalMergeLayerClusters_*_*',
+                           'keep *_hltMergeLayerClusters_*_*',
+                           'keep *_hltParticleFlowRecHit*_*_*',
                            'keep *_hltEgammaGsfTracksL1Seeded_*_*',
                        ])
 

Configuration/Generator/python/CloseByPGun_Barrel_Front_cfi.py

@@ -0,0 +1,14 @@
+import FWCore.ParameterSet.Config as cms
+from .CE_E_Front_300um_cfi import generator
+
+_pgunPSet = generator.PGunParameters
+
+_pgunPSet.ControlledByEta = cms.bool(True)
+_pgunPSet.MinEta = cms.double(-1.479)
+_pgunPSet.MaxEta = cms.double(1.479)
+_pgunPSet.RMin = cms.double(128.5)
+_pgunPSet.RMax = cms.double(128.4)
+_pgunPSet.ZMin = cms.double(-230)
+_pgunPSet.ZMax = cms.double(230)
+
+generator.PGunParameters = _pgunPSet

Configuration/ProcessModifiers/python/ticl_barrel_cff.py

@@ -0,0 +1,3 @@
+import FWCore.ParameterSet.Config as cms
+
+ticl_barrel = cms.Modifier()

Configuration/PyReleaseValidation/README.md

@@ -63,6 +63,7 @@ The offsets currently in use are:
 * 0.7561 HLT phase-2 timing menu Alpaka, trimmed tracking
 * 0.7562 HLT phase-2 timing menu Alpaka, trimmed tracking, single tracking iteration variant
 * 0.757: HLT phase-2 timing menu Alpaka, single tracking iteration, LST seeding + CKF building variant
+* 0.758 HLT phase-2 timing menu ticl_barrel variant
 * 0.759: HLT phase-2 timing menu, with NANO:@Phase2HLT
 * 0.77: HLT phase-2 NGT Scouting menu
 * 0.771: HLT phase-2 NGT Scouting menu, with NANO:@NGTScouting
@@ -108,6 +109,8 @@ The offsets currently in use are:
 * 0.203: HGCAL TICLv5
 * 0.204: HGCAL superclustering : using Mustache in TICLv5
 * 0.205: HGCAL superclustering : using old PFCluster-based Mustache algorithm with TICLv5
+* 0.209: TICL barrel : run TICL in HGCAL and barrel calorimeters
+* 0.2091: TICL barrel with CaloParticles from PU enabled
 * 0.302: FastSim Run-3 trackingOnly validation
 * 0.303: FastSim Run-3 MB for mixing
 * 0.9001: Sonic Triton

Configuration/PyReleaseValidation/python/relval_Run4.py

@@ -77,6 +77,7 @@
 numWFIB.extend([prefixDet+34.7561])# HLTTiming75e33, alpaka,phase2_hlt_vertexTrimming
 numWFIB.extend([prefixDet+34.7562])# HLTTiming75e33, alpaka,phase2_hlt_vertexTrimming,singleIterPatatrack
 numWFIB.extend([prefixDet+34.757]) # HLTTiming75e33, alpaka,singleIterPatatrack,trackingLST,seedingLST
+numWFIB.extend([prefixDet+34.758]) # HLTTiming75e33, ticl_barrel
 numWFIB.extend([prefixDet+34.759]) # HLTTiming75e33 + NANO
 numWFIB.extend([prefixDet+34.77])  # NGTScouting
 numWFIB.extend([prefixDet+34.771]) # NGTScouting + NANO

Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py

@@ -997,6 +997,68 @@ def condition(self, fragment, stepList, key, hasHarvest):
 upgradeWFs['CPfromPU'].step3 = {'--procModifiers': 'enableCPfromPU'}
 upgradeWFs['CPfromPU'].step4 = {'--procModifiers': 'enableCPfromPU'}
 
+class UpgradeWorkflow_ticl_barrel(UpgradeWorkflow):
+    def setup_(self, step, stepName, stepDict, k, properties):
+        if ('Digi' in step and 'NoHLT' not in step) or ('HLTOnly' in step):      
+            stepDict[stepName][k] = merge([self.step2, stepDict[step][k]])
+        if 'RecoGlobal' in step:
+            stepDict[stepName][k] = merge([self.step3, stepDict[step][k]])
+        if 'HARVESTGlobal' in step:
+            stepDict[stepName][k] = merge([self.step4, stepDict[step][k]])
+    def condition(self, fragment, stepList, key, hasHarvest):
+        return ('CloseByPGun_Barrel') in fragment and ('Run4' in key)
+
+upgradeWFs['ticl_barrel'] = UpgradeWorkflow_ticl_barrel(
+    steps = [
+        'HLTOnly',
+        'DigiTrigger',
+        'RecoGlobal',
+        'HARVESTGlobal'
+    ],
+    PU = [
+        'HLTOnly',
+        'DigiTrigger',
+        'RecoGlobal',
+        'HARVESTGlobal'
+    ], 
+    suffix = '_ticl_barrel',
+    offset = 0.209,
+)
+upgradeWFs['ticl_barrel'].step2 = {'--procModifiers': 'ticl_barrel'}
+upgradeWFs['ticl_barrel'].step3 = {'--procModifiers': 'ticl_barrel'}
+upgradeWFs['ticl_barrel'].step4 = {'--procModifiers': 'ticl_barrel'}
+
+class UpgradeWorkflow_ticl_barrel_CPfromPU(UpgradeWorkflow):
+    def setup_(self, step, stepName, stepDict, k, properties):
+        if ('Digi' in step and 'NoHLT' not in step) or ('HLTOnly' in step):
+            stepDict[stepName][k] = merge([self.step2, stepDict[step][k]])
+        if 'RecoGlobal' in step:
+            stepDict[stepName][k] = merge([self.step3, stepDict[step][k]])
+        if 'HARVESTGlobal' in step:
+            stepDict[stepName][k] = merge([self.step4, stepDict[step][k]])
+    def condition(self, fragment, stepList, key, hasHarvest):
+        return ('CloseByPGun_Barrel') in fragment and ('Run4' in key) and ('PU' in key)
+
+upgradeWFs['ticl_barrel_CPfromPU'] = UpgradeWorkflow_ticl_barrel_CPfromPU(
+    steps = [
+        'HLTOnly',
+        'DigiTrigger',
+        'RecoGlobal',
+        'HARVESTGlobal'
+    ],
+    PU = [
+        'HLTOnly',
+        'DigiTrigger',
+        'RecoGlobal',
+        'HARVESTGlobal'
+    ],
+    suffix = '_ticl_barrel_CPfromPU',
+    offset = 0.2091,
+)
+upgradeWFs['ticl_barrel_CPfromPU'].step2 = {'--procModifiers': 'ticl_barrel,enableCPfromPU'}
+upgradeWFs['ticl_barrel_CPfromPU'].step3 = {'--procModifiers': 'ticl_barrel,enableCPfromPU'}
+upgradeWFs['ticl_barrel_CPfromPU'].step4 = {'--procModifiers': 'ticl_barrel,enableCPfromPU'}
+
 # L3 Tracker Muon Outside-In reconstruction first
 class UpgradeWorkflow_phase2L3MuonsOIFirst(UpgradeWorkflow):
     def setup_(self, step, stepName, stepDict, k, properties):
@@ -1923,6 +1985,19 @@ def condition(self, fragment, stepList, key, hasHarvest):
     '-s':'HARVESTING:@hltValidation'
 }
 
+upgradeWFs['HLTTiming75e33TiclBarrel'] = deepcopy(upgradeWFs['HLTTiming75e33'])
+upgradeWFs['HLTTiming75e33TiclBarrel'].suffix = '_HLT75e33TimingTiclBarrel'
+upgradeWFs['HLTTiming75e33TiclBarrel'].offset = 0.758
+upgradeWFs['HLTTiming75e33TiclBarrel'].step2 = {
+    '-s' : 'DIGI:pdigi_valid,L1TrackTrigger,L1,L1P2GT,DIGI2RAW,HLT:75e33_timing,VALIDATION:@hltValidation',
+    '--procModifiers': 'ticl_barrel',
+    '--datatier':'GEN-SIM-DIGI-RAW,DQMIO',
+    '--eventcontent':'FEVTDEBUGHLT,DQMIO'
+}
+upgradeWFs['HLTTiming75e33TiclBarrel'].step3 = {
+    '-s':'HARVESTING:@hltValidation'
+}
+
 class UpgradeWorkflow_HLTPhase2_WithNano(UpgradeWorkflow):
     def setup_(self, step, stepName, stepDict, k, properties):
         # skip RECO, ALCA and HLT
@@ -3804,4 +3879,5 @@ def __init__(self, howMuch, dataset):
     ('Hydjet_Quenched_MinBias_5362GeV_cfi', UpgradeFragment(U2000by1,'HydjetQMinBias_5362GeV')),
     ('Hydjet_Quenched_MinBias_5519GeV_cfi', UpgradeFragment(U2000by1,'HydjetQMinBias_5519GeV')),
     ('SingleMuPt15Eta0_0p4_cfi', UpgradeFragment(Kby(9,100),'SingleMuPt15Eta0p_0p4')),
+    ('CloseByPGun_Barrel_Front_cfi', UpgradeFragment(Kby(9,100),'CloseByPGun_Barrel_Front')),
 ])

Configuration/PyReleaseValidation/scripts/runTheMatrix.py

@@ -161,8 +161,9 @@ def runSelected(opt):
                      29634.756,   # HLT phase-2 timing menu trimmed tracking
                      29634.7561,  # HLT phase-2 timing menu Alpaka, trimmed tracking
                      29634.7562,  # HLT phase-2 timing menu Alpaka, trimmed tracking, single tracking iteration variant
-                     29634.757,   # HLT phase-2 timing menu Alpaka, single tracking iteration, LST seeding + CKF building variant
-                     29634.759,   # HLT phase-2 timing menu, with NANO:@Phase2HLT
+                     29634.757,   # HLT phase-2 timing menu, with NANO:@Phase2HLT
+                     29634.758,   # HLT phase-2 timing menu ticl_barrel variant
+                     29634.759,   # HLT phase-2 timing menu Alpaka, single tracking iteration, LST seeding + CKF building variant
                      29634.77,    # HLT phase-2 NGT Scouting menu
                      29634.771,   # HLT phase-2 NGT Scouting menu, with NANO:@NGTScouting
                      29634.772]   # HLT phase-2 NGT Scouting menu, with NANO:@NGTScoutingVal

DataFormats/CaloRecHit/interface/CaloCluster.h

@@ -41,6 +41,8 @@ namespace reco {
       hgcal_had = 7,
       hgcal_scintillator = 8,
       hfnose = 9,
+      barrel_em = 10,
+      barrel_had = 11,
       undefined = 1000
     };
 

DataFormats/HGCalReco/interface/Common.h

@@ -28,6 +28,16 @@ namespace ticl {
     static constexpr int nBins = nEtaBins * nPhiBins;
   };
 
+  struct TileConstantsBarrel {
+    static constexpr float minEta = -1.5f;
+    static constexpr float maxEta = 1.5f;
+    static constexpr int nEtaBins = 68;
+    static constexpr int nPhiBins = 36;
+    static constexpr int nLayers = 5;
+    static constexpr int iterations = 1;
+    static constexpr int nBins = nEtaBins * nPhiBins;
+  };
+
 }  // namespace ticl
 
 namespace ticl {

DataFormats/HGCalReco/interface/TICLLayerTile.h

@@ -18,7 +18,11 @@ class TICLLayerTileT {
     constexpr float etaRange = T::maxEta - T::minEta;
     static_assert(etaRange >= 0.f);
     float r = T::nEtaBins / etaRange;
-    int etaBin = (std::abs(eta) - T::minEta) * r;
+    int etaBin;
+    if constexpr (std::is_same_v<T, ticl::TileConstantsBarrel>)
+      etaBin = (eta - T::minEta) * r;
+    else
+      etaBin = (std::abs(eta) - T::minEta) * r;
     etaBin = std::clamp(etaBin, 0, T::nEtaBins - 1);
     return etaBin;
   }
@@ -34,8 +38,10 @@ class TICLLayerTileT {
   std::array<int, 4> searchBoxEtaPhi(float etaMin, float etaMax, float phiMin, float phiMax) const {
     // The tile only handles one endcap at a time and does not hold mixed eta
     // values.
-    if (etaMin * etaMax < 0) {
-      return std::array<int, 4>({{0, 0, 0, 0}});
+    if (!std::is_same_v<T, ticl::TileConstantsBarrel>) {
+      if (etaMin * etaMax < 0) {
+        return std::array<int, 4>({{0, 0, 0, 0}});
+      }
     }
     if (etaMax - etaMin < 0) {
       return std::array<int, 4>({{0, 0, 0, 0}});
@@ -83,6 +89,9 @@ namespace ticl {
   using TilesHFNose = std::array<TICLLayerTileHFNose, TileConstantsHFNose::nLayers>;
   using TracksterTilesHFNose = std::array<TICLLayerTileHFNose, TileConstantsHFNose::iterations>;
 
+  using TICLLayerTileBarrel = TICLLayerTileT<TileConstantsBarrel>;
+  using TilesBarrel = std::array<TICLLayerTileBarrel, TileConstantsBarrel::nLayers>;
+  using TracksterTilesBarrel = std::array<TICLLayerTileBarrel, TileConstantsBarrel::iterations>;
 }  // namespace ticl
 
 template <typename T>
@@ -104,5 +113,7 @@ using TICLLayerTiles = TICLGenericTile<ticl::Tiles>;
 using TICLTracksterTiles = TICLGenericTile<ticl::TracksterTiles>;
 using TICLLayerTilesHFNose = TICLGenericTile<ticl::TilesHFNose>;
 using TICLTracksterTilesHFNose = TICLGenericTile<ticl::TracksterTilesHFNose>;
+using TICLLayerTilesBarrel = TICLGenericTile<ticl::TilesBarrel>;
+using TICLTracksterTilesBarrel = TICLGenericTile<ticl::TracksterTilesBarrel>;
 
 #endif