Skip to content
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

CorrectedJetProducer: change into a global::EDProducer (75x) #11300

Merged
merged 2 commits into from
Sep 23, 2015
Merged

CorrectedJetProducer: change into a global::EDProducer (75x) #11300

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15d40b4
CorrectedJetProducer: change into a global::EDProducer
fwyzard Sep 16, 2015
4935c97
replace GNU/C99 VLA with std::vector
fwyzard Sep 18, 2015
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
35 changes: 17 additions & 18 deletions JetMETCorrections/Modules/interface/CorrectedJetProducer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "DataFormats/Common/interface/Handle.h"
#include "DataFormats/Common/interface/Ref.h"
#include "DataFormats/Common/interface/RefToBase.h"
#include "FWCore/Framework/interface/EDProducer.h"
#include "FWCore/Framework/interface/global/EDProducer.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/EventSetup.h"
#include "FWCore/Utilities/interface/InputTag.h"
Expand All @@ -25,19 +25,17 @@ namespace edm
namespace reco
{
template<class T>
class CorrectedJetProducer : public edm::EDProducer
class CorrectedJetProducer : public edm::global::EDProducer<>
{
public:
typedef std::vector<T> JetCollection;
explicit CorrectedJetProducer (const edm::ParameterSet& fParameters);
virtual ~CorrectedJetProducer () {}
virtual void produce(edm::Event&, const edm::EventSetup&);
virtual void produce(edm::StreamID, edm::Event&, const edm::EventSetup&) const override;
private:
edm::EDGetTokenT<JetCollection> mInput;
std::vector <edm::EDGetTokenT<reco::JetCorrector> > mCorrectorTokens;
// cache
std::vector <const reco::JetCorrector*> mCorrectors;
bool mVerbose;
const edm::EDGetTokenT<JetCollection> mInput;
const std::vector <edm::EDGetTokenT<reco::JetCorrector> > mCorrectorTokens;
const bool mVerbose;
};
}

Expand All @@ -49,7 +47,6 @@ namespace reco {
CorrectedJetProducer<T>::CorrectedJetProducer(const edm::ParameterSet& fConfig)
: mInput(consumes<JetCollection>(fConfig.getParameter <edm::InputTag> ("src")))
, mCorrectorTokens(edm::vector_transform(fConfig.getParameter<std::vector<edm::InputTag> >("correctors"), [this](edm::InputTag const & tag){return consumes<reco::JetCorrector>(tag);}))
, mCorrectors(mCorrectorTokens.size(), 0)
, mVerbose (fConfig.getUntrackedParameter <bool> ("verbose", false))
{
std::string alias = fConfig.getUntrackedParameter <std::string> ("alias", "");
Expand All @@ -60,15 +57,17 @@ namespace reco {
}

template<class T>
void CorrectedJetProducer<T>::produce(edm::Event& fEvent,
const edm::EventSetup& fSetup)
void CorrectedJetProducer<T>::produce(edm::StreamID, edm::Event& fEvent, const edm::EventSetup& fSetup) const
{
// cache - note that variable length arrays are a GCC extension
reco::JetCorrector const * correctors[mCorrectorTokens.size()];
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please don't use this construct since it is not in the C++ standard. Using a std::vector<> here is not going to even show up on the performance I bet.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not against avoiding the extensions, but if we do want to enforce it, can we add -Werror=vla to compiler options to prevent it ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

By the way, I wouldn't mind using a boost::small_vector<> .
Can we has boost 1.58 ?


// look for correctors
for (unsigned i = 0; i < mCorrectorTokens.size(); i++)
{
edm::Handle <reco::JetCorrector> handle;
fEvent.getByToken (mCorrectorTokens [i], handle);
mCorrectors [i] = &*handle;
correctors[i] = handle.product();
}
edm::Handle<JetCollection> jets; //Define Inputs
fEvent.getByToken (mInput, jets); //Get Inputs
Expand All @@ -83,15 +82,15 @@ namespace reco {
if (mVerbose)
std::cout<<"CorrectedJetProducer::produce-> original jet: "
<<jet->print()<<std::endl;
for (unsigned i = 0; i < mCorrectors.size(); ++i)
for (unsigned i = 0; i < mCorrectorTokens.size(); ++i)
{
if ( !(mCorrectors[i]->vectorialCorrection()) ) {
if ( !(correctors[i]->vectorialCorrection()) ) {
// Scalar correction
double scale = 1.;
if (!(mCorrectors[i]->refRequired()))
scale = mCorrectors[i]->correction (*referenceJet);
if (!(correctors[i]->refRequired()))
scale = correctors[i]->correction (*referenceJet);
else
scale = mCorrectors[i]->correction (*referenceJet,jetRef);
scale = correctors[i]->correction (*referenceJet,jetRef);
if (mVerbose)
std::cout<<"CorrectedJetProducer::produce-> Corrector # "
<<i<<", correction factor: "<<scale<<std::endl;
Expand All @@ -100,7 +99,7 @@ namespace reco {
} else {
// Vectorial correction
reco::JetCorrector::LorentzVector corrected;
double scale = mCorrectors[i]->correction (*referenceJet, jetRef, corrected);
double scale = correctors[i]->correction (*referenceJet, jetRef, corrected);
if (mVerbose)
std::cout<<"CorrectedJetProducer::produce-> Corrector # "
<<i<<", correction factor: "<<scale<<std::endl;
Expand Down