From 336141dd8959eb3a906edf97ae3ec41ca01e169c Mon Sep 17 00:00:00 2001 From: Sunanda Date: Wed, 3 Jul 2024 08:31:16 +0200 Subject: [PATCH 1/2] Modify the name of the class HGCPassive to HGCalTBPassive to separate the names of TB and non-TB classes of HGCal --- .../python/testTB181V0XML_cfi.py | 3 +- .../python/testTB181V1XML_cfi.py | 4 +- .../python/testTB181V2XML_cfi.py | 4 +- .../python/testTB181XML_cfi.py | 4 +- .../{HGCPassive.cc => HGCalTBPassive.cc} | 60 +++++++++---------- .../HGCalTestBeam/test/HGCalTBCERN170_cfg.py | 4 +- .../test/HGCalTBCERN181Oct1DD4hep_cfg.py | 4 +- .../test/HGCalTBCERN181Oct1PC1mm_cfg.py | 4 +- .../test/HGCalTBCERN181Oct1_cfg.py | 5 +- .../test/HGCalTBCERN181Oct1el100_cfg.py | 4 +- .../test/HGCalTBCERN181Oct2_cfg.py | 4 +- .../test/HGCalTBCERN181Oct3_cfg.py | 4 +- .../test/HGCalTBCERN181Oct4_cfg.py | 4 +- 13 files changed, 58 insertions(+), 50 deletions(-) rename SimG4CMS/HGCalTestBeam/plugins/{HGCPassive.cc => HGCalTBPassive.cc} (84%) diff --git a/Geometry/HGCalTBCommonData/python/testTB181V0XML_cfi.py b/Geometry/HGCalTBCommonData/python/testTB181V0XML_cfi.py index 34bd7ab294ee4..194bb759a6d65 100644 --- a/Geometry/HGCalTBCommonData/python/testTB181V0XML_cfi.py +++ b/Geometry/HGCalTBCommonData/python/testTB181V0XML_cfi.py @@ -13,7 +13,8 @@ 'Geometry/HGCalTBCommonData/data/hgcalwafer/v7/hgcalwafer.xml', 'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalsense.xml', 'Geometry/HGCalTBCommonData/data/TB181/hgcProdCuts.xml', - 'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalCons.xml' + 'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalCons.xml', + 'Geometry/HcalSimData/data/CaloUtil/2026/v5c/CaloUtil.xml' ), rootNodeName = cms.string('cms:OCMS') ) diff --git a/Geometry/HGCalTBCommonData/python/testTB181V1XML_cfi.py b/Geometry/HGCalTBCommonData/python/testTB181V1XML_cfi.py index 7ae1b7c0c9711..c5fa4490308f0 100644 --- a/Geometry/HGCalTBCommonData/python/testTB181V1XML_cfi.py +++ b/Geometry/HGCalTBCommonData/python/testTB181V1XML_cfi.py @@ -10,7 +10,9 @@ 'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalEE.xml', 'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalsense.xml', 'Geometry/HGCalTBCommonData/data/TB181/hgcProdCuts.xml', - 'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalCons.xml' + 'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalCons.xml', + 'Geometry/HcalSimData/data/CaloUtil/2026/v5c/CaloUtil.xml' + ), rootNodeName = cms.string('cms:OCMS') ) diff --git a/Geometry/HGCalTBCommonData/python/testTB181V2XML_cfi.py b/Geometry/HGCalTBCommonData/python/testTB181V2XML_cfi.py index ca7c4ce5d4859..4a7b7b98d7fc5 100644 --- a/Geometry/HGCalTBCommonData/python/testTB181V2XML_cfi.py +++ b/Geometry/HGCalTBCommonData/python/testTB181V2XML_cfi.py @@ -10,7 +10,9 @@ 'Geometry/HGCalTBCommonData/data/hgcalwafer/v7/hgcalwafer.xml', 'Geometry/HGCalTBCommonData/data/TB181/Test/hgcalsense.xml', 'Geometry/HGCalTBCommonData/data/TB181/Test/hgcProdCuts.xml', - 'Geometry/HGCalTBCommonData/data/TB181/Test/hgcalCons.xml' + 'Geometry/HGCalTBCommonData/data/TB181/Test/hgcalCons.xml', + 'Geometry/HcalSimData/data/CaloUtil/2026/v5c/CaloUtil.xml' + ), rootNodeName = cms.string('cms:OCMS') ) diff --git a/Geometry/HGCalTBCommonData/python/testTB181XML_cfi.py b/Geometry/HGCalTBCommonData/python/testTB181XML_cfi.py index c263a04af2fd8..6a4671cefe747 100644 --- a/Geometry/HGCalTBCommonData/python/testTB181XML_cfi.py +++ b/Geometry/HGCalTBCommonData/python/testTB181XML_cfi.py @@ -13,7 +13,9 @@ 'Geometry/HGCalTBCommonData/data/hgcalwafer/v7/hgcalwafer.xml', 'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalsense.xml', 'Geometry/HGCalTBCommonData/data/TB181/hgcProdCuts.xml', - 'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalCons.xml' + 'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalCons.xml', + 'Geometry/HcalSimData/data/CaloUtil/2026/v5c/CaloUtil.xml' + ), rootNodeName = cms.string('cms:OCMS') ) diff --git a/SimG4CMS/HGCalTestBeam/plugins/HGCPassive.cc b/SimG4CMS/HGCalTestBeam/plugins/HGCalTBPassive.cc similarity index 84% rename from SimG4CMS/HGCalTestBeam/plugins/HGCPassive.cc rename to SimG4CMS/HGCalTestBeam/plugins/HGCalTBPassive.cc index 496c52c29e1be..7018c5142ce58 100644 --- a/SimG4CMS/HGCalTestBeam/plugins/HGCPassive.cc +++ b/SimG4CMS/HGCalTestBeam/plugins/HGCalTBPassive.cc @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// File: HGCPassive.cc +// File: HGCalTBPassive.cc // copied from SimG4HGCalValidation // Description: Main analysis class for HGCal Validation of G4 Hits /////////////////////////////////////////////////////////////////////////////// @@ -33,15 +33,15 @@ //#define EDM_ML_DEBUG -class HGCPassive : public SimProducer, - public Observer, - public Observer, - public Observer { +class HGCalTBPassive : public SimProducer, + public Observer, + public Observer, + public Observer { public: - HGCPassive(const edm::ParameterSet &p); - HGCPassive(const HGCPassive &) = delete; // stop default - const HGCPassive &operator=(const HGCPassive &) = delete; - ~HGCPassive() override; + HGCalTBPassive(const edm::ParameterSet &p); + HGCalTBPassive(const HGCalTBPassive &) = delete; // stop default + const HGCalTBPassive &operator=(const HGCalTBPassive &) = delete; + ~HGCalTBPassive() override; void produce(edm::Event &, const edm::EventSetup &) override; @@ -75,8 +75,8 @@ class HGCPassive : public SimProducer, std::map, std::array> store_; }; -HGCPassive::HGCPassive(const edm::ParameterSet &p) - : m_Passive(p.getParameter("HGCPassive")), +HGCalTBPassive::HGCalTBPassive(const edm::ParameterSet &p) + : m_Passive(p.getParameter("HGCalTBPassive")), LVNames_(m_Passive.getParameter>("LVNames")), motherName_(m_Passive.getParameter("MotherName")), addlevel_((m_Passive.getParameter("IfDD4hep")) ? 1 : 0), @@ -97,9 +97,9 @@ HGCPassive::HGCPassive(const edm::ParameterSet &p) } } -HGCPassive::~HGCPassive() {} +HGCalTBPassive::~HGCalTBPassive() {} -void HGCPassive::produce(edm::Event &e, const edm::EventSetup &) { +void HGCalTBPassive::produce(edm::Event &e, const edm::EventSetup &) { for (unsigned int k = 0; k < LVNames_.size(); ++k) { std::unique_ptr hgcPH(new edm::PassiveHitContainer); endOfEvent(*hgcPH, k); @@ -107,7 +107,7 @@ void HGCPassive::produce(edm::Event &e, const edm::EventSetup &) { } } -void HGCPassive::update(const BeginOfRun *run) { +void HGCalTBPassive::update(const BeginOfRun *run) { topPV_ = getTopPV(); if (topPV_ == nullptr) { edm::LogWarning("HGCSim") << "Cannot find top level volume\n"; @@ -119,7 +119,7 @@ void HGCPassive::update(const BeginOfRun *run) { } #ifdef EDM_ML_DEBUG - edm::LogVerbatim("HGCSim") << "HGCPassive::Finds " << mapLV_.size() << " logical volumes"; + edm::LogVerbatim("HGCSim") << "HGCalTBPassive::Finds " << mapLV_.size() << " logical volumes"; unsigned int k(0); for (const auto &lvs : mapLV_) { edm::LogVerbatim("HGCSim") << "Entry[" << k << "] " << lvs.first << ": (" << (lvs.second).first << ", " @@ -131,9 +131,9 @@ void HGCPassive::update(const BeginOfRun *run) { } //=================================================================== per EVENT -void HGCPassive::update(const BeginOfEvent *evt) { +void HGCalTBPassive::update(const BeginOfEvent *evt) { int iev = (*evt)()->GetEventID(); - edm::LogVerbatim("HGCSim") << "HGCPassive: =====> Begin event = " << iev << std::endl; + edm::LogVerbatim("HGCSim") << "HGCalTBPassive: =====> Begin event = " << iev << std::endl; ++count_; store_.clear(); @@ -141,7 +141,7 @@ void HGCPassive::update(const BeginOfEvent *evt) { // //=================================================================== each // STEP -void HGCPassive::update(const G4Step *aStep) { +void HGCalTBPassive::update(const G4Step *aStep) { if (aStep != nullptr) { G4VSensitiveDetector *curSD = aStep->GetPreStepPoint()->GetSensitiveDetector(); const G4VTouchable *touchable = aStep->GetPreStepPoint()->GetTouchable(); @@ -211,7 +211,7 @@ void HGCPassive::update(const G4Step *aStep) { //================================================================ End of EVENT -void HGCPassive::endOfEvent(edm::PassiveHitContainer &hgcPH, unsigned int k) { +void HGCalTBPassive::endOfEvent(edm::PassiveHitContainer &hgcPH, unsigned int k) { #ifdef EDM_ML_DEBUG unsigned int kount(0); #endif @@ -224,7 +224,7 @@ void HGCPassive::endOfEvent(edm::PassiveHitContainer &hgcPH, unsigned int k) { (it->second).second, (element.first).second, (element.second)[1], (element.second)[2], (element.second)[0]); hgcPH.push_back(hit); #ifdef EDM_ML_DEBUG - edm::LogVerbatim("HGCSim") << "HGCPassive[" << k << "] Hit[" << kount << "] " << hit; + edm::LogVerbatim("HGCSim") << "HGCalTBPassive[" << k << "] Hit[" << kount << "] " << hit; ++kount; #endif } @@ -232,11 +232,11 @@ void HGCPassive::endOfEvent(edm::PassiveHitContainer &hgcPH, unsigned int k) { } } -G4VPhysicalVolume *HGCPassive::getTopPV() { +G4VPhysicalVolume *HGCalTBPassive::getTopPV() { return G4TransportationManager::GetTransportationManager()->GetNavigatorForTracking()->GetWorldVolume(); } -HGCPassive::volumeIterator HGCPassive::findLV(G4LogicalVolume *plv) { +HGCalTBPassive::volumeIterator HGCalTBPassive::findLV(G4LogicalVolume *plv) { auto itr = mapLV_.find(plv); if (itr == mapLV_.end()) { std::string name = DD4hep2DDDName::noNameSpace(static_cast(plv->GetName())); @@ -255,12 +255,12 @@ HGCPassive::volumeIterator HGCPassive::findLV(G4LogicalVolume *plv) { return itr; } -void HGCPassive::storeInfo(const HGCPassive::volumeIterator it, - G4LogicalVolume *plv, - unsigned int copy, - double time, - double energy, - bool flag) { +void HGCalTBPassive::storeInfo(const HGCalTBPassive::volumeIterator it, + G4LogicalVolume *plv, + unsigned int copy, + double time, + double energy, + bool flag) { std::pair key(plv, copy); auto itr = store_.find(key); double ee = (flag) ? energy : 0; @@ -272,7 +272,7 @@ void HGCPassive::storeInfo(const HGCPassive::volumeIterator it, } #ifdef EDM_ML_DEBUG itr = store_.find(key); - edm::LogVerbatim("HGCSim") << "HGCPassive: Element " << (it->second).first << ":" << (it->second).second << ":" + edm::LogVerbatim("HGCSim") << "HGCalTBPassive: Element " << (it->second).first << ":" << (it->second).second << ":" << copy << " T " << (itr->second)[0] << " E " << (itr->second)[1] << ":" << (itr->second)[2]; #endif @@ -281,4 +281,4 @@ void HGCPassive::storeInfo(const HGCPassive::volumeIterator it, #include "SimG4Core/Watcher/interface/SimWatcherFactory.h" #include "FWCore/PluginManager/interface/ModuleDef.h" -DEFINE_SIMWATCHER(HGCPassive); +DEFINE_SIMWATCHER(HGCalTBPassive); diff --git a/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN170_cfg.py b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN170_cfg.py index c652261011192..81c59bf291083 100644 --- a/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN170_cfg.py +++ b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN170_cfg.py @@ -97,12 +97,12 @@ process.g4SimHits.HGCSD.RejectMouseBite = True process.g4SimHits.HGCSD.RotatedWafer = True process.g4SimHits.Watchers = cms.VPSet(cms.PSet( - HGCPassive = cms.PSet( + HGCalTBPassive = cms.PSet( LVNames = cms.vstring('HGCalEE','HGCalHE','HGCalAH', 'HGCalBeam', 'CMSE'), MotherName = cms.string('OCMS'), IfDD4hep = cms.bool(False), ), - type = cms.string('HGCPassive'), + type = cms.string('HGCalTBPassive'), ) ) process.HGCalTBAnalyzer.doDigis = False diff --git a/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct1DD4hep_cfg.py b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct1DD4hep_cfg.py index 28b8def72f10d..09fdee4ce4c6a 100644 --- a/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct1DD4hep_cfg.py +++ b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct1DD4hep_cfg.py @@ -99,12 +99,12 @@ process.DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("SimG4CMS/HGCalTestBeam/data/dd4hep/HGCalTB181Oct1.xml") process.g4SimHits.Watchers = cms.VPSet(cms.PSet( - HGCPassive = cms.PSet( + HGCalTBPassive = cms.PSet( LVNames = cms.vstring('HGCalEE','HGCalHE','HGCalAH', 'HGCalBeam', 'CMSE'), MotherName = cms.string('OCMS'), IfDD4hep = cms.bool(True), ), - type = cms.string('HGCPassive'), + type = cms.string('HGCalTBPassive'), ) ) process.HGCalTBAnalyzer.doDigis = False diff --git a/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct1PC1mm_cfg.py b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct1PC1mm_cfg.py index e391a5a81ce43..e9be6bcb6bdf4 100644 --- a/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct1PC1mm_cfg.py +++ b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct1PC1mm_cfg.py @@ -97,12 +97,12 @@ process.g4SimHits.HGCSD.RejectMouseBite = True process.g4SimHits.HGCSD.RotatedWafer = True process.g4SimHits.Watchers = cms.VPSet(cms.PSet( - HGCPassive = cms.PSet( + HGCalTBPassive = cms.PSet( LVNames = cms.vstring('HGCalEE','HGCalHE','HGCalAH', 'HGCalBeam', 'CMSE'), MotherName = cms.string('OCMS'), IfDD4hep = cms.bool(False), ), - type = cms.string('HGCPassive'), + type = cms.string('HGCalTBPassive'), ) ) process.HGCalTBAnalyzer.doDigis = False diff --git a/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct1_cfg.py b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct1_cfg.py index 98085f42b4c17..cef1e6258c346 100644 --- a/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct1_cfg.py +++ b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct1_cfg.py @@ -13,6 +13,7 @@ process.load('Geometry.HGCalTBCommonData.hgcalTBNumberingInitialization_cfi') process.load('Geometry.HGCalTBCommonData.hgcalTBParametersInitialization_cfi') process.load('Geometry.HcalTestBeamData.hcalTB06Parameters_cff') +process.load('Geometry.HcalCommonData.caloSimulationParameters_cff') process.load('Geometry.CaloEventSetup.HGCalTBTopology_cfi') process.load('Geometry.HGCalGeometry.HGCalTBGeometryESProducer_cfi') process.load('Configuration.StandardSequences.MagneticField_0T_cff') @@ -101,12 +102,12 @@ process.g4SimHits.G4CheckOverlap.gdmlFlag = True process.g4SimHits.FileNameGDML = "TBHGCal181Oct.gdml" process.g4SimHits.Watchers = cms.VPSet(cms.PSet( - HGCPassive = cms.PSet( + HGCalTBPassive = cms.PSet( LVNames = cms.vstring('HGCalEE','HGCalHE','HGCalAH', 'HGCalBeam', 'CMSE'), MotherName = cms.string('OCMS'), IfDD4hep = cms.bool(False), ), - type = cms.string('HGCPassive'), + type = cms.string('HGCalTBPassive'), ) ) process.HGCalTBAnalyzer.doDigis = False diff --git a/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct1el100_cfg.py b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct1el100_cfg.py index bf1e4da3af7ad..51c57d46d22a7 100644 --- a/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct1el100_cfg.py +++ b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct1el100_cfg.py @@ -99,12 +99,12 @@ process.g4SimHits.HGCSD.RotatedWafer = True process.g4SimHits.Watchers = cms.VPSet(cms.PSet( - HGCPassive = cms.PSet( + HGCalTBPassive = cms.PSet( LVNames = cms.vstring('HGCalEE','HGCalHE','HGCalAH', 'HGCalBeam', 'CMSE'), MotherName = cms.string('OCMS'), IfDD4hep = cms.bool(False), ), - type = cms.string('HGCPassive'), + type = cms.string('HGCalTBPassive'), ) ) process.HGCalTBAnalyzer.doDigis = False diff --git a/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct2_cfg.py b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct2_cfg.py index 65725e0ea9c5b..34617bdd8b5fc 100644 --- a/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct2_cfg.py +++ b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct2_cfg.py @@ -96,12 +96,12 @@ process.g4SimHits.HGCSD.RejectMouseBite = True process.g4SimHits.HGCSD.RotatedWafer = True process.g4SimHits.Watchers = cms.VPSet(cms.PSet( - HGCPassive = cms.PSet( + HGCalTBPassive = cms.PSet( LVNames = cms.vstring('HGCalEE','HGCalHE','HGCalAH', 'HGCalBeam', 'CMSE'), MotherName = cms.string('OCMS'), IfDD4hep = cms.bool(False), ), - type = cms.string('HGCPassive'), + type = cms.string('HGCalTBPassive'), ) ) process.HGCalTBAnalyzer.doDigis = False diff --git a/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct3_cfg.py b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct3_cfg.py index 60b3dbe629b9a..8cb1cf20a1750 100644 --- a/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct3_cfg.py +++ b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct3_cfg.py @@ -96,12 +96,12 @@ process.g4SimHits.HGCSD.RejectMouseBite = True process.g4SimHits.HGCSD.RotatedWafer = True process.g4SimHits.Watchers = cms.VPSet(cms.PSet( - HGCPassive = cms.PSet( + HGCalTBPassive = cms.PSet( LVNames = cms.vstring('HGCalEE','HGCalHE','HGCalAH', 'HGCalBeam', 'CMSE'), MotherName = cms.string('OCMS'), IfDD4hep = cms.bool(False), ), - type = cms.string('HGCPassive'), + type = cms.string('HGCalTBPassive'), ) ) process.HGCalTBAnalyzer.doDigis = False diff --git a/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct4_cfg.py b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct4_cfg.py index 96954b33302b6..f4d2ae2672aaf 100644 --- a/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct4_cfg.py +++ b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct4_cfg.py @@ -96,12 +96,12 @@ process.g4SimHits.HGCSD.RejectMouseBite = True process.g4SimHits.HGCSD.RotatedWafer = True process.g4SimHits.Watchers = cms.VPSet(cms.PSet( - HGCPassive = cms.PSet( + HGCalTBPassive = cms.PSet( LVNames = cms.vstring('HGCalEE','HGCalHE','HGCalAH', 'HGCalBeam', 'CMSE'), MotherName = cms.string('OCMS'), IfDD4hep = cms.bool(False), ), - type = cms.string('HGCPassive'), + type = cms.string('HGCalTBPassive'), ) ) process.HGCalTBAnalyzer.doDigis = False From 78782ce4e0c14c2974bf2ff88fdc62bc9615ff2e Mon Sep 17 00:00:00 2001 From: Sunanda Date: Wed, 3 Jul 2024 08:54:14 +0200 Subject: [PATCH 2/2] Code check --- SimG4CMS/HGCalTestBeam/plugins/HGCalTBPassive.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/SimG4CMS/HGCalTestBeam/plugins/HGCalTBPassive.cc b/SimG4CMS/HGCalTestBeam/plugins/HGCalTBPassive.cc index 7018c5142ce58..89adbbc2b55a7 100644 --- a/SimG4CMS/HGCalTestBeam/plugins/HGCalTBPassive.cc +++ b/SimG4CMS/HGCalTestBeam/plugins/HGCalTBPassive.cc @@ -34,9 +34,9 @@ //#define EDM_ML_DEBUG class HGCalTBPassive : public SimProducer, - public Observer, - public Observer, - public Observer { + public Observer, + public Observer, + public Observer { public: HGCalTBPassive(const edm::ParameterSet &p); HGCalTBPassive(const HGCalTBPassive &) = delete; // stop default @@ -256,11 +256,11 @@ HGCalTBPassive::volumeIterator HGCalTBPassive::findLV(G4LogicalVolume *plv) { } void HGCalTBPassive::storeInfo(const HGCalTBPassive::volumeIterator it, - G4LogicalVolume *plv, - unsigned int copy, - double time, - double energy, - bool flag) { + G4LogicalVolume *plv, + unsigned int copy, + double time, + double energy, + bool flag) { std::pair key(plv, copy); auto itr = store_.find(key); double ee = (flag) ? energy : 0;