Skip to content

Commit

Permalink
Merge CMSSW_10_5_X into CMSSW_10_5_DEVEL_X.
Browse files Browse the repository at this point in the history
  • Loading branch information
@cmsbuild
cmsbuild committed Feb 15, 2019
2 parents 962a4af + 8479fc5 commit 203a273
Show file tree
Hide file tree
Showing 15 changed files with 31 additions and 69 deletions.
4 changes: 2 additions & 2 deletions DQM/DTMonitorClient/src/DTDataIntegrityTest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ DTDataIntegrityTest::~DTDataIntegrityTest(){
if(nFEDEvtsUros!=0)
result1 = max((float)0., ((float)nFEDEvtsUros-nROBErrors1)/(float)nFEDEvtsUros);
summaryHisto->setBinContent(iros,wheel+3,result1);
int tdcResult1 = -2;
double tdcResult1 = -2;
float nTDCErrors1 = histoFEDSummary1->Integral(6,6,iros,iros); //Only TDC fatal considered
if(nTDCErrors1 == 0) { // no errors
tdcResult1 = 0.5;
Expand All @@ -226,7 +226,7 @@ DTDataIntegrityTest::~DTDataIntegrityTest(){
result2 = max((float)0., ((float)nFEDEvtsUros-nROBErrors2)/(float)nFEDEvtsUros);
summaryHisto->setBinContent(iros,wheel*2+3,result2);

int tdcResult2 = -2;
double tdcResult2 = -2;
float nTDCErrors2 = histoFEDSummary2->Integral(6,6,iros,iros); //Only TDC fatal considered
if(nTDCErrors2 == 0) { // no errors
tdcResult2 = 0.5;
Expand Down
2 changes: 1 addition & 1 deletion DQM/EcalMonitorTasks/plugins/EcalDQMonitorTask.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ EcalDQMonitorTask::EcalDQMonitorTask(edm::ParameterSet const& _ps) :
std::bitset<ecaldqm::nCollections> hasTaskToRun;
edm::ConsumesCollector collector(consumesCollector());

executeOnWorkers_([&dependencies, &hasTaskToRun, &collector, this](ecaldqm::DQWorker* worker){
executeOnWorkers_([&dependencies, &hasTaskToRun, &collector](ecaldqm::DQWorker* worker){
ecaldqm::DQWorkerTask* task(dynamic_cast<ecaldqm::DQWorkerTask*>(worker));
if(!task)
throw cms::Exception("InvalidConfiguration") << "Non-task DQWorker " << worker->getName() << " passed";
Expand Down
2 changes: 1 addition & 1 deletion DQM/EcalPreshowerMonitorModule/interface/ESTrendTask.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class ESTrendTask: public DQMEDAnalyzer{
void analyze(const edm::Event& e, const edm::EventSetup& c) override;

// EndJob
void endJob(void);
void endJob(void) override;

// BeginRun
void dqmBeginRun(const edm::Run & r, const edm::EventSetup & c) override;
Expand Down
4 changes: 2 additions & 2 deletions DQM/L1TMonitorClient/interface/L1TEMTFEventInfoClient.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ class L1TEMTFEventInfoClient: public DQMEDHarvester {
L1TEMTFEventInfoClient(const edm::ParameterSet&);

/// Destructor
virtual ~L1TEMTFEventInfoClient();
virtual ~L1TEMTFEventInfoClient() override;

protected:

void
dqmEndLuminosityBlock(DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter, const edm::LuminosityBlock&, const edm::EventSetup&);
dqmEndLuminosityBlock(DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter, const edm::LuminosityBlock&, const edm::EventSetup&) override;

/// end job
void dqmEndJob(DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter)override;
Expand Down
6 changes: 2 additions & 4 deletions RecoParticleFlow/PFClusterProducer/interface/PFClusterBuilderBase.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,11 @@ class PFClusterBuilderBase {
_nSeeds(0), _nClustersFound(0),
_minFractionToKeep(conf.getParameter<double>("minFractionToKeep")),
_algoName(conf.getParameter<std::string>("algoName")) {
_positionCalc.reset(nullptr);
if( conf.exists("positionCalc") ) {
const edm::ParameterSet& pcConf = conf.getParameterSet("positionCalc");
const std::string& algo = pcConf.getParameter<std::string>("algoName");
PosCalc* calcp = PFCPositionCalculatorFactory::get()->create(algo,
pcConf);
_positionCalc.reset(calcp);
_positionCalc = std::unique_ptr<PosCalc>{PFCPositionCalculatorFactory::get()->create(algo,
pcConf)};
}
}
virtual ~PFClusterBuilderBase() = default;
Expand Down
10 changes: 2 additions & 8 deletions RecoParticleFlow/PFClusterProducer/plugins/Basic2DGenericPFlowClusterizer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,26 +71,20 @@ Basic2DGenericPFlowClusterizer(const edm::ParameterSet& conf) :
_recHitEnergyNorms.emplace(_layerMap.find(det)->second,std::make_pair(depths,rhE_norm));
}

_allCellsPosCalc.reset(nullptr);
if( conf.exists("allCellsPositionCalc") ) {
const edm::ParameterSet& acConf =
conf.getParameterSet("allCellsPositionCalc");
const std::string& algoac =
acConf.getParameter<std::string>("algoName");
PosCalc* accalc =
PFCPositionCalculatorFactory::get()->create(algoac, acConf);
_allCellsPosCalc.reset(accalc);
_allCellsPosCalc = std::unique_ptr<PosCalc>{PFCPositionCalculatorFactory::get()->create(algoac, acConf)};
}
// if necessary a third pos calc for convergence testing
_convergencePosCalc.reset(nullptr);
if( conf.exists("positionCalcForConvergence") ) {
const edm::ParameterSet& convConf =
conf.getParameterSet("positionCalcForConvergence");
const std::string& algoconv =
convConf.getParameter<std::string>("algoName");
PosCalc* convcalc =
PFCPositionCalculatorFactory::get()->create(algoconv, convConf);
_convergencePosCalc.reset(convcalc);
_convergencePosCalc = std::unique_ptr<PosCalc>{PFCPositionCalculatorFactory::get()->create(algoconv, convConf)};
}
}

Expand Down
2 changes: 1 addition & 1 deletion RecoParticleFlow/PFClusterProducer/plugins/PFCTRecHitProducer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ PFCTRecHitProducer::PFCTRecHitProducer(const edm::ParameterSet& iConfig)


edm::ParameterSet navSet = iConfig.getParameter<edm::ParameterSet>("navigator");
navigator_ = PFRecHitNavigationFactory::get()->create(navSet.getParameter<std::string>("name"),navSet);
navigator_ = std::unique_ptr<PFRecHitNavigatorBase>{PFRecHitNavigationFactory::get()->create(navSet.getParameter<std::string>("name"),navSet)};

//--ab
produces<reco::PFRecHitCollection>();
Expand Down
2 changes: 1 addition & 1 deletion RecoParticleFlow/PFClusterProducer/plugins/PFCTRecHitProducer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ class dso_hidden PFCTRecHitProducer final : public edm::stream::EDProducer<> {
int m_maxDepthHB;
int m_maxDepthHE;

PFRecHitNavigatorBase* navigator_;
std::unique_ptr<PFRecHitNavigatorBase> navigator_;


};
Expand Down
22 changes: 6 additions & 16 deletions RecoParticleFlow/PFClusterProducer/plugins/PFClusterProducer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,47 +22,37 @@ PFClusterProducer::PFClusterProducer(const edm::ParameterSet& conf) :
for( const auto& conf : cleanerConfs ) {
const std::string& cleanerName =
conf.getParameter<std::string>("algoName");
RHCB* cleaner =
RecHitTopologicalCleanerFactory::get()->create(cleanerName,conf);
_cleaners.push_back(std::unique_ptr<RHCB>(cleaner));
_cleaners.emplace_back(RecHitTopologicalCleanerFactory::get()->create(cleanerName,conf));
}
edm::ConsumesCollector sumes = consumesCollector();

// setup seed finding
const edm::ParameterSet& sfConf =
conf.getParameterSet("seedFinder");
const std::string& sfName = sfConf.getParameter<std::string>("algoName");
SeedFinderBase* sfb = SeedFinderFactory::get()->create(sfName,sfConf);
_seedFinder.reset(sfb);
_seedFinder = std::unique_ptr<SeedFinderBase>{SeedFinderFactory::get()->create(sfName,sfConf)};
//setup topo cluster builder
const edm::ParameterSet& initConf =
conf.getParameterSet("initialClusteringStep");
const std::string& initName = initConf.getParameter<std::string>("algoName");
ICSB* initb = InitialClusteringStepFactory::get()->create(initName,initConf,sumes);
_initialClustering.reset(initb);
_initialClustering = std::unique_ptr<ICSB>{InitialClusteringStepFactory::get()->create(initName,initConf,sumes)};
//setup pf cluster builder if requested
_pfClusterBuilder.reset(nullptr);
const edm::ParameterSet& pfcConf = conf.getParameterSet("pfClusterBuilder");
if( !pfcConf.empty() ) {
const std::string& pfcName = pfcConf.getParameter<std::string>("algoName");
PFCBB* pfcb = PFClusterBuilderFactory::get()->create(pfcName,pfcConf);
_pfClusterBuilder.reset(pfcb);
_pfClusterBuilder = std::unique_ptr<PFCBB>{PFClusterBuilderFactory::get()->create(pfcName,pfcConf)};
}
//setup (possible) recalcuation of positions
_positionReCalc.reset(nullptr);
const edm::ParameterSet& pConf = conf.getParameterSet("positionReCalc");
if( !pConf.empty() ) {
const std::string& pName = pConf.getParameter<std::string>("algoName");
PosCalc* pcalc = PFCPositionCalculatorFactory::get()->create(pName,pConf);
_positionReCalc.reset(pcalc);
_positionReCalc = std::unique_ptr<PosCalc>{PFCPositionCalculatorFactory::get()->create(pName,pConf)};
}
// see if new need to apply corrections, setup if there.
const edm::ParameterSet& cConf = conf.getParameterSet("energyCorrector");
if( !cConf.empty() ) {
const std::string& cName = cConf.getParameter<std::string>("algoName");
PFClusterEnergyCorrectorBase* eCorr =
PFClusterEnergyCorrectorFactory::get()->create(cName,cConf);
_energyCorrector.reset(eCorr);
_energyCorrector = std::unique_ptr<PFClusterEnergyCorrectorBase>{PFClusterEnergyCorrectorFactory::get()->create(cName,cConf)};
}


Expand Down
8 changes: 2 additions & 6 deletions RecoParticleFlow/PFClusterProducer/plugins/PFMultiDepthClusterProducer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,16 @@
PFMultiDepthClusterProducer::PFMultiDepthClusterProducer(const edm::ParameterSet& conf)
{
_clustersLabel = consumes<reco::PFClusterCollection>(conf.getParameter<edm::InputTag>("clustersSource"));
_pfClusterBuilder.reset(nullptr);
const edm::ParameterSet& pfcConf = conf.getParameterSet("pfClusterBuilder");
if( !pfcConf.empty() ) {
const std::string& pfcName = pfcConf.getParameter<std::string>("algoName");
PFCBB* pfcb = PFClusterBuilderFactory::get()->create(pfcName,pfcConf);
_pfClusterBuilder.reset(pfcb);
_pfClusterBuilder = std::unique_ptr<PFCBB>{PFClusterBuilderFactory::get()->create(pfcName,pfcConf)};
}
// see if new need to apply corrections, setup if there.
const edm::ParameterSet& cConf = conf.getParameterSet("energyCorrector");
if( !cConf.empty() ) {
const std::string& cName = cConf.getParameter<std::string>("algoName");
PFClusterEnergyCorrectorBase* eCorr =
PFClusterEnergyCorrectorFactory::get()->create(cName,cConf);
_energyCorrector.reset(eCorr);
_energyCorrector = std::unique_ptr<PFClusterEnergyCorrectorBase>{PFClusterEnergyCorrectorFactory::get()->create(cName,cConf)};
}

produces<reco::PFClusterCollection>();
Expand Down
5 changes: 1 addition & 4 deletions RecoParticleFlow/PFClusterProducer/plugins/PFMultiDepthClusterizer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,12 @@ PFMultiDepthClusterizer(const edm::ParameterSet& conf) :
PFClusterBuilderBase(conf)
{

_allCellsPosCalc.reset(nullptr);
if( conf.exists("allCellsPositionCalc") ) {
const edm::ParameterSet& acConf =
conf.getParameterSet("allCellsPositionCalc");
const std::string& algoac =
acConf.getParameter<std::string>("algoName");
PosCalc* accalc =
PFCPositionCalculatorFactory::get()->create(algoac, acConf);
_allCellsPosCalc.reset(accalc);
_allCellsPosCalc = std::unique_ptr<PosCalc>{PFCPositionCalculatorFactory::get()->create(algoac, acConf)};
}

nSigmaEta_ = pow(conf.getParameter<double>("nSigmaEta"),2);
Expand Down
2 changes: 1 addition & 1 deletion RecoParticleFlow/PFClusterProducer/plugins/PFRecHitProducer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ namespace {

edm::ParameterSet navSet = iConfig.getParameter<edm::ParameterSet>("navigator");

navigator_.reset(PFRecHitNavigationFactory::get()->create(navSet.getParameter<std::string>("name"),navSet));
navigator_ = std::unique_ptr<PFRecHitNavigatorBase>{PFRecHitNavigationFactory::get()->create(navSet.getParameter<std::string>("name"),navSet)};

}

Expand Down
20 changes: 6 additions & 14 deletions RecoParticleFlow/PFClusterProducer/plugins/PFlow2DClusterizerWithTime.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,40 +64,32 @@ PFlow2DClusterizerWithTime(const edm::ParameterSet& conf) :
_recHitEnergyNorms.emplace(_layerMap.find(det)->second,rhE_norm);
}

_allCellsPosCalc.reset(nullptr);
if( conf.exists("allCellsPositionCalc") ) {
const edm::ParameterSet& acConf =
conf.getParameterSet("allCellsPositionCalc");
const std::string& algoac =
acConf.getParameter<std::string>("algoName");
PosCalc* accalc =
PFCPositionCalculatorFactory::get()->create(algoac, acConf);
_allCellsPosCalc.reset(accalc);
_allCellsPosCalc = std::unique_ptr<PFCPositionCalculatorBase>{PFCPositionCalculatorFactory::get()->create(algoac, acConf)};
}
// if necessary a third pos calc for convergence testing
_convergencePosCalc.reset(nullptr);
if( conf.exists("positionCalcForConvergence") ) {
const edm::ParameterSet& convConf =
conf.getParameterSet("positionCalcForConvergence");
const std::string& algoconv =
convConf.getParameter<std::string>("algoName");
PosCalc* convcalc =
PFCPositionCalculatorFactory::get()->create(algoconv, convConf);
_convergencePosCalc.reset(convcalc);
_convergencePosCalc = std::unique_ptr<PFCPositionCalculatorBase>{PFCPositionCalculatorFactory::get()->create(algoconv, convConf)};
}
_timeResolutionCalcBarrel.reset(nullptr);
if( conf.exists("timeResolutionCalcBarrel") ) {
const edm::ParameterSet& timeResConf =
conf.getParameterSet("timeResolutionCalcBarrel");
_timeResolutionCalcBarrel.reset(new CaloRecHitResolutionProvider(
timeResConf));
_timeResolutionCalcBarrel = std::make_unique<CaloRecHitResolutionProvider>(
timeResConf);
}
_timeResolutionCalcEndcap.reset(nullptr);
if( conf.exists("timeResolutionCalcEndcap") ) {
const edm::ParameterSet& timeResConf =
conf.getParameterSet("timeResolutionCalcEndcap");
_timeResolutionCalcEndcap.reset(new CaloRecHitResolutionProvider(
timeResConf));
_timeResolutionCalcEndcap = std::make_unique<CaloRecHitResolutionProvider>(
timeResConf);
}
}

Expand Down
8 changes: 2 additions & 6 deletions RecoParticleFlow/PFProducer/src/PFBlockAlgo.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,7 @@ void PFBlockAlgo::setLinkers(const std::vector<edm::ParameterSet>& confs) {
const PFBlockElement::Type type1 = elementTypes_.at(link1);
const PFBlockElement::Type type2 = elementTypes_.at(link2);
const unsigned index = rowsize*std::max(type1,type2)+std::min(type1,type2);
BlockElementLinkerBase * linker =
BlockElementLinkerFactory::get()->create(linkerName,conf);
linkTests_[index].reset(linker);
linkTests_[index] = LinkTestPtr{BlockElementLinkerFactory::get()->create(linkerName,conf)};
linkTestSquare_[type1][type2] = index;
linkTestSquare_[type2][type1] = index;
// setup KDtree if requested
Expand All @@ -135,9 +133,7 @@ void PFBlockAlgo::setImporters(const std::vector<edm::ParameterSet>& confs,
for( const auto& conf : confs ) {
const std::string& importerName =
conf.getParameter<std::string>("importerName");
BlockElementImporterBase * importer =
BlockElementImporterFactory::get()->create(importerName,conf,sumes);
importers_.emplace_back(importer);
importers_.emplace_back(BlockElementImporterFactory::get()->create(importerName,conf,sumes));
}
}

Expand Down
3 changes: 1 addition & 2 deletions RecoParticleFlow/PFSimProducer/plugins/EcalBarrelClusterFastTimer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,7 @@ EcalBarrelClusterFastTimer::EcalBarrelClusterFastTimer(const edm::ParameterSet&
const std::vector<edm::ParameterSet>& resos = conf.getParameterSetVector("resolutionModels");
for( const auto& reso : resos ) {
const std::string& name = reso.getParameter<std::string>("modelName");
ResolutionModel* resomod = ResolutionModelFactory::get()->create(name,reso);
_resolutions.emplace_back( resomod );
_resolutions.emplace_back( ResolutionModelFactory::get()->create(name,reso) );

// times and time resolutions for general tracks
produces<edm::ValueMap<float> >(name);
Expand Down

0 comments on commit 203a273

Please sign in to comment.