Merge pull request #43661 from bsunanda/Phase2-HGX350A

Phase2-HGX350A Resolve the scenario for V18 version of HGCal Geometry
cms-sw · Jan 16, 2024 · 10b8a60 · 10b8a60
2 parents 1faff5c + 7082c6d
commit 10b8a60
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 10 deletions.
diff --git a/Configuration/Geometry/python/dict2026Geometry.py b/Configuration/Geometry/python/dict2026Geometry.py
@@ -771,7 +771,7 @@
             'Geometry/HcalSimData/data/hfpmt.xml',
             'Geometry/HcalSimData/data/hffibrebundle.xml',
             'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
-            'Geometry/HGCalSimData/data/hgcsensv17n.xml',
+            'Geometry/HGCalSimData/data/hgcsensv15.xml',
         ],
         4 : [
             'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml',

diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
@@ -2822,7 +2822,7 @@ def condition(self, fragment, stepList, key, hasHarvest):
         'Geom' : 'Extended2026D104',
         'HLTmenu': '@relval2026',
         'GT' : 'auto:phase2_realistic_T33',
-        'Era' : 'Phase2C17I13M9',
+        'Era' : 'Phase2C22I13M9',
         'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'],
     },
     '2026D105' : {

diff --git a/Configuration/StandardSequences/python/Eras.py b/Configuration/StandardSequences/python/Eras.py
@@ -61,7 +61,8 @@ def __init__(self):
                  'Phase2C11I13T25M9',
                  'Phase2C11I13T26M9',
                  'Phase2C17I13M9',
-                 'Phase2C20I13M9'
+                 'Phase2C20I13M9',
+                 'Phase2C22I13M9'
         ]
 
         internalUseMods = ['run2_common', 'run2_25ns_specific',

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D104.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D104.xml
@@ -102,7 +102,7 @@
     <Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
     <Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
     <Include ref='Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml'/>
-    <Include ref='Geometry/HGCalSimData/data/hgcsensv17n.xml'/>
+    <Include ref='Geometry/HGCalSimData/data/hgcsensv15.xml'/>
     <Include ref='Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml'/>
     <Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml'/>
     <Include ref='Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml'/>

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D104XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D104XML_cfi.py
@@ -105,7 +105,7 @@
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
         'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
-        'Geometry/HGCalSimData/data/hgcsensv17n.xml',
+        'Geometry/HGCalSimData/data/hgcsensv15.xml',
         'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',

diff --git a/SimG4CMS/Calo/src/CaloSD.cc b/SimG4CMS/Calo/src/CaloSD.cc
@@ -487,7 +487,8 @@ bool CaloSD::hitExists(const G4Step* aStep, int k) {
 
 bool CaloSD::checkHit(int k) {
 #ifdef EDM_ML_DEBUG
-  edm::LogVerbatim("CaloSim") << "CaloSD: checkHit for " << k;
+  edm::LogVerbatim("CaloSim") << "CaloSD: checkHit for " << k << " for map " << useMap << ":" << &hitMap[k] << " Nhits "
+                              << nCheckedHits[k] << " HC " << theHC[k] << " ID " << currentID[k];
 #endif
   //look in the HitContainer whether a hit with the same ID already exists:
   bool found = false;

diff --git a/SimG4CMS/Calo/src/HGCalSD.cc b/SimG4CMS/Calo/src/HGCalSD.cc
@@ -334,11 +334,10 @@ void HGCalSD::update(const BeginOfJob* job) {
   } else {
     throw cms::Exception("Unknown", "HGCalSD") << "Cannot find HGCalDDDConstants for " << nameX_ << "\n";
   }
-  if ((nHC_ > 1) && calibCells_) {
+  if ((nHC_ > 1) && calibCells_)
     newCollection(collName_[1], ps_);
-    cellOffset_ = std::make_unique<HGCalCellOffset>(
-        waferSize_, hgcons_->getUVMax(0), hgcons_->getUVMax(1), guardRingOffset_, mouseBiteCut_);
-  }
+  cellOffset_ = std::make_unique<HGCalCellOffset>(
+      waferSize_, hgcons_->getUVMax(0), hgcons_->getUVMax(1), guardRingOffset_, mouseBiteCut_);
 }
 
 void HGCalSD::initRun() {}