From 78950552b3b56164ca0af61b88b974a8a7c8caa7 Mon Sep 17 00:00:00 2001 From: Sunanda Date: Fri, 5 Jan 2024 05:53:10 +0100 Subject: [PATCH 1/2] Resolve the scenario for V18 version of HGCal Geometry --- Configuration/Geometry/python/dict2026Geometry.py | 2 +- .../PyReleaseValidation/python/upgradeWorkflowComponents.py | 2 +- Configuration/StandardSequences/python/Eras.py | 3 ++- .../data/dd4hep/cmsExtendedGeometry2026D104.xml | 2 +- .../python/cmsExtendedGeometry2026D104XML_cfi.py | 2 +- SimG4CMS/Calo/src/CaloSD.cc | 2 +- SimG4CMS/Calo/src/HGCalSD.cc | 6 ++---- 7 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Configuration/Geometry/python/dict2026Geometry.py b/Configuration/Geometry/python/dict2026Geometry.py index 68864e9d560a6..e0935db605d55 100644 --- 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 index ea6041c9d2822..5d252044a091a 100644 --- 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 index 4bcab0186e509..9c875e8fba998 100644 --- 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 index 77e3f36b5b14e..271fd4b72906b 100644 --- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D104.xml +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D104.xml @@ -102,7 +102,7 @@ - + diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D104XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D104XML_cfi.py index ce325b8706057..54e962ca392b4 100644 --- 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 index 1506ca39e1a99..e5d2ba26ff20b 100644 --- a/SimG4CMS/Calo/src/CaloSD.cc +++ b/SimG4CMS/Calo/src/CaloSD.cc @@ -487,7 +487,7 @@ 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 index c426eb6b0eace..bc82b81e7e010 100644 --- a/SimG4CMS/Calo/src/HGCalSD.cc +++ b/SimG4CMS/Calo/src/HGCalSD.cc @@ -334,11 +334,9 @@ 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( - waferSize_, hgcons_->getUVMax(0), hgcons_->getUVMax(1), guardRingOffset_, mouseBiteCut_); - } + cellOffset_ = std::make_unique(waferSize_, hgcons_->getUVMax(0), hgcons_->getUVMax(1), guardRingOffset_, mouseBiteCut_); } void HGCalSD::initRun() {} From 7082c6d171f82da48734c4d6f7ef7d631232e536 Mon Sep 17 00:00:00 2001 From: Sunanda Date: Fri, 5 Jan 2024 06:03:51 +0100 Subject: [PATCH 2/2] Code check --- SimG4CMS/Calo/src/CaloSD.cc | 3 ++- SimG4CMS/Calo/src/HGCalSD.cc | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/SimG4CMS/Calo/src/CaloSD.cc b/SimG4CMS/Calo/src/CaloSD.cc index e5d2ba26ff20b..56ad1e0eb1f99 100644 --- 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 << " for map " << useMap << ":" << &hitMap[k] << " Nhits " << nCheckedHits[k] << " HC " << theHC[k] << " ID " << currentID[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 index bc82b81e7e010..0743754f9fc8c 100644 --- a/SimG4CMS/Calo/src/HGCalSD.cc +++ b/SimG4CMS/Calo/src/HGCalSD.cc @@ -336,7 +336,8 @@ void HGCalSD::update(const BeginOfJob* job) { } if ((nHC_ > 1) && calibCells_) newCollection(collName_[1], ps_); - cellOffset_ = std::make_unique(waferSize_, hgcons_->getUVMax(0), hgcons_->getUVMax(1), guardRingOffset_, mouseBiteCut_); + cellOffset_ = std::make_unique( + waferSize_, hgcons_->getUVMax(0), hgcons_->getUVMax(1), guardRingOffset_, mouseBiteCut_); } void HGCalSD::initRun() {}