Skip to content

add fillDescriptions to several plugins used at HLT (6/N) #48858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cmsbuild merged 2 commits into from
Sep 8, 2025
Merged

add fillDescriptions to several plugins used at HLT (6/N) #48858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44add51
add few fillDescription methods to modules used at HLT
mmusich Sep 5, 2025
3b1e2f7
provide an actual fillDescriptions for HBHEPhase1Reconstructor
mmusich Sep 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
110 changes: 90 additions & 20 deletions CalibCalorimetry/HcalPlugins/src/HcalTimeSlewEP.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,27 +47,97 @@ void HcalTimeSlewEP::setIntervalFor(const edm::eventsetup::EventSetupRecordKey&
}

void HcalTimeSlewEP::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
// HcalTimeSlewEP
edm::ParameterSetDescription desc;

edm::ParameterSetDescription desc_M2;
desc_M2.add<double>("tzero");
desc_M2.add<double>("slope");
desc_M2.add<double>("tmax");
std::vector<edm::ParameterSet> default_M2(1);
desc.addVPSet("timeSlewParametersM2", desc_M2, default_M2);

edm::ParameterSetDescription desc_M3;
desc_M3.add<double>("cap");
desc_M3.add<double>("tspar0");
desc_M3.add<double>("tspar1");
desc_M3.add<double>("tspar2");
desc_M3.add<double>("tspar0_siPM");
desc_M3.add<double>("tspar1_siPM");
desc_M3.add<double>("tspar2_siPM");
std::vector<edm::ParameterSet> default_M3(1);
desc.addVPSet("timeSlewParametersM3", desc_M3, default_M3);

descriptions.addDefault(desc);
desc.add<std::string>("appendToDataLabel", "HBHE");
{
edm::ParameterSetDescription vpsd1;
vpsd1.add<double>("tzero", 23.960177);
vpsd1.add<double>("slope", -3.178648);
vpsd1.add<double>("tmax", 16.0);
std::vector<edm::ParameterSet> temp1;
temp1.reserve(3);
{
edm::ParameterSet temp2;
temp2.addParameter<double>("tzero", 23.960177);
temp2.addParameter<double>("slope", -3.178648);
temp2.addParameter<double>("tmax", 16.0);
temp1.push_back(temp2);
}
{
edm::ParameterSet temp2;
temp2.addParameter<double>("tzero", 11.977461);
temp2.addParameter<double>("slope", -1.5610227);
temp2.addParameter<double>("tmax", 10.0);
temp1.push_back(temp2);
}
{
edm::ParameterSet temp2;
temp2.addParameter<double>("tzero", 9.109694);
temp2.addParameter<double>("slope", -1.075824);
temp2.addParameter<double>("tmax", 6.25);
temp1.push_back(temp2);
}
desc.addVPSet("timeSlewParametersM2", vpsd1, temp1);
}
{
edm::ParameterSetDescription vpsd1;
vpsd1.add<double>("cap", 6.0);
vpsd1.add<double>("tspar0", 12.2999);
vpsd1.add<double>("tspar1", -2.19142);
vpsd1.add<double>("tspar2", 0.0);
vpsd1.add<double>("tspar0_siPM", 0.0);
vpsd1.add<double>("tspar1_siPM", 0.0);
vpsd1.add<double>("tspar2_siPM", 0.0);
std::vector<edm::ParameterSet> temp1;
temp1.reserve(4);
{
edm::ParameterSet temp2;
temp2.addParameter<double>("cap", 6.0);
temp2.addParameter<double>("tspar0", 12.2999);
temp2.addParameter<double>("tspar1", -2.19142);
temp2.addParameter<double>("tspar2", 0.0);
temp2.addParameter<double>("tspar0_siPM", 0.0);
temp2.addParameter<double>("tspar1_siPM", 0.0);
temp2.addParameter<double>("tspar2_siPM", 0.0);
temp1.push_back(temp2);
}
{
edm::ParameterSet temp2;
temp2.addParameter<double>("cap", 6.0);
temp2.addParameter<double>("tspar0", 15.5);
temp2.addParameter<double>("tspar1", -3.2);
temp2.addParameter<double>("tspar2", 32.0);
temp2.addParameter<double>("tspar0_siPM", 0.0);
temp2.addParameter<double>("tspar1_siPM", 0.0);
temp2.addParameter<double>("tspar2_siPM", 0.0);
temp1.push_back(temp2);
}
{
edm::ParameterSet temp2;
temp2.addParameter<double>("cap", 6.0);
temp2.addParameter<double>("tspar0", 12.2999);
temp2.addParameter<double>("tspar1", -2.19142);
temp2.addParameter<double>("tspar2", 0.0);
temp2.addParameter<double>("tspar0_siPM", 0.0);
temp2.addParameter<double>("tspar1_siPM", 0.0);
temp2.addParameter<double>("tspar2_siPM", 0.0);
temp1.push_back(temp2);
}
{
edm::ParameterSet temp2;
temp2.addParameter<double>("cap", 6.0);
temp2.addParameter<double>("tspar0", 12.2999);
temp2.addParameter<double>("tspar1", -2.19142);
temp2.addParameter<double>("tspar2", 0.0);
temp2.addParameter<double>("tspar0_siPM", 0.0);
temp2.addParameter<double>("tspar1_siPM", 0.0);
temp2.addParameter<double>("tspar2_siPM", 0.0);
temp1.push_back(temp2);
}
desc.addVPSet("timeSlewParametersM3", vpsd1, temp1);
}
descriptions.addWithDefaultLabel(desc);
}

// ------------ method called to produce the data ------------
Expand Down
16 changes: 11 additions & 5 deletions CalibTracker/SiPixelESProducers/plugins/SiPixelTemplateDBObjectESProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,24 @@

#include <memory>

#include "CalibTracker/Records/interface/SiPixelTemplateDBObjectESProducerRcd.h"
#include "CondFormats/SiPixelObjects/interface/SiPixelTemplateDBObject.h"
#include "FWCore/Framework/interface/ESProducer.h"
#include "FWCore/Framework/interface/ModuleFactory.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
#include "FWCore/Utilities/interface/ESProductTag.h"
#include "FWCore/Utilities/interface/do_nothing_deleter.h"

#include "FWCore/Framework/interface/ModuleFactory.h"
#include "MagneticField/Engine/interface/MagneticField.h"

#include "CondFormats/SiPixelObjects/interface/SiPixelTemplateDBObject.h"
#include "CalibTracker/Records/interface/SiPixelTemplateDBObjectESProducerRcd.h"

using namespace edm;

class SiPixelTemplateDBObjectESProducer : public edm::ESProducer {
public:
SiPixelTemplateDBObjectESProducer(const edm::ParameterSet& iConfig);
std::shared_ptr<const SiPixelTemplateDBObject> produce(const SiPixelTemplateDBObjectESProducerRcd&);
static void fillDescriptions(ConfigurationDescriptions& descriptions);

private:
edm::ESGetToken<MagneticField, IdealMagneticFieldRecord> magfieldToken_;
Expand Down Expand Up @@ -73,4 +74,9 @@ std::shared_ptr<const SiPixelTemplateDBObject> SiPixelTemplateDBObjectESProducer
return std::shared_ptr<const SiPixelTemplateDBObject>(&dbobject, edm::do_nothing_deleter());
}

void SiPixelTemplateDBObjectESProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
edm::ParameterSetDescription desc;
descriptions.addWithDefaultLabel(desc);
}

DEFINE_FWK_EVENTSETUP_MODULE(SiPixelTemplateDBObjectESProducer);
7 changes: 7 additions & 0 deletions Geometry/CaloEventSetup/plugins/CaloTopologyBuilder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
#include "Geometry/CaloTopology/interface/EcalEndcapTopology.h"
#include "Geometry/CaloTopology/interface/EcalPreshowerTopology.h"
#include "DataFormats/EcalDetId/interface/EcalSubdetector.h"
#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"

CaloTopologyBuilder::CaloTopologyBuilder(const edm::ParameterSet& /*iConfig*/)
: geometryToken_{setWhatProduced(this, &CaloTopologyBuilder::produceCalo)
Expand All @@ -26,3 +28,8 @@ CaloTopologyBuilder::ReturnType CaloTopologyBuilder::produceCalo(const CaloTopol
ct->setSubdetTopology(DetId::Ecal, EcalPreshower, std::make_unique<EcalPreshowerTopology>());
return ct;
}

void CaloTopologyBuilder::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
edm::ParameterSetDescription desc;
descriptions.addWithDefaultLabel(desc);
}
2 changes: 2 additions & 0 deletions Geometry/CaloEventSetup/plugins/CaloTopologyBuilder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ class CaloTopologyBuilder : public edm::ESProducer {

ReturnType produceCalo(const CaloTopologyRecord&);

static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);

private:
// ----------member data ---------------------------
edm::ESGetToken<CaloGeometry, CaloGeometryRecord> geometryToken_;
Expand Down
2 changes: 1 addition & 1 deletion RecoLocalCalo/CaloTowersCreator/src/CaloTowersCreator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,5 +488,5 @@ void CaloTowersCreator::fillDescriptions(edm::ConfigurationDescriptions& descrip
desc.add<int>("HcalPhase", 0);
desc.add<bool>("usePFThresholdsFromDB", true);
desc.add<bool>("EcalRecHitThresh", false);
descriptions.addDefault(desc);
descriptions.addWithDefaultLabel(desc);
}
13 changes: 13 additions & 0 deletions RecoLocalCalo/EcalRecProducers/plugins/ESRecHitProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/stream/EDProducer.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 "RecoLocalCalo/EcalRecProducers/interface/ESRecHitWorkerFactory.h"

#include "ESRecHitWorker.h"
Expand All @@ -18,6 +20,8 @@ class ESRecHitProducer : public edm::stream::EDProducer<> {
explicit ESRecHitProducer(const edm::ParameterSet& ps);
void produce(edm::Event& e, const edm::EventSetup& es) override;

static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);

private:
const edm::EDGetTokenT<ESDigiCollection> digiToken_;
const std::string rechitCollection_; // secondary name to be given to collection of hits
Expand Down Expand Up @@ -57,5 +61,14 @@ void ESRecHitProducer::produce(edm::Event& e, const edm::EventSetup& es) {
e.put(std::move(rec), rechitCollection_);
}

void ESRecHitProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
edm::ParameterSetDescription desc;
desc.add<std::string>("ESrechitCollection", "EcalRecHitsES");
desc.add<edm::InputTag>("ESdigiCollection", edm::InputTag("ecalPreshowerDigis"));
desc.add<std::string>("algo", "ESRecHitWorker");
desc.add<int>("ESRecoAlgo", 0);
descriptions.addWithDefaultLabel(desc);
}

#include "FWCore/Framework/interface/MakerMacros.h"
DEFINE_FWK_MODULE(ESRecHitProducer);
35 changes: 18 additions & 17 deletions RecoLocalCalo/HcalRecAlgos/plugins/HcalChannelPropertiesEP.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,25 @@
#include "FWCore/Framework/interface/ESProducer.h"
#include "FWCore/Utilities/interface/ESGetToken.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"

#include "CalibFormats/HcalObjects/interface/HcalDbService.h"
#include "CalibFormats/HcalObjects/interface/HcalDbRecord.h"

#include "DataFormats/HcalDetId/interface/HcalGenericDetId.h"
#include "DataFormats/HcalDetId/interface/HcalSubdetector.h"

#include "CondFormats/HcalObjects/interface/HcalRecoParams.h"
#include "CalibFormats/HcalObjects/interface/HcalDbService.h"
#include "CondFormats/DataRecord/interface/HcalPFCutsRcd.h"
#include "CondFormats/DataRecord/interface/HcalRecoParamsRcd.h"

#include "CondFormats/HcalObjects/interface/HcalPFCuts.h"
#include "CondFormats/DataRecord/interface/HcalPFCutsRcd.h"

#include "CondFormats/HcalObjects/interface/HcalRecoParams.h"
#include "DataFormats/HcalDetId/interface/HcalGenericDetId.h"
#include "DataFormats/HcalDetId/interface/HcalSubdetector.h"
#include "FWCore/Framework/interface/ESProducer.h"
#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
#include "FWCore/Utilities/interface/ESGetToken.h"
#include "Geometry/CaloGeometry/interface/CaloGeometry.h"
#include "Geometry/Records/interface/CaloGeometryRecord.h"
#include "Geometry/CaloTopology/interface/HcalTopology.h"
#include "Geometry/HcalTowerAlgo/interface/HcalGeometry.h"

#include "RecoLocalCalo/HcalRecAlgos/interface/HcalSeverityLevelComputer.h"
#include "RecoLocalCalo/HcalRecAlgos/interface/HcalSeverityLevelComputerRcd.h"
#include "Geometry/Records/interface/CaloGeometryRecord.h"
#include "RecoLocalCalo/HcalRecAlgos/interface/HcalChannelProperties.h"
#include "RecoLocalCalo/HcalRecAlgos/interface/HcalChannelPropertiesAuxRecord.h"
#include "RecoLocalCalo/HcalRecAlgos/interface/HcalChannelPropertiesRecord.h"
#include "RecoLocalCalo/HcalRecAlgos/interface/HcalSeverityLevelComputer.h"
#include "RecoLocalCalo/HcalRecAlgos/interface/HcalSeverityLevelComputerRcd.h"

class HcalChannelPropertiesEP : public edm::ESProducer {
public:
Expand Down Expand Up @@ -52,6 +48,11 @@ class HcalChannelPropertiesEP : public edm::ESProducer {

inline ~HcalChannelPropertiesEP() override {}

static void fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
edm::ParameterSetDescription desc;
descriptions.addWithDefaultLabel(desc);
}

ReturnType1 produce1(const HcalChannelPropertiesAuxRecord& rcd) {
const HcalTopology& htopo = rcd.get(topoToken_);
const HcalRecoParams& params = rcd.get(paramsToken_);
Expand Down
Loading