Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 65804
b: refs/heads/l1tmuon-upgrade-dev
c: 75cabed
h: refs/heads/l1tmuon-upgrade-dev
  • Loading branch information
Konstantinos Kousouris committed May 5, 2009
1 parent 6489788 commit 9fc5fe5
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 14 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/l1tmuon-upgrade-dev: c7768b15823c4b59f6279316ae1c3634568f1f95
refs/heads/l1tmuon-upgrade-dev: 75cabed5feabd8ad01c6ff0937d72dc4bfe75c0b
10 changes: 6 additions & 4 deletions trunk/CondFormats/JetMETObjects/interface/CombinedJetCorrector.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include <vector>
#include <string>

class SimpleL1OffsetCorrector;
class SimpleL2RelativeCorrector;
class SimpleL3AbsoluteCorrector;
class SimpleL3PFAbsoluteCorrector;
Expand All @@ -22,10 +23,10 @@ class CombinedJetCorrector
CombinedJetCorrector();
CombinedJetCorrector(std::string CorrectionLevels, std::string CorrectionTags);
CombinedJetCorrector(std::string CorrectionLevels, std::string CorrectionTags, std::string Options);
double getCorrection(double pt, double eta);
double getCorrection(double pt, double eta, double emf);
std::vector<double> getSubCorrections(double pt, double eta);
std::vector<double> getSubCorrections(double pt, double eta, double emf);
double getCorrection(double pt, double eta, double energy);
double getCorrection(double pt, double eta, double energy, double emf);
std::vector<double> getSubCorrections(double pt, double eta, double energy);
std::vector<double> getSubCorrections(double pt, double eta, double energy, double emf);
~CombinedJetCorrector();

private:
Expand All @@ -42,6 +43,7 @@ class CombinedJetCorrector
std::string mL3Option;
std::vector<std::string> mLevels;

SimpleL1OffsetCorrector* mL1Corrector;
SimpleL2RelativeCorrector* mL2Corrector;
SimpleL3AbsoluteCorrector* mL3Corrector;
SimpleL3PFAbsoluteCorrector* mL3PFCorrector;
Expand Down
31 changes: 22 additions & 9 deletions trunk/CondFormats/JetMETObjects/src/CombinedJetCorrector.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
// Email: kkousour@fnal.gov

#include "CondFormats/JetMETObjects/interface/CombinedJetCorrector.h"
#include "CondFormats/JetMETObjects/interface/SimpleL1OffsetCorrector.h"
#include "CondFormats/JetMETObjects/interface/SimpleL2RelativeCorrector.h"
#include "CondFormats/JetMETObjects/interface/SimpleL3AbsoluteCorrector.h"
#include "CondFormats/JetMETObjects/interface/SimpleL3PFAbsoluteCorrector.h"
Expand All @@ -21,6 +22,7 @@ using namespace edm;
////////////////////////////////////////////////////////////////////////////////
CombinedJetCorrector::CombinedJetCorrector()
{
mL1Corrector = new SimpleL1OffsetCorrector();
mL2Corrector = new SimpleL2RelativeCorrector();
mL3Corrector = new SimpleL3AbsoluteCorrector();
mL3PFCorrector = new SimpleL3PFAbsoluteCorrector();
Expand Down Expand Up @@ -65,7 +67,9 @@ void CombinedJetCorrector::initCorrectors(std::string CorrectionLevels, std::str
//---- Create instances of the requested sub-correctors.
for(unsigned int i=0;i<mLevels.size();i++)
{
if (mLevels[i]=="L2")
if (mLevels[i]=="L1")
mL1Corrector = new SimpleL1OffsetCorrector(DataFiles[i]);
else if (mLevels[i]=="L2")
mL2Corrector = new SimpleL2RelativeCorrector(DataFiles[i]);
else if (mLevels[i]=="L3" && ((int)Tags[i].find("Calo")>=0 || (int)Tags[i].find("JPT")>=0))
{
Expand Down Expand Up @@ -120,6 +124,7 @@ void CombinedJetCorrector::checkConsistency(std::vector<std::string> Levels, std
////////////////////////////////////////////////////////////////////////////////
CombinedJetCorrector::~CombinedJetCorrector()
{
delete mL1Corrector;
delete mL2Corrector;
delete mL3Corrector;
delete mL3PFCorrector;
Expand Down Expand Up @@ -195,14 +200,16 @@ string CombinedJetCorrector::removeSpaces(string ss)
return result;
}
////////////////////////////////////////////////////////////////////////////////
double CombinedJetCorrector::getCorrection(double pt, double eta)
double CombinedJetCorrector::getCorrection(double pt, double eta, double energy)
{
double corPt,scale,factor;
corPt = pt;
factor = 1.;
for(unsigned int i=0;i<mLevels.size();i++)
{
if (mLevels[i]== "L2")
if (mLevels[i]== "L1")
scale = mL1Corrector->correctionEnEta(energy,eta);
else if (mLevels[i]== "L2")
scale = mL2Corrector->correctionPtEta(corPt,eta);
else if (mLevels[i] == "L3" && mL3Option == "Calo")
scale = mL3Corrector->correctionPtEta(corPt,eta);
Expand All @@ -222,14 +229,16 @@ double CombinedJetCorrector::getCorrection(double pt, double eta)
return factor;
}
////////////////////////////////////////////////////////////////////////////////
double CombinedJetCorrector::getCorrection(double pt, double eta, double emf)
double CombinedJetCorrector::getCorrection(double pt, double eta, double energy, double emf)
{
double corPt,scale,factor;
corPt = pt;
factor = 1.;
for(unsigned int i=0;i<mLevels.size();i++)
{
if (mLevels[i]== "L2")
if (mLevels[i]== "L1")
scale = mL1Corrector->correctionEnEta(energy,eta);
else if (mLevels[i]== "L2")
scale = mL2Corrector->correctionPtEta(corPt,eta);
else if (mLevels[i] == "L3" && mL3Option == "Calo")
scale = mL3Corrector->correctionPtEta(corPt,eta);
Expand All @@ -250,15 +259,17 @@ double CombinedJetCorrector::getCorrection(double pt, double eta, double emf)
}
////////////////////////////////////////////////////////////////////////////////
//returns a vector with the correction factors UP to the given level/////
vector<double> CombinedJetCorrector::getSubCorrections(double pt, double eta)
vector<double> CombinedJetCorrector::getSubCorrections(double pt, double eta, double energy)
{
double corPt,scale,factor;
vector<double> factors;
corPt = pt;
factor = 1;
for(unsigned int i=0;i<mLevels.size();i++)
{
if (mLevels[i]== "L2")
if (mLevels[i]== "L1")
scale = mL1Corrector->correctionEnEta(energy,eta);
else if (mLevels[i]== "L2")
scale = mL2Corrector->correctionPtEta(corPt,eta);
else if (mLevels[i] == "L3" && mL3Option == "Calo")
scale = mL3Corrector->correctionPtEta(corPt,eta);
Expand All @@ -280,15 +291,17 @@ vector<double> CombinedJetCorrector::getSubCorrections(double pt, double eta)
}
////////////////////////////////////////////////////////////////////////////////
//returns a vector with the correction factors UP to the given level/////
vector<double> CombinedJetCorrector::getSubCorrections(double pt, double eta, double emf)
vector<double> CombinedJetCorrector::getSubCorrections(double pt, double eta, double energy, double emf)
{
double corPt,scale,factor;
vector<double> factors;
corPt = pt;
factor = 1;
for(unsigned int i=0;i<mLevels.size();i++)
{
if (mLevels[i]== "L2")
if (mLevels[i]== "L1")
scale = mL1Corrector->correctionEnEta(energy,eta);
else if (mLevels[i]== "L2")
scale = mL2Corrector->correctionPtEta(corPt,eta);
else if (mLevels[i] == "L3" && mL3Option == "Calo")
scale = mL3Corrector->correctionPtEta(corPt,eta);
Expand Down

0 comments on commit 9fc5fe5

Please sign in to comment.