Skip to content

Commit

Permalink
Merge pull request #7264 from matteosan1/topic_fillDescription
Browse files Browse the repository at this point in the history 
Add fillDescription methods.
  • Loading branch information
@davidlange6
davidlange6 committed Jan 30, 2015
2 parents 0d06672 + 6753cc6 commit 8757bfa
Show file tree
Hide file tree
Showing 14 changed files with 357 additions and 100 deletions.
3 changes: 3 additions & 0 deletions EventFilter/EcalRawToDigi/plugins/EcalRawToDigi.cc
View file
Expand Up @@ -12,6 +12,9 @@
#include "CondFormats/EcalObjects/interface/EcalChannelStatus.h"
#include "CondFormats/DataRecord/interface/EcalChannelStatusRcd.h"

#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"

EcalRawToDigi::EcalRawToDigi(edm::ParameterSet const& conf):

//define the list of FED to be unpacked
Expand Down
5 changes: 2 additions & 3 deletions EventFilter/EcalRawToDigi/plugins/EcalRawToDigi.h
View file
Expand Up @@ -45,14 +45,13 @@ class EcalRawToDigi : public edm::stream::EDProducer<>{
* Class constructor
*/
explicit EcalRawToDigi(const edm::ParameterSet& ps);

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

/**
* Functions that are called by framework at each event
*/
virtual void produce(edm::Event& e, const edm::EventSetup& c) override;

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

// function called at start of each run
virtual void beginRun(const edm::Run& run, const edm::EventSetup& es) override;

Expand Down
5 changes: 3 additions & 2 deletions RecoEcal/EgammaClusterProducers/interface/PFECALSuperClusterProducer.h
View file
Expand Up @@ -45,9 +45,10 @@ class PFECALSuperClusterProducer : public edm::stream::EDProducer<> {
explicit PFECALSuperClusterProducer(const edm::ParameterSet&);
~PFECALSuperClusterProducer();

virtual void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&);
virtual void produce(edm::Event&, const edm::EventSetup&);
virtual void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override;
virtual void produce(edm::Event&, const edm::EventSetup&) override;

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

private:
// ----------member data ---------------------------
Expand Down
47 changes: 47 additions & 0 deletions RecoEcal/EgammaClusterProducers/src/PFECALSuperClusterProducer.cc
View file
Expand Up @@ -17,6 +17,9 @@
#include "FWCore/Framework/interface/ESHandle.h"
#include "FWCore/Framework/interface/EventSetup.h"

#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"

#include "CondFormats/DataRecord/interface/GBRWrapperRcd.h"
#include "CondFormats/EgammaObjects/interface/GBRForest.h"

Expand Down Expand Up @@ -300,3 +303,47 @@ void PFECALSuperClusterProducer::produce(edm::Event& iEvent,
iEvent.put(superClusterAlgo_.getEEOutputSCCollection(),
PFSuperClusterCollectionEndcapWithPreshower_);
}

void PFECALSuperClusterProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
edm::ParameterSetDescription desc;
desc.add<std::string>("PFSuperClusterCollectionEndcap","particleFlowSuperClusterECALEndcap");
desc.add<bool>("doSatelliteClusterMerge",false);
desc.add<double>("thresh_PFClusterBarrel",0.0);
desc.add<std::string>("PFBasicClusterCollectionBarrel","particleFlowBasicClusterECALBarrel");
desc.add<bool>("useRegression",true);
desc.add<double>("satelliteMajorityFraction",0.5);
desc.add<double>("thresh_PFClusterEndcap",0.0);
desc.add<edm::InputTag>("ESAssociation",edm::InputTag("particleFlowClusterECAL"));
desc.add<std::string>("PFBasicClusterCollectionPreshower","particleFlowBasicClusterECALPreshower");
desc.add<bool>("use_preshower",true);
desc.addUntracked<bool>("verbose",false);
desc.add<double>("thresh_SCEt",4.0);
desc.add<double>("etawidth_SuperClusterEndcap",0.04);
desc.add<double>("phiwidth_SuperClusterEndcap",0.6);
desc.add<bool>("useDynamicDPhiWindow",true);
desc.add<std::string>("PFSuperClusterCollectionBarrel","particleFlowSuperClusterECALBarrel");
{
edm::ParameterSetDescription psd0;
psd0.add<std::string>("regressionKeyEE","pfscecal_EECorrection_offline_v1");
psd0.add<edm::InputTag>("ecalRecHitsEE",edm::InputTag("ecalRecHit","EcalRecHitsEE"));
psd0.add<edm::InputTag>("ecalRecHitsEB",edm::InputTag("ecalRecHit","EcalRecHitsEB"));
psd0.add<std::string>("regressionKeyEB","pfscecal_EBCorrection_offline_v1");
psd0.add<edm::InputTag>("vertexCollection",edm::InputTag("offlinePrimaryVertices"));
desc.add<edm::ParameterSetDescription>("regressionConfig",psd0);
}
desc.add<bool>("applyCrackCorrections",false);
desc.add<double>("satelliteClusterSeedThreshold",50.0);
desc.add<double>("etawidth_SuperClusterBarrel",0.04);
desc.add<std::string>("PFBasicClusterCollectionEndcap","particleFlowBasicClusterECALEndcap");
desc.add<edm::InputTag>("PFClusters",edm::InputTag("particleFlowClusterECAL"));
desc.add<double>("thresh_PFClusterSeedBarrel",1.0);
desc.add<std::string>("ClusteringType","Mustache");
desc.add<std::string>("EnergyWeight","Raw");
desc.add<edm::InputTag>("BeamSpot",edm::InputTag("offlineBeamSpot"));
desc.add<double>("thresh_PFClusterSeedEndcap",1.0);
desc.add<double>("phiwidth_SuperClusterBarrel",0.6);
desc.add<double>("thresh_PFClusterES",0.0);
desc.add<bool>("seedThresholdIsET",true);
desc.add<std::string>("PFSuperClusterCollectionEndcapWithPreshower","particleFlowSuperClusterECALEndcapWithPreshower");
descriptions.add("particleFlowSuperClusterECALMustache",desc);
}
67 changes: 20 additions & 47 deletions RecoEgamma/EgammaElectronAlgos/src/ElectronSeedGenerator.cc
View file
Expand Up @@ -67,56 +67,29 @@ ElectronSeedGenerator::ElectronSeedGenerator(const edm::ParameterSet &pset,
theMeasurementTrackerEventTag(ts.token_measTrkEvt),
theSetup(0),
cacheIDMagField_(0),/*cacheIDGeom_(0),*/cacheIDNavSchool_(0),cacheIDCkfComp_(0),cacheIDTrkGeom_(0)
{
{
// so that deltaPhi1 = deltaPhi1Coef1_ + deltaPhi1Coef2_/clusterEnergyT
if (dynamicphiroad_)
{
deltaPhi1Coef2_ = (deltaPhi1Low_-deltaPhi1High_)/(1./lowPtThreshold_-1./highPtThreshold_) ;
deltaPhi1Coef1_ = deltaPhi1Low_ - deltaPhi1Coef2_/lowPtThreshold_ ;
}

// use of a theMeasurementTrackerName
if (pset.exists("measurementTrackerName"))
{ theMeasurementTrackerName = pset.getParameter<std::string>("measurementTrackerName") ; }

{
deltaPhi1Coef2_ = (deltaPhi1Low_-deltaPhi1High_)/(1./lowPtThreshold_-1./highPtThreshold_) ;
deltaPhi1Coef1_ = deltaPhi1Low_ - deltaPhi1Coef2_/lowPtThreshold_ ;
}

theMeasurementTrackerName = pset.getParameter<std::string>("measurementTrackerName");

// use of reco vertex
if (pset.exists("useRecoVertex"))
{ useRecoVertex_ = pset.getParameter<bool>("useRecoVertex") ; }
/*
if (pset.exists("vertices"))
{ verticesTag_ = pset.getParameter<edm::InputTag>("vertices") ; }
*/
if (pset.exists("deltaZ1WithVertex"))
{ deltaZ1WithVertex_ = pset.getParameter<double>("deltaZ1WithVertex") ; }

// new beamSpot tag
/*
if (pset.exists("beamSpot"))
{ beamSpotTag_ = pset.getParameter<edm::InputTag>("beamSpot") ; }
*/

useRecoVertex_ = pset.getParameter<bool>("useRecoVertex");
deltaZ1WithVertex_ = pset.getParameter<double>("deltaZ1WithVertex");

// new B/F configurables
if (pset.exists("DeltaPhi2"))
{ deltaPhi2B_ = deltaPhi2F_ = pset.getParameter<double>("DeltaPhi2") ; }
else
{
deltaPhi2B_ = pset.getParameter<double>("DeltaPhi2B") ;
deltaPhi2F_ = pset.getParameter<double>("DeltaPhi2F") ;
}
if (pset.exists("PhiMin2"))
{ phiMin2B_ = phiMin2F_ = pset.getParameter<double>("PhiMin2") ; }
else
{
phiMin2B_ = pset.getParameter<double>("PhiMin2B") ;
phiMin2F_ = pset.getParameter<double>("PhiMin2F") ;
}
if (pset.exists("PhiMax2"))
{ phiMax2B_ = phiMax2F_ = pset.getParameter<double>("PhiMax2") ; }
else
{
phiMax2B_ = pset.getParameter<double>("PhiMax2B") ;
phiMax2F_ = pset.getParameter<double>("PhiMax2F") ;
}
deltaPhi2B_ = pset.getParameter<double>("DeltaPhi2B") ;
deltaPhi2F_ = pset.getParameter<double>("DeltaPhi2F") ;

phiMin2B_ = pset.getParameter<double>("PhiMin2B") ;
phiMin2F_ = pset.getParameter<double>("PhiMin2F") ;

phiMax2B_ = pset.getParameter<double>("PhiMax2B") ;
phiMax2F_ = pset.getParameter<double>("PhiMax2F") ;

// Instantiate the pixel hit matchers
myMatchEle = new PixelHitMatcher
Expand Down Expand Up @@ -144,7 +117,7 @@ ElectronSeedGenerator::ElectronSeedGenerator(const edm::ParameterSet &pset,
pset.getParameter<bool>("searchInTIDTEC") ) ;

theUpdator = new KFUpdator() ;
}
}

ElectronSeedGenerator::~ElectronSeedGenerator()
{
Expand Down
135 changes: 93 additions & 42 deletions RecoEgamma/EgammaElectronProducers/plugins/ElectronSeedProducer.cc
View file
Expand Up @@ -51,7 +51,8 @@ using namespace reco ;
ElectronSeedProducer::ElectronSeedProducer( const edm::ParameterSet& iConfig )
: //conf_(iConfig),
applyHOverECut_(true), hcalHelper_(0),
caloGeom_(0), caloGeomCacheId_(0), caloTopo_(0), caloTopoCacheId_(0) {
caloGeom_(0), caloGeomCacheId_(0), caloTopo_(0), caloTopoCacheId_(0)
{
conf_ = iConfig.getParameter<edm::ParameterSet>("SeedConfiguration") ;

initialSeeds_ = consumes<TrajectorySeedCollection>(conf_.getParameter<edm::InputTag>("initialSeeds")) ;
Expand All @@ -60,56 +61,35 @@ ElectronSeedProducer::ElectronSeedProducer( const edm::ParameterSet& iConfig )
prefilteredSeeds_ = conf_.getParameter<bool>("preFilteredSeeds") ;

// new beamSpot tag
if (conf_.exists("beamSpot")) {
beamSpotTag_ = consumes<reco::BeamSpot>(conf_.getParameter<edm::InputTag>("beamSpot"));
} else {
beamSpotTag_ = consumes<reco::BeamSpot>(edm::InputTag("offlineBeamSpot"));
}
beamSpotTag_ = consumes<reco::BeamSpot>(conf_.getParameter<edm::InputTag>("beamSpot"));

// for H/E
// if (conf_.exists("applyHOverECut"))
// { applyHOverECut_ = conf_.getParameter<bool>("applyHOverECut") ; }
applyHOverECut_ = conf_.getParameter<bool>("applyHOverECut") ;
if (applyHOverECut_)
{
ElectronHcalHelper::Configuration hcalCfg ;
hcalCfg.hOverEConeSize = conf_.getParameter<double>("hOverEConeSize") ;
if (hcalCfg.hOverEConeSize>0)
{
hcalCfg.useTowers = true ;
hcalCfg.hcalTowers =
consumes<CaloTowerCollection>(conf_.getParameter<edm::InputTag>("hcalTowers")) ;
hcalCfg.hOverEPtMin = conf_.getParameter<double>("hOverEPtMin") ;
}
hcalHelper_ = new ElectronHcalHelper(hcalCfg) ;
maxHOverEBarrel_=conf_.getParameter<double>("maxHOverEBarrel") ;
maxHOverEEndcaps_=conf_.getParameter<double>("maxHOverEEndcaps") ;
maxHBarrel_=conf_.getParameter<double>("maxHBarrel") ;
maxHEndcaps_=conf_.getParameter<double>("maxHEndcaps") ;
// hOverEConeSize_=conf_.getParameter<double>("hOverEConeSize") ;
// hOverEHBMinE_=conf_.getParameter<double>("hOverEHBMinE") ;
// hOverEHFMinE_=conf_.getParameter<double>("hOverEHFMinE") ;
ElectronHcalHelper::Configuration hcalCfg ;
hcalCfg.hOverEConeSize = conf_.getParameter<double>("hOverEConeSize") ;
if (hcalCfg.hOverEConeSize>0)
{
hcalCfg.useTowers = true ;
hcalCfg.hcalTowers =
consumes<CaloTowerCollection>(conf_.getParameter<edm::InputTag>("hcalTowers")) ;
hcalCfg.hOverEPtMin = conf_.getParameter<double>("hOverEPtMin") ;
}
hcalHelper_ = new ElectronHcalHelper(hcalCfg) ;
maxHOverEBarrel_=conf_.getParameter<double>("maxHOverEBarrel") ;
maxHOverEEndcaps_=conf_.getParameter<double>("maxHOverEEndcaps") ;
maxHBarrel_=conf_.getParameter<double>("maxHBarrel") ;
maxHEndcaps_=conf_.getParameter<double>("maxHEndcaps") ;
}

if( conf_.exists("RegionPSet") ) {
edm::ParameterSet rpset =
conf_.getParameter<edm::ParameterSet>("RegionPSet");
filterVtxTag_ =
consumes<std::vector<reco::Vertex> >(rpset.getParameter<edm::InputTag> ("VertexProducer"));
}
edm::ParameterSet rpset = conf_.getParameter<edm::ParameterSet>("RegionPSet");
filterVtxTag_ = consumes<std::vector<reco::Vertex> >(rpset.getParameter<edm::InputTag> ("VertexProducer"));

ElectronSeedGenerator::Tokens esg_tokens;
esg_tokens.token_bs = beamSpotTag_;
if(conf_.exists("vertices")) {
esg_tokens.token_vtx =
mayConsume<reco::VertexCollection>(conf_.getParameter<edm::InputTag>("vertices"));
} else {
esg_tokens.token_vtx =
mayConsume<reco::VertexCollection>(edm::InputTag("offlinePrimaryVerticesWithBS"));
}
if(conf_.existsAs<edm::InputTag>("measurementTrackerEvent")) {
esg_tokens.token_measTrkEvt= consumes<MeasurementTrackerEvent>(conf_.getParameter<edm::InputTag>("measurementTrackerEvent"));
}
esg_tokens.token_vtx = mayConsume<reco::VertexCollection>(conf_.getParameter<edm::InputTag>("vertices"));
esg_tokens.token_measTrkEvt= consumes<MeasurementTrackerEvent>(conf_.getParameter<edm::InputTag>("measurementTrackerEvent"));

matcher_ = new ElectronSeedGenerator(conf_,esg_tokens) ;

Expand Down Expand Up @@ -137,7 +117,6 @@ ElectronSeedProducer::ElectronSeedProducer( const edm::ParameterSet& iConfig )
produces<ElectronSeedCollection>() ;
}


void ElectronSeedProducer::beginRun(edm::Run const&, edm::EventSetup const&)
{}

Expand Down Expand Up @@ -282,3 +261,75 @@ void ElectronSeedProducer::filterSeeds
LogDebug("ElectronSeedProducer")<<"Number of Seeds: "<<theInitialSeedColl->size() ;
}
}

void
ElectronSeedProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
edm::ParameterSetDescription desc;
desc.add<edm::InputTag>("endcapSuperClusters",edm::InputTag("particleFlowSuperClusterECAL","particleFlowSuperClusterECALEndcapWithPreshower"));
{
edm::ParameterSetDescription psd0, psd1, psd2;
psd1.add<unsigned int>("maxElement", 0);
psd1.add<std::string>("ComponentName", std::string("StandardHitPairGenerator"));
psd1.addUntracked<int>("useOnDemandTracker", 0);
psd1.add<edm::InputTag>("SeedingLayers", edm::InputTag("hltMixedLayerPairs"));
psd0.add<edm::ParameterSetDescription>("OrderedHitsFactoryPSet", psd1);

psd2.add<double>("deltaPhiRegion", 0.4);
psd2.add<double>("originHalfLength", 15.0);
psd2.add<bool>("useZInVertex", true);
psd2.add<double>("deltaEtaRegion", 0.1);
psd2.add<double>("ptMin", 1.5 );
psd2.add<double>("originRadius", 0.2);
psd2.add<edm::InputTag>("VertexProducer", edm::InputTag("dummyVertices"));
psd0.add<edm::ParameterSetDescription>("RegionPSet", psd2);

psd0.add<double>("PhiMax2B",0.002);
psd0.add<double>("hOverEPtMin",0.0);
psd0.add<double>("PhiMax2F",0.003);
psd0.add<bool>("searchInTIDTEC",true);
psd0.add<double>("pPhiMax1",0.125);
psd0.add<double>("HighPtThreshold",35.0);
psd0.add<double>("r2MinF",-0.15);
psd0.add<double>("maxHBarrel",0.0);
psd0.add<double>("DeltaPhi1Low",0.23);
psd0.add<double>("DeltaPhi1High",0.08);
psd0.add<double>("ePhiMin1",-0.125);
psd0.add<edm::InputTag>("hcalTowers",edm::InputTag("towerMaker"));
psd0.add<double>("LowPtThreshold",5.0);
psd0.add<double>("maxHOverEBarrel",0.15);
psd0.add<bool>("dynamicPhiRoad",true);
psd0.add<double>("ePhiMax1",0.075);
psd0.add<std::string>("measurementTrackerName","");
psd0.add<double>("SizeWindowENeg",0.675);
psd0.add<double>("nSigmasDeltaZ1",5.0);
psd0.add<double>("rMaxI",0.2);
psd0.add<double>("maxHEndcaps",0.0);
psd0.add<bool>("preFilteredSeeds",false);
psd0.add<double>("r2MaxF",0.15);
psd0.add<double>("hOverEConeSize",0.15);
psd0.add<double>("pPhiMin1",-0.075);
psd0.add<edm::InputTag>("initialSeeds",edm::InputTag("newCombinedSeeds"));
psd0.add<double>("deltaZ1WithVertex",25.0);
psd0.add<double>("SCEtCut",0.0);
psd0.add<double>("z2MaxB",0.09);
psd0.add<bool>("fromTrackerSeeds",true);
psd0.add<edm::InputTag>("hcalRecHits",edm::InputTag("hbhereco"));
psd0.add<double>("z2MinB",-0.09);
psd0.add<double>("rMinI",-0.2);
psd0.add<double>("maxHOverEEndcaps",0.15);
psd0.add<double>("hOverEHBMinE",0.7);
psd0.add<bool>("useRecoVertex",false);
psd0.add<edm::InputTag>("beamSpot",edm::InputTag("offlineBeamSpot"));
psd0.add<edm::InputTag>("measurementTrackerEvent",edm::InputTag("MeasurementTrackerEvent"));
psd0.add<edm::InputTag>("vertices",edm::InputTag("offlinePrimaryVerticesWithBS"));
psd0.add<bool>("applyHOverECut",true);
psd0.add<double>("DeltaPhi2F",0.012);
psd0.add<double>("PhiMin2F",-0.003);
psd0.add<double>("hOverEHFMinE",0.8);
psd0.add<double>("DeltaPhi2B",0.008);
psd0.add<double>("PhiMin2B",-0.002);
desc.add<edm::ParameterSetDescription>("SeedConfiguration",psd0);
}
desc.add<edm::InputTag>("barrelSuperClusters",edm::InputTag("particleFlowSuperClusterECAL","particleFlowSuperClusterECALBarrel"));
descriptions.add("ecalDrivenElectronSeeds",desc);
}
1 change: 1 addition & 0 deletions RecoEgamma/EgammaElectronProducers/plugins/ElectronSeedProducer.h
View file
Expand Up @@ -50,6 +50,7 @@ class ElectronSeedProducer : public edm::stream::EDProducer<>

virtual void produce( edm::Event &, const edm::EventSetup & ) override final;

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

void filterClusters
Expand Down
22 changes: 21 additions & 1 deletion RecoLocalCalo/EcalRecProducers/plugins/EcalDetIdToBeRecoveredProducer.cc
View file
Expand Up @@ -5,8 +5,9 @@

#include "DataFormats/EcalDetId/interface/EcalDetIdCollections.h"


#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"

#include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"

Expand Down Expand Up @@ -315,6 +316,25 @@ void EcalDetIdToBeRecoveredProducer::produce(edm::Event& ev, const edm::EventSet
ev.put( eeSCDetIdToRecover, scDetIdCollection_ );
}

void EcalDetIdToBeRecoveredProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
edm::ParameterSetDescription desc;
desc.add<edm::InputTag>("ebIntegrityChIdErrors",edm::InputTag("ecalDigis","EcalIntegrityChIdErrors"));
desc.add<std::string>("ebDetIdToBeRecovered","ebDetId");
desc.add<edm::InputTag>("integrityTTIdErrors",edm::InputTag("ecalDigis","EcalIntegrityTTIdErrors"));
desc.add<edm::InputTag>("eeIntegrityGainErrors",edm::InputTag("ecalDigis","EcalIntegrityGainErrors"));
desc.add<std::string>("ebFEToBeRecovered","ebFE");
desc.add<edm::InputTag>("ebIntegrityGainErrors",edm::InputTag("ecalDigis","EcalIntegrityGainErrors"));
desc.add<std::string>("eeDetIdToBeRecovered","eeDetId");
desc.add<edm::InputTag>("eeIntegrityGainSwitchErrors",edm::InputTag("ecalDigis","EcalIntegrityGainSwitchErrors"));
desc.add<edm::InputTag>("eeIntegrityChIdErrors",edm::InputTag("ecalDigis","EcalIntegrityChIdErrors"));
desc.add<edm::InputTag>("ebIntegrityGainSwitchErrors",edm::InputTag("ecalDigis","EcalIntegrityGainSwitchErrors"));
desc.add<edm::InputTag>("ebSrFlagCollection",edm::InputTag("ecalDigis"));
desc.add<std::string>("eeFEToBeRecovered","eeFE");
desc.add<edm::InputTag>("integrityBlockSizeErrors",edm::InputTag("ecalDigis","EcalIntegrityBlockSizeErrors"));
desc.add<edm::InputTag>("eeSrFlagCollection",edm::InputTag("ecalDigis"));
descriptions.add("ecalDetIdToBeRecovered",desc);
}


#include "FWCore/Framework/interface/MakerMacros.h"
DEFINE_FWK_MODULE( EcalDetIdToBeRecoveredProducer );

0 comments on commit 8757bfa

Please sign in to comment.