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

Jump to bottom

Fix clang problems in JetMETCorrections/Type1MET #4966

Merged
merged 2 commits into from Aug 16, 2014
Merged

Fix clang problems in JetMETCorrections/Type1MET #4966

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
da7cba1
clang required explicit default constructor call
Dr15Jones Aug 15, 2014
5a642d1
Moved functions from an unnamed namespace to avoid clang problems
Dr15Jones Aug 15, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions JetMETCorrections/Type1MET/interface/CaloJetMETcorrInputProducerT.h
View file
Open in desktop
Expand Up @@ -37,7 +37,6 @@ namespace CaloJetMETcorrInputProducer_namespace
class InputTypeCheckerT
{
public:

void operator()(const T&) const {} // no type-checking needed for reco::CaloJet input
};

Expand Down Expand Up @@ -128,7 +127,7 @@ class CaloJetMETcorrInputProducerT final : public edm::global::EDProducer<>
for ( int jetIndex = 0; jetIndex < numJets; ++jetIndex ) {
const T& rawJet = jets->at(jetIndex);

const CaloJetMETcorrInputProducer_namespace::InputTypeCheckerT<T> checkInputType;
const CaloJetMETcorrInputProducer_namespace::InputTypeCheckerT<T> checkInputType{};
checkInputType(rawJet);

const CaloJetMETcorrInputProducer_namespace::RawJetExtractorT<T> rawJetExtractor;
Expand Down
30 changes: 16 additions & 14 deletions JetMETCorrections/Type1MET/interface/JetCorrExtractorT.h
View file
Open in desktop
Expand Up @@ -25,21 +25,10 @@
#include "DataFormats/JetReco/interface/Jet.h"
#include "DataFormats/Candidate/interface/Candidate.h"

namespace
namespace jetcorrextractor
{
template <typename T>
double getCorrection(const T& rawJet, const std::string& jetCorrLabel,
const edm::Event& evt, const edm::EventSetup& es)
{
const JetCorrector* jetCorrector = JetCorrector::getJetCorrector(jetCorrLabel, es);
if ( !jetCorrector )
throw cms::Exception("JetCorrExtractor")
<< "Failed to access Jet corrections for = " << jetCorrLabel << " !!\n";
return jetCorrector->correction(rawJet, evt, es);
}

// never heard of copysign?
double sign(double x)
inline double sign(double x)
{
if ( x > 0. ) return +1.;
else if ( x < 0. ) return -1.;
Expand Down Expand Up @@ -71,7 +60,7 @@ class JetCorrExtractorT
jetCorrFactor = getCorrection(rawJet, jetCorrLabel, *evt, *es);
} else {
reco::Candidate::PolarLorentzVector modJetPolarP4(rawJetP4);
modJetPolarP4.SetEta(sign(rawJetP4.eta())*jetCorrEtaMax);
modJetPolarP4.SetEta(jetcorrextractor::sign(rawJetP4.eta())*jetCorrEtaMax);

reco::Candidate::LorentzVector modJetP4(modJetPolarP4);

Expand All @@ -86,6 +75,19 @@ class JetCorrExtractorT

return corrJetP4;
}
private:

static double getCorrection(const T& rawJet, const std::string& jetCorrLabel,
const edm::Event& evt, const edm::EventSetup& es)
{
const JetCorrector* jetCorrector = JetCorrector::getJetCorrector(jetCorrLabel, es);
if ( !jetCorrector )
throw cms::Exception("JetCorrExtractor")
<< "Failed to access Jet corrections for = " << jetCorrLabel << " !!\n";
return jetCorrector->correction(rawJet, evt, es);
}


};

#endif