Skip to content

Commit

Permalink
removed creation of helper instances of consumesCollector and enforec…
Browse files Browse the repository at this point in the history 
…ed usage of '&&' everywhere
  • Loading branch information
@jpavel
jpavel committed Dec 10, 2013
1 parent 0de1868 commit d4417d5
Show file tree
Hide file tree
Showing 28 changed files with 64 additions and 70 deletions.
15 changes: 7 additions & 8 deletions RecoTauTag/RecoTau/interface/RecoTauBuilderPlugins.h
View file
Expand Up @@ -54,13 +54,12 @@ class RecoTauBuilderPlugin : public RecoTauEventHolderPlugin {
public:
typedef boost::ptr_vector<reco::PFTau> output_type;
typedef std::auto_ptr<output_type> return_type;
// edm::ConsumesCollector iC();

explicit RecoTauBuilderPlugin(const edm::ParameterSet& pset, edm::ConsumesCollector& iC):
explicit RecoTauBuilderPlugin(const edm::ParameterSet& pset, edm::ConsumesCollector && iC):
RecoTauEventHolderPlugin(pset),
// The vertex association configuration is specified with the
// quality cuts.
vertexAssociator_(pset.getParameter<edm::ParameterSet>("qualityCuts"),iC) {
vertexAssociator_(pset.getParameter<edm::ParameterSet>("qualityCuts"),std::move(iC)) {
pfCandSrc_ = pset.getParameter<edm::InputTag>("pfCandSrc");
pfCand_token = iC.consumes<PFCandidateCollection>(pfCandSrc_);
};
Expand Down Expand Up @@ -98,7 +97,7 @@ class RecoTauBuilderPlugin : public RecoTauEventHolderPlugin {
/* Class that updates a PFTau's members (i.e. electron variables) */
class RecoTauModifierPlugin : public RecoTauEventHolderPlugin {
public:
explicit RecoTauModifierPlugin(const edm::ParameterSet& pset, edm::ConsumesCollector& iC):
explicit RecoTauModifierPlugin(const edm::ParameterSet& pset, edm::ConsumesCollector&& iC):
RecoTauEventHolderPlugin(pset){};
virtual ~RecoTauModifierPlugin() {}
// Modify an existing PFTau (i.e. add electron rejection, etc)
Expand All @@ -109,7 +108,7 @@ class RecoTauModifierPlugin : public RecoTauEventHolderPlugin {
/* Class that returns a double value indicating the quality of a given tau */
class RecoTauCleanerPlugin : public RecoTauEventHolderPlugin {
public:
explicit RecoTauCleanerPlugin(const edm::ParameterSet& pset, edm::ConsumesCollector &iC ):
explicit RecoTauCleanerPlugin(const edm::ParameterSet& pset, edm::ConsumesCollector && iC ):
RecoTauEventHolderPlugin(pset){};
virtual ~RecoTauCleanerPlugin() {}
// Modify an existing PFTau (i.e. add electron rejection, etc)
Expand All @@ -120,10 +119,10 @@ class RecoTauCleanerPlugin : public RecoTauEventHolderPlugin {

#include "FWCore/PluginManager/interface/PluginFactory.h"
typedef edmplugin::PluginFactory<reco::tau::RecoTauBuilderPlugin*
(const edm::ParameterSet&, edm::ConsumesCollector &iC)> RecoTauBuilderPluginFactory;
(const edm::ParameterSet&, edm::ConsumesCollector &&iC)> RecoTauBuilderPluginFactory;
typedef edmplugin::PluginFactory<reco::tau::RecoTauModifierPlugin*
(const edm::ParameterSet&, edm::ConsumesCollector &iC)> RecoTauModifierPluginFactory;
(const edm::ParameterSet&, edm::ConsumesCollector &&iC)> RecoTauModifierPluginFactory;
typedef edmplugin::PluginFactory<reco::tau::RecoTauCleanerPlugin*
(const edm::ParameterSet&, edm::ConsumesCollector &iC)> RecoTauCleanerPluginFactory;
(const edm::ParameterSet&, edm::ConsumesCollector &&iC)> RecoTauCleanerPluginFactory;

#endif
4 changes: 2 additions & 2 deletions RecoTauTag/RecoTau/interface/RecoTauPiZeroPlugins.h
View file
Expand Up @@ -37,7 +37,7 @@ class RecoTauPiZeroBuilderPlugin : public RecoTauEventHolderPlugin {
// Storing the result in an auto ptr on function return allows
// allows us to safely release the ptr_vector in the virtual function
typedef std::auto_ptr<PiZeroVector> return_type;
explicit RecoTauPiZeroBuilderPlugin(const edm::ParameterSet& pset, edm::ConsumesCollector &iC):
explicit RecoTauPiZeroBuilderPlugin(const edm::ParameterSet& pset, edm::ConsumesCollector &&iC):
RecoTauEventHolderPlugin(pset) {}
virtual ~RecoTauPiZeroBuilderPlugin() {}
/// Build a collection of piZeros from objects in the input jet
Expand All @@ -60,5 +60,5 @@ class RecoTauPiZeroQualityPlugin : public RecoTauNamedPlugin {
typedef edmplugin::PluginFactory<reco::tau::RecoTauPiZeroQualityPlugin*
(const edm::ParameterSet&)> RecoTauPiZeroQualityPluginFactory;
typedef edmplugin::PluginFactory<reco::tau::RecoTauPiZeroBuilderPlugin*
(const edm::ParameterSet&, edm::ConsumesCollector &iC)> RecoTauPiZeroBuilderPluginFactory;
(const edm::ParameterSet&, edm::ConsumesCollector &&iC)> RecoTauPiZeroBuilderPluginFactory;
#endif
2 changes: 1 addition & 1 deletion RecoTauTag/RecoTau/interface/RecoTauVertexAssociator.h
View file
Expand Up @@ -50,7 +50,7 @@ class RecoTauVertexAssociator {
kCombined
};

RecoTauVertexAssociator (const edm::ParameterSet& pset, edm::ConsumesCollector& iC);
RecoTauVertexAssociator (const edm::ParameterSet& pset, edm::ConsumesCollector&& iC);
virtual ~RecoTauVertexAssociator (){}
/// Get the primary vertex associated to a given jet. Returns a null Ref if
/// no vertex is found.
Expand Down
4 changes: 2 additions & 2 deletions RecoTauTag/RecoTau/plugins/PFRecoTauDiscriminationByFlightPathSignificance.cc
View file
Expand Up @@ -30,8 +30,8 @@ class PFRecoTauDiscriminationByFlightPathSignificance
flightPathSig = iConfig.getParameter<double>("flightPathSig");
withPVError = iConfig.getParameter<bool>("UsePVerror");
booleanOutput = iConfig.getParameter<bool>("BooleanOutput");
edm::ConsumesCollector iC(consumesCollector());
vertexAssociator_ = new reco::tau::RecoTauVertexAssociator(iConfig.getParameter<ParameterSet>("qualityCuts"),iC);
// edm::ConsumesCollector iC(consumesCollector());
vertexAssociator_ = new reco::tau::RecoTauVertexAssociator(iConfig.getParameter<ParameterSet>("qualityCuts"),consumesCollector());
}

~PFRecoTauDiscriminationByFlightPathSignificance(){}
Expand Down
3 changes: 1 addition & 2 deletions RecoTauTag/RecoTau/plugins/PFRecoTauDiscriminationByIsolation.cc
View file
Expand Up @@ -78,9 +78,8 @@ class PFRecoTauDiscriminationByIsolation :
"isolationQualityCuts");

qcuts_.reset(new tau::RecoTauQualityCuts(isolationQCuts));
edm::ConsumesCollector iC(consumesCollector());
vertexAssociator_.reset(
new tau::RecoTauVertexAssociator(qualityCutsPSet_,iC));
new tau::RecoTauVertexAssociator(qualityCutsPSet_,consumesCollector()));

applyDeltaBeta_ = pset.exists("applyDeltaBetaCorrection") ?
pset.getParameter<bool>("applyDeltaBetaCorrection") : false;
Expand Down
4 changes: 2 additions & 2 deletions RecoTauTag/RecoTau/plugins/RecoTauBuilderCombinatoricPlugin.cc
View file
Expand Up @@ -17,7 +17,7 @@ namespace reco { namespace tau {

class RecoTauBuilderCombinatoricPlugin : public RecoTauBuilderPlugin {
public:
explicit RecoTauBuilderCombinatoricPlugin(const edm::ParameterSet& pset, edm::ConsumesCollector & iC);
explicit RecoTauBuilderCombinatoricPlugin(const edm::ParameterSet& pset, edm::ConsumesCollector && iC);
virtual ~RecoTauBuilderCombinatoricPlugin() {}
virtual return_type operator() (const reco::PFJetRef& jet,
const std::vector<RecoTauPiZero>& piZeros,
Expand All @@ -36,7 +36,7 @@ class RecoTauBuilderCombinatoricPlugin : public RecoTauBuilderPlugin {
};

RecoTauBuilderCombinatoricPlugin::RecoTauBuilderCombinatoricPlugin(
const edm::ParameterSet& pset, edm::ConsumesCollector & iC): RecoTauBuilderPlugin(pset, iC),
const edm::ParameterSet& pset, edm::ConsumesCollector && iC): RecoTauBuilderPlugin(pset,std::move(iC)),
qcuts_(pset.getParameterSet(
"qualityCuts").getParameterSet("signalQualityCuts")),
usePFLeptonsAsChargedHadrons_(pset.getParameter<bool>("usePFLeptons")),
Expand Down
4 changes: 2 additions & 2 deletions RecoTauTag/RecoTau/plugins/RecoTauBuilderConePlugin.cc
View file
Expand Up @@ -30,7 +30,7 @@ namespace reco { namespace tau {

class RecoTauBuilderConePlugin : public RecoTauBuilderPlugin {
public:
explicit RecoTauBuilderConePlugin(const edm::ParameterSet& pset,edm::ConsumesCollector &iC);
explicit RecoTauBuilderConePlugin(const edm::ParameterSet& pset,edm::ConsumesCollector &&iC);
~RecoTauBuilderConePlugin() {}
// Build a tau from a jet
return_type operator()(const reco::PFJetRef& jet,
Expand All @@ -54,7 +54,7 @@ class RecoTauBuilderConePlugin : public RecoTauBuilderPlugin {

// ctor - initialize all of our variables
RecoTauBuilderConePlugin::RecoTauBuilderConePlugin(
const edm::ParameterSet& pset, edm::ConsumesCollector &iC):RecoTauBuilderPlugin(pset,iC),
const edm::ParameterSet& pset, edm::ConsumesCollector &&iC):RecoTauBuilderPlugin(pset,std::move(iC)),
qcuts_(pset.getParameterSet(
"qualityCuts").getParameterSet("signalQualityCuts")),
usePFLeptonsAsChargedHadrons_(pset.getParameter<bool>("usePFLeptons")),
Expand Down
3 changes: 1 addition & 2 deletions RecoTauTag/RecoTau/plugins/RecoTauCleaner.cc
View file
Expand Up @@ -68,15 +68,14 @@ RecoTauCleanerImpl<Prod>::RecoTauCleanerImpl(const edm::ParameterSet& pset) {
typedef std::vector<edm::ParameterSet> VPSet;
// Get each of our tau builders
const VPSet& cleaners = pset.getParameter<VPSet>("cleaners");
edm::ConsumesCollector iC(consumesCollector());
for (VPSet::const_iterator cleanerPSet = cleaners.begin();
cleanerPSet != cleaners.end(); ++cleanerPSet) {
// Get plugin name
const std::string& pluginType =
cleanerPSet->getParameter<std::string>("plugin");
// Build the plugin
cleaners_.push_back(
RecoTauCleanerPluginFactory::get()->create(pluginType, *cleanerPSet, iC));
RecoTauCleanerPluginFactory::get()->create(pluginType, *cleanerPSet, consumesCollector()));
}

// Check if we want to apply a final output selection
Expand Down
4 changes: 2 additions & 2 deletions RecoTauTag/RecoTau/plugins/RecoTauDiscriminantCleanerPlugin.cc
View file
Expand Up @@ -14,7 +14,7 @@ namespace reco { namespace tau {

class RecoTauDiscriminantCleanerPlugin : public RecoTauCleanerPlugin {
public:
RecoTauDiscriminantCleanerPlugin(const edm::ParameterSet& pset, edm::ConsumesCollector &iC);
RecoTauDiscriminantCleanerPlugin(const edm::ParameterSet& pset, edm::ConsumesCollector &&iC);
virtual ~RecoTauDiscriminantCleanerPlugin(){}

// Get discriminant value for a given tau Ref
Expand All @@ -29,7 +29,7 @@ class RecoTauDiscriminantCleanerPlugin : public RecoTauCleanerPlugin {
};

RecoTauDiscriminantCleanerPlugin::RecoTauDiscriminantCleanerPlugin(
const edm::ParameterSet& pset, edm::ConsumesCollector &iC):RecoTauCleanerPlugin(pset,iC) {
const edm::ParameterSet& pset, edm::ConsumesCollector &&iC):RecoTauCleanerPlugin(pset,std::move(iC)) {
discriminatorSrc_ = pset.getParameter<edm::InputTag>("src");
discriminator_token = iC.consumes<PFTauDiscriminator>(discriminatorSrc_);
}
Expand Down
4 changes: 2 additions & 2 deletions RecoTauTag/RecoTau/plugins/RecoTauElectronRejectionPlugin.cc
View file
Expand Up @@ -23,7 +23,7 @@ namespace reco { namespace tau {

class RecoTauElectronRejectionPlugin : public RecoTauModifierPlugin {
public:
explicit RecoTauElectronRejectionPlugin(const edm::ParameterSet& pset, edm::ConsumesCollector &iC);
explicit RecoTauElectronRejectionPlugin(const edm::ParameterSet& pset, edm::ConsumesCollector && iC);
virtual ~RecoTauElectronRejectionPlugin() {}
void operator()(PFTau&) const override;
private:
Expand All @@ -37,7 +37,7 @@ class RecoTauElectronRejectionPlugin : public RecoTauModifierPlugin {
};

RecoTauElectronRejectionPlugin::RecoTauElectronRejectionPlugin(
const edm::ParameterSet& pset, edm::ConsumesCollector &iC):RecoTauModifierPlugin(pset, iC) {
const edm::ParameterSet& pset, edm::ConsumesCollector && iC):RecoTauModifierPlugin(pset,std::move(iC)) {
// Load parameters
ElecPreIDLeadTkMatch_maxDR_ =
pset.getParameter<double>("ElecPreIDLeadTkMatch_maxDR");
Expand Down
6 changes: 3 additions & 3 deletions RecoTauTag/RecoTau/plugins/RecoTauEnergyRecoveryPlugin.cc
View file
Expand Up @@ -32,7 +32,7 @@ class RecoTauEnergyRecoveryPlugin : public RecoTauModifierPlugin
{
public:

explicit RecoTauEnergyRecoveryPlugin(const edm::ParameterSet&, edm::ConsumesCollector &iC);
explicit RecoTauEnergyRecoveryPlugin(const edm::ParameterSet&, edm::ConsumesCollector &&iC);
virtual ~RecoTauEnergyRecoveryPlugin();
void operator()(PFTau&) const override;
virtual void beginEvent() override;
Expand All @@ -50,8 +50,8 @@ class RecoTauEnergyRecoveryPlugin : public RecoTauModifierPlugin
double lev1EtaWindow_;
};

RecoTauEnergyRecoveryPlugin::RecoTauEnergyRecoveryPlugin(const edm::ParameterSet& cfg, edm::ConsumesCollector &iC)
: RecoTauModifierPlugin(cfg, iC),
RecoTauEnergyRecoveryPlugin::RecoTauEnergyRecoveryPlugin(const edm::ParameterSet& cfg, edm::ConsumesCollector &&iC)
: RecoTauModifierPlugin(cfg, std::move(iC)),
theEventVertex_(0),
corrLevel_(cfg.getParameter<unsigned>("corrLevel")),
lev1PhiWindow_(cfg.getParameter<double>("lev1PhiWindow")),
Expand Down
6 changes: 3 additions & 3 deletions RecoTauTag/RecoTau/plugins/RecoTauEnergyRecoveryPlugin2.cc
View file
Expand Up @@ -38,7 +38,7 @@ class RecoTauEnergyRecoveryPlugin2 : public RecoTauModifierPlugin
{
public:

explicit RecoTauEnergyRecoveryPlugin2(const edm::ParameterSet&, edm::ConsumesCollector &iC);
explicit RecoTauEnergyRecoveryPlugin2(const edm::ParameterSet&, edm::ConsumesCollector &&iC);
virtual ~RecoTauEnergyRecoveryPlugin2();
void operator()(PFTau&) const override;
virtual void beginEvent() override;
Expand All @@ -48,8 +48,8 @@ class RecoTauEnergyRecoveryPlugin2 : public RecoTauModifierPlugin
double dRcone_;
};

RecoTauEnergyRecoveryPlugin2::RecoTauEnergyRecoveryPlugin2(const edm::ParameterSet& cfg, edm::ConsumesCollector &iC)
: RecoTauModifierPlugin(cfg, iC),
RecoTauEnergyRecoveryPlugin2::RecoTauEnergyRecoveryPlugin2(const edm::ParameterSet& cfg, edm::ConsumesCollector &&iC)
: RecoTauModifierPlugin(cfg, std::move(iC)),
dRcone_(cfg.getParameter<double>("dRcone"))
{}

Expand Down
8 changes: 4 additions & 4 deletions RecoTauTag/RecoTau/plugins/RecoTauImpactParameterSignificancePlugin.cc
View file
Expand Up @@ -29,7 +29,7 @@ namespace reco { namespace tau {
class RecoTauImpactParameterSignificancePlugin : public RecoTauModifierPlugin {
public:
explicit RecoTauImpactParameterSignificancePlugin(
const edm::ParameterSet& pset,edm::ConsumesCollector &iC);
const edm::ParameterSet& pset,edm::ConsumesCollector &&iC);
virtual ~RecoTauImpactParameterSignificancePlugin() {}
void operator()(PFTau& tau) const override;
virtual void beginEvent() override;
Expand All @@ -39,9 +39,9 @@ class RecoTauImpactParameterSignificancePlugin : public RecoTauModifierPlugin {
};

RecoTauImpactParameterSignificancePlugin
::RecoTauImpactParameterSignificancePlugin(const edm::ParameterSet& pset,edm::ConsumesCollector &iC)
:RecoTauModifierPlugin(pset, iC),
vertexAssociator_(pset.getParameter<edm::ParameterSet>("qualityCuts"),iC){}
::RecoTauImpactParameterSignificancePlugin(const edm::ParameterSet& pset,edm::ConsumesCollector &&iC)
:RecoTauModifierPlugin(pset,std::move(iC)),
vertexAssociator_(pset.getParameter<edm::ParameterSet>("qualityCuts"),std::move(iC)){}

void RecoTauImpactParameterSignificancePlugin::beginEvent() {
vertexAssociator_.setEvent(*evt());
Expand Down
4 changes: 2 additions & 2 deletions RecoTauTag/RecoTau/plugins/RecoTauPhotonFilter.cc
View file
Expand Up @@ -19,7 +19,7 @@ namespace reco { namespace tau {
// Filter photons
class RecoTauPhotonFilter : public RecoTauModifierPlugin {
public:
explicit RecoTauPhotonFilter(const edm::ParameterSet& pset, edm::ConsumesCollector &iC);
explicit RecoTauPhotonFilter(const edm::ParameterSet& pset, edm::ConsumesCollector &&iC);
virtual ~RecoTauPhotonFilter() {}
void operator()(PFTau&) const override;
private:
Expand All @@ -30,7 +30,7 @@ class RecoTauPhotonFilter : public RecoTauModifierPlugin {
};

RecoTauPhotonFilter::RecoTauPhotonFilter(
const edm::ParameterSet& pset, edm::ConsumesCollector &iC):RecoTauModifierPlugin(pset,iC) {
const edm::ParameterSet& pset, edm::ConsumesCollector &&iC):RecoTauModifierPlugin(pset,std::move(iC)) {
minPtFractionSinglePhotons_ =
pset.getParameter<double>("minPtFractionSinglePhotons");
minPtFractionPiZeroes_ =
Expand Down
4 changes: 2 additions & 2 deletions RecoTauTag/RecoTau/plugins/RecoTauPiZeroCombinatoricPlugin.cc
View file
Expand Up @@ -27,7 +27,7 @@ namespace reco { namespace tau {

class RecoTauPiZeroCombinatoricPlugin : public RecoTauPiZeroBuilderPlugin {
public:
explicit RecoTauPiZeroCombinatoricPlugin(const edm::ParameterSet& pset, edm::ConsumesCollector &iC);
explicit RecoTauPiZeroCombinatoricPlugin(const edm::ParameterSet& pset, edm::ConsumesCollector &&iC);
~RecoTauPiZeroCombinatoricPlugin() {}
// Return type is auto_ptr<PiZeroVector>
return_type operator()(const reco::PFJet& jet) const override;
Expand All @@ -42,7 +42,7 @@ class RecoTauPiZeroCombinatoricPlugin : public RecoTauPiZeroBuilderPlugin {
};

RecoTauPiZeroCombinatoricPlugin::RecoTauPiZeroCombinatoricPlugin(
const edm::ParameterSet& pset, edm::ConsumesCollector &iC):RecoTauPiZeroBuilderPlugin(pset,iC),
const edm::ParameterSet& pset, edm::ConsumesCollector &&iC):RecoTauPiZeroBuilderPlugin(pset,std::move(iC)),
qcuts_(pset.getParameterSet(
"qualityCuts").getParameterSet("signalQualityCuts")) {
minMass_ = pset.getParameter<double>("minMass");
Expand Down
3 changes: 1 addition & 2 deletions RecoTauTag/RecoTau/plugins/RecoTauPiZeroProducer.cc
View file
Expand Up @@ -79,15 +79,14 @@ RecoTauPiZeroProducer::RecoTauPiZeroProducer(const edm::ParameterSet& pset) {

// Get each of our PiZero builders
const VPSet& builders = pset.getParameter<VPSet>("builders");
edm::ConsumesCollector iC(consumesCollector());
for (VPSet::const_iterator builderPSet = builders.begin();
builderPSet != builders.end(); ++builderPSet) {
// Get plugin name
const std::string& pluginType =
builderPSet->getParameter<std::string>("plugin");
// Build the plugin
builders_.push_back(RecoTauPiZeroBuilderPluginFactory::get()->create(
pluginType, *builderPSet, iC));
pluginType, *builderPSet, consumesCollector()));
}

// Get each of our quality rankers
Expand Down
8 changes: 4 additions & 4 deletions RecoTauTag/RecoTau/plugins/RecoTauPiZeroStripPlugin.cc
View file
Expand Up @@ -43,7 +43,7 @@ math::XYZTLorentzVector applyMassConstraint(

class RecoTauPiZeroStripPlugin : public RecoTauPiZeroBuilderPlugin {
public:
explicit RecoTauPiZeroStripPlugin(const edm::ParameterSet& pset, edm::ConsumesCollector & iC);
explicit RecoTauPiZeroStripPlugin(const edm::ParameterSet& pset, edm::ConsumesCollector && iC);
virtual ~RecoTauPiZeroStripPlugin() {}
// Return type is auto_ptr<PiZeroVector>
return_type operator()(const reco::PFJet& jet) const override;
Expand All @@ -67,11 +67,11 @@ class RecoTauPiZeroStripPlugin : public RecoTauPiZeroBuilderPlugin {
};

RecoTauPiZeroStripPlugin::RecoTauPiZeroStripPlugin(
const edm::ParameterSet& pset, edm::ConsumesCollector & iC):
RecoTauPiZeroBuilderPlugin(pset,iC),
const edm::ParameterSet& pset, edm::ConsumesCollector && iC):
RecoTauPiZeroBuilderPlugin(pset,std::move(iC)),
qcuts_(pset.getParameterSet(
"qualityCuts").getParameterSet("signalQualityCuts")),
vertexAssociator_(pset.getParameter<edm::ParameterSet>("qualityCuts"),iC) {
vertexAssociator_(pset.getParameter<edm::ParameterSet>("qualityCuts"),std::move(iC)) {
inputPdgIds_ = pset.getParameter<std::vector<int> >(
"stripCandidatesParticleIds");
etaAssociationDistance_ = pset.getParameter<double>(
Expand Down
8 changes: 4 additions & 4 deletions RecoTauTag/RecoTau/plugins/RecoTauPiZeroStripPlugin2.cc
View file
Expand Up @@ -50,7 +50,7 @@ namespace {
class RecoTauPiZeroStripPlugin2 : public RecoTauPiZeroBuilderPlugin
{
public:
explicit RecoTauPiZeroStripPlugin2(const edm::ParameterSet&,edm::ConsumesCollector & iC);
explicit RecoTauPiZeroStripPlugin2(const edm::ParameterSet&,edm::ConsumesCollector &&iC);
virtual ~RecoTauPiZeroStripPlugin2();
// Return type is auto_ptr<PiZeroVector>
return_type operator()(const reco::PFJet&) const override;
Expand Down Expand Up @@ -85,9 +85,9 @@ class RecoTauPiZeroStripPlugin2 : public RecoTauPiZeroBuilderPlugin
AddFourMomenta p4Builder_;
};

RecoTauPiZeroStripPlugin2::RecoTauPiZeroStripPlugin2(const edm::ParameterSet& pset, edm::ConsumesCollector & iC)
: RecoTauPiZeroBuilderPlugin(pset, iC),
vertexAssociator_(pset.getParameter<edm::ParameterSet>("qualityCuts"),iC),
RecoTauPiZeroStripPlugin2::RecoTauPiZeroStripPlugin2(const edm::ParameterSet& pset, edm::ConsumesCollector &&iC)
: RecoTauPiZeroBuilderPlugin(pset,std::move(iC)),
vertexAssociator_(pset.getParameter<edm::ParameterSet>("qualityCuts"),std::move(iC)),
qcuts_(0)
{
LogTrace("RecoTauPiZeroStripPlugin2") << "<RecoTauPiZeroStripPlugin2::RecoTauPiZeroStripPlugin2>:" ;
Expand Down
4 changes: 2 additions & 2 deletions RecoTauTag/RecoTau/plugins/RecoTauPiZeroTrivialPlugin.cc
View file
Expand Up @@ -25,15 +25,15 @@ namespace reco { namespace tau {

class RecoTauPiZeroTrivialPlugin : public RecoTauPiZeroBuilderPlugin {
public:
explicit RecoTauPiZeroTrivialPlugin(const edm::ParameterSet& pset, edm::ConsumesCollector &iC);
explicit RecoTauPiZeroTrivialPlugin(const edm::ParameterSet& pset, edm::ConsumesCollector &&iC);
~RecoTauPiZeroTrivialPlugin() {}
return_type operator()(const reco::PFJet& jet) const override;
private:
RecoTauQualityCuts qcuts_;
};

RecoTauPiZeroTrivialPlugin::RecoTauPiZeroTrivialPlugin(
const edm::ParameterSet& pset, edm::ConsumesCollector &iC):RecoTauPiZeroBuilderPlugin(pset, iC),
const edm::ParameterSet& pset, edm::ConsumesCollector &&iC):RecoTauPiZeroBuilderPlugin(pset,std::move(iC)),
qcuts_(pset.getParameterSet(
"qualityCuts").getParameterSet("signalQualityCuts")) {}

Expand Down

0 comments on commit d4417d5

Please sign in to comment.