From 0d760c19ac918322f774f81b6c6b031e08e49888 Mon Sep 17 00:00:00 2001 From: Tamas Date: Tue, 24 Jan 2023 01:07:21 +0100 Subject: [PATCH 1/4] Add fillDescriptions to SiPixel digitizer --- .../MixingModule/plugins/MixingModule.cc | 3 ++ .../MixingModule/plugins/MixingModule.h | 3 ++ .../SiPixelChargeReweightingAlgorithm.h | 28 ++++++++--- .../plugins/Phase2TrackerDigitizer.cc | 21 +++++++-- .../plugins/Phase2TrackerDigitizer.h | 5 ++ .../Phase2TrackerDigitizerAlgorithm.cc | 47 +++++++++++++++++++ .../plugins/Phase2TrackerDigitizerAlgorithm.h | 1 + 7 files changed, 98 insertions(+), 10 deletions(-) diff --git a/SimGeneral/MixingModule/plugins/MixingModule.cc b/SimGeneral/MixingModule/plugins/MixingModule.cc index 2183d2c5c287d..980134786a60c 100644 --- a/SimGeneral/MixingModule/plugins/MixingModule.cc +++ b/SimGeneral/MixingModule/plugins/MixingModule.cc @@ -704,4 +704,7 @@ namespace edm { (*accItr)->finalizeEvent(event, setup); } } + void MixingModule::fillPSetDescription(edm::ParameterSetDescription& iDesc) { + iDesc.setAllowAnything(); + } } // namespace edm diff --git a/SimGeneral/MixingModule/plugins/MixingModule.h b/SimGeneral/MixingModule/plugins/MixingModule.h index 998f767a0bc9c..20c02e6692531 100644 --- a/SimGeneral/MixingModule/plugins/MixingModule.h +++ b/SimGeneral/MixingModule/plugins/MixingModule.h @@ -18,6 +18,7 @@ #include "FWCore/Framework/interface/Event.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" +#include "FWCore/ParameterSet/interface/ParameterSetDescription.h" #include "FWCore/Utilities/interface/InputTag.h" #include "SimDataFormats/CrossingFrame/interface/CrossingFrame.h" @@ -56,6 +57,8 @@ namespace edm { /**Default destructor*/ ~MixingModule() override; + static void fillPSetDescription(edm::ParameterSetDescription& iDesc); + virtual void beginJob() {} void beginRun(Run const& r1, EventSetup const& c) override; diff --git a/SimTracker/Common/interface/SiPixelChargeReweightingAlgorithm.h b/SimTracker/Common/interface/SiPixelChargeReweightingAlgorithm.h index 612107da76d9f..c8aed61aad7ba 100644 --- a/SimTracker/Common/interface/SiPixelChargeReweightingAlgorithm.h +++ b/SimTracker/Common/interface/SiPixelChargeReweightingAlgorithm.h @@ -26,7 +26,9 @@ #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" #include "FWCore/Framework/interface/ConsumesCollector.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" +#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" +#include "FWCore/ParameterSet/interface/ParameterSetDescription.h" #include "FWCore/ServiceRegistry/interface/Service.h" #include "FWCore/Utilities/interface/Exception.h" #include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" @@ -52,6 +54,7 @@ class SiPixelChargeReweightingAlgorithm { public: SiPixelChargeReweightingAlgorithm(const edm::ParameterSet& conf, edm::ConsumesCollector iC); ~SiPixelChargeReweightingAlgorithm(); + static void fillPSetDescription(edm::ParameterSetDescription& desc); // initialization that cannot be done in the constructor void init(const edm::EventSetup& es); @@ -136,14 +139,12 @@ inline SiPixelChargeReweightingAlgorithm::SiPixelChargeReweightingAlgorithm(cons templ2D(templateStores_), xdouble(TXSIZE), ydouble(TYSIZE), - IDnum(conf.exists("TemplateIDnumerator") ? conf.getParameter("TemplateIDnumerator") : 0), - IDden(conf.exists("TemplateIDdenominator") ? conf.getParameter("TemplateIDdenominator") : 0), - + IDnum(conf.getParameter("TemplateIDnumerator")), + IDden(conf.getParameter("TemplateIDdenominator")), UseReweighting(conf.getParameter("UseReweighting")), - applyLateReweighting_(conf.exists("applyLateReweighting") ? conf.getParameter("applyLateReweighting") - : false), - PrintClusters(conf.exists("PrintClusters") ? conf.getParameter("PrintClusters") : false), - PrintTemplates(conf.exists("PrintTemplates") ? conf.getParameter("PrintTemplates") : false) { + applyLateReweighting_(conf.getParameter("ApplyLateReweighting")), + PrintClusters(conf.getParameter("PrintClusters")), + PrintTemplates(conf.getParameter("PrintTemplates")) { if (UseReweighting || applyLateReweighting_) { SiPixel2DTemp_den_token_ = iC.esConsumes(edm::ESInputTag("", "denominator")); SiPixel2DTemp_num_token_ = iC.esConsumes(edm::ESInputTag("", "numerator")); @@ -485,6 +486,7 @@ inline int SiPixelChargeReweightingAlgorithm::PixelTempRewgt2D(int id_in, int id } } } + LogDebug("SiPixelChargeReweightingAlgorithm") << "Total cluster charge in the initial cluster: " << qclust; // Next, interpolate the physical output template needed to reweight @@ -603,6 +605,8 @@ inline int SiPixelChargeReweightingAlgorithm::PixelTempRewgt2D(int id_in, int id } } + LogDebug("SiPixelChargeReweightingAlgorithm") << "Total cluster charge in the final cluster: " << qclust; + return success; } // PixelTempRewgt2D @@ -849,4 +853,14 @@ bool SiPixelChargeReweightingAlgorithm::lateSignalReweight(const PixelGeomDetUni return true; } +inline void SiPixelChargeReweightingAlgorithm::fillPSetDescription(edm::ParameterSetDescription& desc) { + desc.setComment("Charge reweighting algo to simulate irradiation damage in SiPixel detectors"); + desc.add("TemplateIDnumerator", 0); + desc.add("TemplateIDdenominator", 0); + desc.add("UseReweighting", false); + desc.add("ApplyLateReweighting", false); + desc.add("PrintClusters", false); + desc.add("PrintTemplates", false); +} + #endif diff --git a/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizer.cc b/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizer.cc index 63dd0e3dc0712..9c1352a87091b 100644 --- a/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizer.cc +++ b/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizer.cc @@ -76,7 +76,7 @@ namespace cms { if (makeDigiSimLinks_) producesCollector.produces >("Pixel").setBranchAlias(alias1); - if (!iConfig.getParameter("isOTreadoutAnalog")) { + if (!isOuterTrackerReadoutAnalog_) { const std::string alias2("simSiTrackerDigis"); if (premixStage1_) { // Premixing exploits the ADC field of PixelDigi to store the collected charge @@ -115,8 +115,8 @@ namespace cms { // access to magnetic field in global coordinates GlobalVector bfield = pSetup_->inTesla(phase2det->surface().position()); - LogDebug("PixelDigitizer") << "B-field(T) at " << phase2det->surface().position() - << " (cm): " << pSetup_->inTesla(phase2det->surface().position()); + LogDebug("Phase2TrackerDigitizer") << "B-field(T) at " << phase2det->surface().position() + << " (cm): " << pSetup_->inTesla(phase2det->surface().position()); auto kiter = algomap_.find(getAlgoType(detId_raw)); if (kiter != algomap_.end()) @@ -317,7 +317,21 @@ namespace cms { if (makeDigiSimLinks_) iEvent.put(std::move(outputlink), "Pixel"); } + void Phase2TrackerDigitizer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + edm::ParameterSetDescription desc; + desc.add("hitsProducer", "g4SimHits"); + desc.add("ROUList", + std::vector{"TrackerHitsPixelBarrelLowTof", + "TrackerHitsPixelBarrelHighTof", + "TrackerHitsPixelEndcapLowTof", + "TrackerHitsPixelEndcapHighTof"}); + desc.add("GeometryType", "idealForDigi"); + desc.add("isOTreadoutAnalog", false); + desc.add("premixStage1", false); + descriptions.addWithDefaultLabel(desc); + } } // namespace cms + namespace { void addToCollector(edm::DetSet& collector, const int channel, const digitizerUtility::DigiSimInfo& info) { // For premixing stage1 the channel must be decoded with PixelDigi @@ -334,6 +348,7 @@ namespace { collector.data.emplace_back(ip.first, ip.second, info.ot_bit); } } // namespace + namespace cms { template void Phase2TrackerDigitizer::addOuterTrackerCollection(edm::Event& iEvent, const edm::EventSetup& iSetup) { diff --git a/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizer.h b/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizer.h index 7a8889959700a..0b5abb5e74a84 100644 --- a/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizer.h +++ b/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizer.h @@ -18,6 +18,9 @@ #include "FWCore/Framework/interface/ESWatcher.h" #include "FWCore/Framework/interface/ProducesCollector.h" +#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" +#include "FWCore/ParameterSet/interface/ParameterSet.h" +#include "FWCore/ParameterSet/interface/ParameterSetDescription.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/Records/interface/TrackerTopologyRcd.h" @@ -57,6 +60,8 @@ namespace cms { edm::ConsumesCollector& iC); ~Phase2TrackerDigitizer() override; + void fillDescriptions(edm::ConfigurationDescriptions& descriptions); + void initializeEvent(edm::Event const& e, edm::EventSetup const& c) override; void accumulate(edm::Event const& e, edm::EventSetup const& c) override; void accumulate(PileUpEventPrincipal const& e, edm::EventSetup const& c, edm::StreamID const&) override; diff --git a/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizerAlgorithm.cc b/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizerAlgorithm.cc index 14ce0b25a2a37..effba41488961 100644 --- a/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizerAlgorithm.cc +++ b/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizerAlgorithm.cc @@ -1025,3 +1025,50 @@ float Phase2TrackerDigitizerAlgorithm::calcQ(float x) { auto xx = std::min(0.5f * x * x, p1); return 0.5f * (1.f - std::copysign(std::sqrt(1.f - unsafe_expf<4>(-xx * (1.f + p2 / (1.f + p3 * xx)))), x)); } + +void Phase2TrackerDigitizerAlgorithm::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + edm::ParameterSetDescription desc; + SiPixelChargeReweightingAlgorithm::fillPSetDescription(desc); + desc.addUntracked("makeDigiSimLinks", true); + desc.add("InefficiencyDB", false); + desc.add("KillModules", false); + desc.add("DeadModules_DB", false); + desc.add("LorentzAngle_DB", false); + edm::ParameterSetDescription desc_deadModules; + desc.addVPSet("DeadModules", desc_deadModules, {}); + desc.add("Alpha2Order", false); + desc.add("AddXTalk", false); + desc.add("InterstripCoupling", 0.0); + desc.add("SigmaZero", 0.00037); + desc.add("SigmaCoeff", 0.0); + desc.add("ClusterWidth", 3); + desc.add("Phase2ReadoutMode", 3); + desc.add("ElectronPerAdc", 135); + desc.add("AdcFullScale", 255); + desc.add("NoiseInElectrons", 0.0); + desc.add("ReadoutNoiseInElec", -99.9); + desc.add("ThresholdInElectrons_Endcap", 1000.0); + desc.add("ThresholdInElectrons_Barrel", 1000.0); + desc.add("ThresholdSmearing_Endcap", 0.0); + desc.add("ThresholdSmearing_Barrel", 0.0); + desc.add("HIPThresholdInElectrons_Endcap", 1.0e10); + desc.add("HIPThresholdInElectrons_Barrel", 1.0e10); + desc.add("TofLowerCut", 12.5); + desc.add("TofUpperCut", -12.5); + desc.add("TanLorentzAnglePerTesla_Endcap", 0.0); + desc.add("TanLorentzAnglePerTesla_Barrel", 0.0); + desc.add("AddNoise", false); + desc.add("AddNoisyPixels", false); + desc.addUntracked("FluctuateCharge", true); + desc.add("AddInefficiency", false); + desc.add("AddThresholdSmearing", false); + desc.add("PseudoRadDamage", 0.0); + desc.add("PseudoRadDamageRadius", 0.0); + desc.add("DeltaProductionCut", 0.03); + edm::ParameterSetDescription desc_cellsToKill; + desc.addVPSet("CellsToKill", desc_cellsToKill, {}); + desc.add >("EfficiencyFactors_Barrel", {}); + desc.add >("EfficiencyFactors_Endcap", {}); + desc.add("UseReweighting", false); + descriptions.addWithDefaultLabel(desc); +} diff --git a/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizerAlgorithm.h b/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizerAlgorithm.h index 343e6dc261848..d1e6985c97d76 100644 --- a/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizerAlgorithm.h +++ b/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizerAlgorithm.h @@ -59,6 +59,7 @@ class Phase2TrackerDigitizerAlgorithm { const edm::ParameterSet& conf_specific, edm::ConsumesCollector iC); virtual ~Phase2TrackerDigitizerAlgorithm(); + virtual void fillDescriptions(edm::ConfigurationDescriptions& descriptions); // initialization that cannot be done in the constructor virtual void init(const edm::EventSetup& es) = 0; From 52f65e40fdf954a23d14740e9ff0c819ec0a5d70 Mon Sep 17 00:00:00 2001 From: Tamas Date: Fri, 3 Feb 2023 20:31:43 +0100 Subject: [PATCH 2/4] Code checks --- SimGeneral/MixingModule/plugins/MixingModule.cc | 4 +--- .../Common/interface/SiPixelChargeReweightingAlgorithm.h | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/SimGeneral/MixingModule/plugins/MixingModule.cc b/SimGeneral/MixingModule/plugins/MixingModule.cc index 980134786a60c..36cc7ba25ff23 100644 --- a/SimGeneral/MixingModule/plugins/MixingModule.cc +++ b/SimGeneral/MixingModule/plugins/MixingModule.cc @@ -704,7 +704,5 @@ namespace edm { (*accItr)->finalizeEvent(event, setup); } } - void MixingModule::fillPSetDescription(edm::ParameterSetDescription& iDesc) { - iDesc.setAllowAnything(); - } + void MixingModule::fillPSetDescription(edm::ParameterSetDescription& iDesc) { iDesc.setAllowAnything(); } } // namespace edm diff --git a/SimTracker/Common/interface/SiPixelChargeReweightingAlgorithm.h b/SimTracker/Common/interface/SiPixelChargeReweightingAlgorithm.h index c8aed61aad7ba..12d6ce8e87ae5 100644 --- a/SimTracker/Common/interface/SiPixelChargeReweightingAlgorithm.h +++ b/SimTracker/Common/interface/SiPixelChargeReweightingAlgorithm.h @@ -853,7 +853,7 @@ bool SiPixelChargeReweightingAlgorithm::lateSignalReweight(const PixelGeomDetUni return true; } -inline void SiPixelChargeReweightingAlgorithm::fillPSetDescription(edm::ParameterSetDescription& desc) { +inline inline void SiPixelChargeReweightingAlgorithm::fillPSetDescription(edm::ParameterSetDescription& desc) { desc.setComment("Charge reweighting algo to simulate irradiation damage in SiPixel detectors"); desc.add("TemplateIDnumerator", 0); desc.add("TemplateIDdenominator", 0); From 5c1cad0ddac84c06074bb09e8643e95a7cd23865 Mon Sep 17 00:00:00 2001 From: Tamas Date: Fri, 3 Feb 2023 21:39:17 +0100 Subject: [PATCH 3/4] After Matti comments --- SimGeneral/MixingModule/plugins/MixingModule.cc | 6 +++++- SimGeneral/MixingModule/plugins/MixingModule.h | 4 ++-- .../interface/SiPixelChargeReweightingAlgorithm.h | 2 +- .../plugins/Phase2TrackerDigitizer.cc | 14 ++++++-------- .../plugins/Phase2TrackerDigitizer.h | 3 +-- .../plugins/Phase2TrackerDigitizerAlgorithm.cc | 4 +--- .../plugins/Phase2TrackerDigitizerAlgorithm.h | 3 ++- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/SimGeneral/MixingModule/plugins/MixingModule.cc b/SimGeneral/MixingModule/plugins/MixingModule.cc index 36cc7ba25ff23..b6d49c96a828d 100644 --- a/SimGeneral/MixingModule/plugins/MixingModule.cc +++ b/SimGeneral/MixingModule/plugins/MixingModule.cc @@ -704,5 +704,9 @@ namespace edm { (*accItr)->finalizeEvent(event, setup); } } - void MixingModule::fillPSetDescription(edm::ParameterSetDescription& iDesc) { iDesc.setAllowAnything(); } + void MixingModule::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { +edm::ParameterSetDescription desc; +desc.setAllowAnything(); +descriptions.addDefault( desc); + } } // namespace edm diff --git a/SimGeneral/MixingModule/plugins/MixingModule.h b/SimGeneral/MixingModule/plugins/MixingModule.h index 20c02e6692531..7f0a654d5134b 100644 --- a/SimGeneral/MixingModule/plugins/MixingModule.h +++ b/SimGeneral/MixingModule/plugins/MixingModule.h @@ -18,7 +18,7 @@ #include "FWCore/Framework/interface/Event.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "FWCore/ParameterSet/interface/ParameterSetDescription.h" +#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "FWCore/Utilities/interface/InputTag.h" #include "SimDataFormats/CrossingFrame/interface/CrossingFrame.h" @@ -57,7 +57,7 @@ namespace edm { /**Default destructor*/ ~MixingModule() override; - static void fillPSetDescription(edm::ParameterSetDescription& iDesc); + static void fillDescriptions(edm::ConfigurationDescriptions& iDesc); virtual void beginJob() {} diff --git a/SimTracker/Common/interface/SiPixelChargeReweightingAlgorithm.h b/SimTracker/Common/interface/SiPixelChargeReweightingAlgorithm.h index 12d6ce8e87ae5..c8aed61aad7ba 100644 --- a/SimTracker/Common/interface/SiPixelChargeReweightingAlgorithm.h +++ b/SimTracker/Common/interface/SiPixelChargeReweightingAlgorithm.h @@ -853,7 +853,7 @@ bool SiPixelChargeReweightingAlgorithm::lateSignalReweight(const PixelGeomDetUni return true; } -inline inline void SiPixelChargeReweightingAlgorithm::fillPSetDescription(edm::ParameterSetDescription& desc) { +inline void SiPixelChargeReweightingAlgorithm::fillPSetDescription(edm::ParameterSetDescription& desc) { desc.setComment("Charge reweighting algo to simulate irradiation damage in SiPixel detectors"); desc.add("TemplateIDnumerator", 0); desc.add("TemplateIDdenominator", 0); diff --git a/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizer.cc b/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizer.cc index 9c1352a87091b..7e5f77a08c079 100644 --- a/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizer.cc +++ b/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizer.cc @@ -317,18 +317,16 @@ namespace cms { if (makeDigiSimLinks_) iEvent.put(std::move(outputlink), "Pixel"); } - void Phase2TrackerDigitizer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { - edm::ParameterSetDescription desc; - desc.add("hitsProducer", "g4SimHits"); - desc.add("ROUList", + void Phase2TrackerDigitizer::fillPSetDescription(edm::ParameterSetDescription& descriptions) { + descriptions.add("hitsProducer", "g4SimHits"); + descriptions.add("ROUList", std::vector{"TrackerHitsPixelBarrelLowTof", "TrackerHitsPixelBarrelHighTof", "TrackerHitsPixelEndcapLowTof", "TrackerHitsPixelEndcapHighTof"}); - desc.add("GeometryType", "idealForDigi"); - desc.add("isOTreadoutAnalog", false); - desc.add("premixStage1", false); - descriptions.addWithDefaultLabel(desc); + descriptions.add("GeometryType", "idealForDigi"); + descriptions.add("isOTreadoutAnalog", false); + descriptions.add("premixStage1", false); } } // namespace cms diff --git a/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizer.h b/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizer.h index 0b5abb5e74a84..d4cbac5004361 100644 --- a/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizer.h +++ b/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizer.h @@ -60,8 +60,7 @@ namespace cms { edm::ConsumesCollector& iC); ~Phase2TrackerDigitizer() override; - void fillDescriptions(edm::ConfigurationDescriptions& descriptions); - + static void fillPSetDescription(edm::ParameterSetDescription& descriptions); void initializeEvent(edm::Event const& e, edm::EventSetup const& c) override; void accumulate(edm::Event const& e, edm::EventSetup const& c) override; void accumulate(PileUpEventPrincipal const& e, edm::EventSetup const& c, edm::StreamID const&) override; diff --git a/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizerAlgorithm.cc b/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizerAlgorithm.cc index effba41488961..bb63ac4fc14f1 100644 --- a/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizerAlgorithm.cc +++ b/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizerAlgorithm.cc @@ -1026,8 +1026,7 @@ float Phase2TrackerDigitizerAlgorithm::calcQ(float x) { return 0.5f * (1.f - std::copysign(std::sqrt(1.f - unsafe_expf<4>(-xx * (1.f + p2 / (1.f + p3 * xx)))), x)); } -void Phase2TrackerDigitizerAlgorithm::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { - edm::ParameterSetDescription desc; +void Phase2TrackerDigitizerAlgorithm::fillPSetDescription(edm::ParameterSetDescription& desc) { SiPixelChargeReweightingAlgorithm::fillPSetDescription(desc); desc.addUntracked("makeDigiSimLinks", true); desc.add("InefficiencyDB", false); @@ -1070,5 +1069,4 @@ void Phase2TrackerDigitizerAlgorithm::fillDescriptions(edm::ConfigurationDescrip desc.add >("EfficiencyFactors_Barrel", {}); desc.add >("EfficiencyFactors_Endcap", {}); desc.add("UseReweighting", false); - descriptions.addWithDefaultLabel(desc); } diff --git a/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizerAlgorithm.h b/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizerAlgorithm.h index d1e6985c97d76..dd90dc1f91f2b 100644 --- a/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizerAlgorithm.h +++ b/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizerAlgorithm.h @@ -59,7 +59,8 @@ class Phase2TrackerDigitizerAlgorithm { const edm::ParameterSet& conf_specific, edm::ConsumesCollector iC); virtual ~Phase2TrackerDigitizerAlgorithm(); - virtual void fillDescriptions(edm::ConfigurationDescriptions& descriptions); + + static void fillPSetDescription(edm::ParameterSetDescription& descriptions); // initialization that cannot be done in the constructor virtual void init(const edm::EventSetup& es) = 0; From ee676feeed667e172b86d3a87db4bc9ecafdd4ab Mon Sep 17 00:00:00 2001 From: Tamas Date: Fri, 3 Feb 2023 21:45:05 +0100 Subject: [PATCH 4/4] Code checks again --- SimGeneral/MixingModule/plugins/MixingModule.cc | 10 +++++----- .../plugins/Phase2TrackerDigitizer.cc | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/SimGeneral/MixingModule/plugins/MixingModule.cc b/SimGeneral/MixingModule/plugins/MixingModule.cc index b6d49c96a828d..c47e28d21d8fc 100644 --- a/SimGeneral/MixingModule/plugins/MixingModule.cc +++ b/SimGeneral/MixingModule/plugins/MixingModule.cc @@ -704,9 +704,9 @@ namespace edm { (*accItr)->finalizeEvent(event, setup); } } - void MixingModule::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { -edm::ParameterSetDescription desc; -desc.setAllowAnything(); -descriptions.addDefault( desc); - } + void MixingModule::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + edm::ParameterSetDescription desc; + desc.setAllowAnything(); + descriptions.addDefault(desc); + } } // namespace edm diff --git a/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizer.cc b/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizer.cc index 7e5f77a08c079..61424effd5e2b 100644 --- a/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizer.cc +++ b/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizer.cc @@ -320,10 +320,10 @@ namespace cms { void Phase2TrackerDigitizer::fillPSetDescription(edm::ParameterSetDescription& descriptions) { descriptions.add("hitsProducer", "g4SimHits"); descriptions.add("ROUList", - std::vector{"TrackerHitsPixelBarrelLowTof", - "TrackerHitsPixelBarrelHighTof", - "TrackerHitsPixelEndcapLowTof", - "TrackerHitsPixelEndcapHighTof"}); + std::vector{"TrackerHitsPixelBarrelLowTof", + "TrackerHitsPixelBarrelHighTof", + "TrackerHitsPixelEndcapLowTof", + "TrackerHitsPixelEndcapHighTof"}); descriptions.add("GeometryType", "idealForDigi"); descriptions.add("isOTreadoutAnalog", false); descriptions.add("premixStage1", false);