Skip to content

Commit 0d00deb

Browse files
matteosan1matteosan1
committed
Merged CMSSW_7_1_X from repository cms-sw
2 parents 7f9daa1 + f84098a commit 0d00deb

File tree

276 files changed

+163090
-29707
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

276 files changed

+163090
-29707
lines changed

‎Calibration/HcalIsolatedTrackReco/python/HITmixedPairRegGenerator_cfi.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
HITmixedPairRegGenerator = cms.EDProducer("SeedGeneratorFromRegionHitsEDProducer",
44
OrderedHitsFactoryPSet = cms.PSet(
55
ComponentName = cms.string('StandardHitPairGenerator'),
6-
SeedingLayers = cms.string('MixedLayerPairs')
6+
SeedingLayers = cms.InputTag('MixedLayerPairs')
77
),
88
SeedComparitorPSet = cms.PSet(
99
ComponentName = cms.string('none')

‎Calibration/HcalIsolatedTrackReco/python/HITpixelPairRegGenerator_cfi.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
HITpixelPairRegGenerator = cms.EDProducer("SeedGeneratorFromRegionHitsEDProducer",
44
OrderedHitsFactoryPSet = cms.PSet(
55
ComponentName = cms.string('StandardHitPairGenerator'),
6-
SeedingLayers = cms.string('PixelLayerPairs')
6+
SeedingLayers = cms.InputTag('PixelLayerPairs')
77
),
88
SeedComparitorPSet = cms.PSet(
99
ComponentName = cms.string('none')

‎Calibration/HcalIsolatedTrackReco/python/HITpixelTripletRegGenerator_cfi.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
HITpixelTripletRegGenerator = cms.EDProducer("SeedGeneratorFromRegionHitsEDProducer",
55
OrderedHitsFactoryPSet = cms.PSet(
66
ComponentName = cms.string('StandardHitTripletGenerator'),
7-
SeedingLayers = cms.string('PixelLayerTriplets'),
7+
SeedingLayers = cms.InputTag('PixelLayerTriplets'),
88
PixelTripletHLTGenerator = cms.PSet(
99
useBending = cms.bool(True),
1010
useFixedPreFiltering = cms.bool(False),

‎EgammaAnalysis/ElectronTools/interface/EGammaCutBasedEleId.h

+11-6
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include "DataFormats/VertexReco/interface/Vertex.h"
1515
#include "DataFormats/VertexReco/interface/VertexFwd.h"
1616
#endif
17+
#include "EgammaAnalysis/ElectronTools/interface/ElectronEffectiveArea.h"
1718

1819
#include <vector>
1920

@@ -79,7 +80,8 @@ bool PassWP(const WorkingPoint workingPoint,
7980
const double &iso_ch,
8081
const double &iso_em,
8182
const double &iso_nh,
82-
const double &rho);
83+
const double &rho,
84+
ElectronEffectiveArea::ElectronEffectiveAreaTarget EAtarget);
8385

8486

8587
bool PassWP(const WorkingPoint workingPoint,
@@ -90,7 +92,8 @@ bool PassWP(const WorkingPoint workingPoint,
9092
const double &iso_ch,
9193
const double &iso_em,
9294
const double &iso_nh,
93-
const double &rho);
95+
const double &rho,
96+
ElectronEffectiveArea::ElectronEffectiveAreaTarget EAtarget);
9497

9598

9699
bool PassTriggerCuts(const TriggerWorkingPoint triggerWorkingPoint, const reco::GsfElectronRef &ele);
@@ -109,7 +112,8 @@ unsigned int TestWP(const WorkingPoint workingPoint,
109112
const double &iso_ch,
110113
const double &iso_em,
111114
const double &iso_nh,
112-
const double &rho);
115+
const double &rho,
116+
ElectronEffectiveArea::ElectronEffectiveAreaTarget EAtarget);
113117

114118
unsigned int TestWP(const WorkingPoint workingPoint,
115119
const reco::GsfElectron &ele,
@@ -119,7 +123,8 @@ unsigned int TestWP(const WorkingPoint workingPoint,
119123
const double &iso_ch,
120124
const double &iso_em,
121125
const double &iso_nh,
122-
const double &rho);
126+
const double &rho,
127+
ElectronEffectiveArea::ElectronEffectiveAreaTarget EAtarget);
123128

124129
#endif
125130

@@ -132,7 +137,7 @@ unsigned int TestWP(const WorkingPoint workingPoint,
132137
bool PassWP(WorkingPoint workingPoint, const bool isEB, const float pt, const float eta,
133138
const float dEtaIn, const float dPhiIn, const float sigmaIEtaIEta, const float hoe,
134139
const float ooemoop, const float d0vtx, const float dzvtx, const float iso_ch, const float iso_em, const float iso_nh,
135-
const bool vtxFitConversion, const unsigned int mHits, const double rho);
140+
const bool vtxFitConversion, const unsigned int mHits, const double rho, ElectronEffectiveArea::ElectronEffectiveAreaTarget EAtarget);
136141

137142
bool PassTriggerCuts(const TriggerWorkingPoint triggerWorkingPoint, const bool isEB, const float pt,
138143
const float dEtaIn, const float dPhiIn, const float sigmaIEtaIEta, const float hoe,
@@ -143,7 +148,7 @@ bool PassEoverPCuts(const float eta, const float eopin, const float fbrem);
143148
unsigned int TestWP(WorkingPoint workingPoint, const bool isEB, const float pt, const float eta,
144149
const float dEtaIn, const float dPhiIn, const float sigmaIEtaIEta, const float hoe,
145150
const float ooemoop, const float d0vtx, const float dzvtx, const float iso_ch, const float iso_em, const float iso_nh,
146-
const bool vtxFitConversion, const unsigned int mHits, const double rho);
151+
const bool vtxFitConversion, const unsigned int mHits, const double rho, ElectronEffectiveArea::ElectronEffectiveAreaTarget EAtarget);
147152

148153
// print the bit mask
149154
void PrintDebug(unsigned int mask);

‎EgammaAnalysis/ElectronTools/src/EGammaCutBasedEleId.cc

+17-13
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@ bool EgammaCutBasedEleId::PassWP(WorkingPoint workingPoint,
1414
const double &iso_ch,
1515
const double &iso_em,
1616
const double &iso_nh,
17-
const double &rho)
17+
const double &rho,
18+
ElectronEffectiveArea::ElectronEffectiveAreaTarget EAtarget)
1819
{
1920

2021
// get the mask
21-
unsigned int mask = TestWP(workingPoint, ele, conversions, beamspot, vtxs, iso_ch, iso_em, iso_nh, rho);
22+
unsigned int mask = TestWP(workingPoint, ele, conversions, beamspot, vtxs, iso_ch, iso_em, iso_nh, rho, EAtarget);
2223

2324
// check if the desired WP passed
2425
if ((mask & PassAll) == PassAll) return true;
@@ -33,9 +34,10 @@ bool EgammaCutBasedEleId::PassWP(WorkingPoint workingPoint,
3334
const double &iso_ch,
3435
const double &iso_em,
3536
const double &iso_nh,
36-
const double &rho)
37+
const double &rho,
38+
ElectronEffectiveArea::ElectronEffectiveAreaTarget EAtarget)
3739
{
38-
return PassWP(workingPoint,*ele,conversions,beamspot,vtxs,iso_ch,iso_em,iso_nh,rho);
40+
return PassWP(workingPoint,*ele,conversions,beamspot,vtxs,iso_ch,iso_em,iso_nh,rho, EAtarget);
3941
}
4042

4143
bool EgammaCutBasedEleId::PassTriggerCuts(TriggerWorkingPoint triggerWorkingPoint, const reco::GsfElectron &ele)
@@ -88,7 +90,8 @@ unsigned int EgammaCutBasedEleId::TestWP(WorkingPoint workingPoint,
8890
const double &iso_ch,
8991
const double &iso_em,
9092
const double &iso_nh,
91-
const double &rho)
93+
const double &rho,
94+
ElectronEffectiveArea::ElectronEffectiveAreaTarget EAtarget)
9295
{
9396

9497
// get the ID variables from the electron object
@@ -123,11 +126,10 @@ unsigned int EgammaCutBasedEleId::TestWP(WorkingPoint workingPoint,
123126

124127
// get the mask value
125128
unsigned int mask = EgammaCutBasedEleId::TestWP(workingPoint, isEB, pt, eta, dEtaIn, dPhiIn,
126-
sigmaIEtaIEta, hoe, ooemoop, d0vtx, dzvtx, iso_ch, iso_em, iso_nh, vtxFitConversion, mHits, rho);
129+
sigmaIEtaIEta, hoe, ooemoop, d0vtx, dzvtx, iso_ch, iso_em, iso_nh, vtxFitConversion, mHits, rho, EAtarget);
127130

128131
// return the mask value
129132
return mask;
130-
131133
}
132134

133135
unsigned int EgammaCutBasedEleId::TestWP(WorkingPoint workingPoint,
@@ -138,8 +140,9 @@ unsigned int EgammaCutBasedEleId::TestWP(WorkingPoint workingPoint,
138140
const double &iso_ch,
139141
const double &iso_em,
140142
const double &iso_nh,
141-
const double &rho) {
142-
return TestWP(workingPoint,*ele,conversions,beamspot,vtxs,iso_ch,iso_em,iso_nh,rho);
143+
const double &rho,
144+
ElectronEffectiveArea::ElectronEffectiveAreaTarget EAtarget) {
145+
return TestWP(workingPoint,*ele,conversions,beamspot,vtxs,iso_ch,iso_em,iso_nh,rho, EAtarget);
143146
}
144147

145148

@@ -148,10 +151,10 @@ unsigned int EgammaCutBasedEleId::TestWP(WorkingPoint workingPoint,
148151
bool EgammaCutBasedEleId::PassWP(WorkingPoint workingPoint, const bool isEB, const float pt, const float eta,
149152
const float dEtaIn, const float dPhiIn, const float sigmaIEtaIEta, const float hoe,
150153
const float ooemoop, const float d0vtx, const float dzvtx, const float iso_ch, const float iso_em, const float iso_nh,
151-
const bool vtxFitConversion, const unsigned int mHits, const double rho)
154+
const bool vtxFitConversion, const unsigned int mHits, const double rho, ElectronEffectiveArea::ElectronEffectiveAreaTarget EAtarget)
152155
{
153156
unsigned int mask = EgammaCutBasedEleId::TestWP(workingPoint, isEB, pt, eta, dEtaIn, dPhiIn,
154-
sigmaIEtaIEta, hoe, ooemoop, d0vtx, dzvtx, iso_ch, iso_em, iso_nh, vtxFitConversion, mHits, rho);
157+
sigmaIEtaIEta, hoe, ooemoop, d0vtx, dzvtx, iso_ch, iso_em, iso_nh, vtxFitConversion, mHits, rho, EAtarget);
155158

156159
if ((mask & PassAll) == PassAll) return true;
157160
return false;
@@ -216,7 +219,7 @@ bool EgammaCutBasedEleId::PassEoverPCuts(const float eta, const float eopin, con
216219
unsigned int EgammaCutBasedEleId::TestWP(WorkingPoint workingPoint, const bool isEB, const float pt, const float eta,
217220
const float dEtaIn, const float dPhiIn, const float sigmaIEtaIEta, const float hoe,
218221
const float ooemoop, const float d0vtx, const float dzvtx, const float iso_ch, const float iso_em, const float iso_nh,
219-
const bool vtxFitConversion, const unsigned int mHits, const double rho)
222+
const bool vtxFitConversion, const unsigned int mHits, const double rho, ElectronEffectiveArea::ElectronEffectiveAreaTarget EAtarget)
220223
{
221224

222225
unsigned int mask = 0;
@@ -302,7 +305,8 @@ unsigned int EgammaCutBasedEleId::TestWP(WorkingPoint workingPoint, const bool i
302305
unsigned int idx = isEB ? 0 : 1;
303306

304307
// effective area for isolation
305-
float AEff = ElectronEffectiveArea::GetElectronEffectiveArea(ElectronEffectiveArea::kEleGammaAndNeutralHadronIso03, eta, ElectronEffectiveArea::kEleEAData2011);
308+
float AEff = ElectronEffectiveArea::GetElectronEffectiveArea(ElectronEffectiveArea::kEleGammaAndNeutralHadronIso03, eta, EAtarget);
309+
//float AEff = ElectronEffectiveArea::GetElectronEffectiveArea(ElectronEffectiveArea::kEleGammaAndNeutralHadronIso03, eta, ElectronEffectiveArea::kEleEAData2011);
306310

307311
// apply to neutrals
308312
double rhoPrime = std::max(rho, 0.0);

‎EgammaAnalysis/ElectronTools/src/EGammaCutBasedEleIdAnalyzer.cc

+21-4
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ Description: [one line class summary]
3535
#include "DataFormats/Common/interface/ValueMap.h"
3636
#include "DataFormats/RecoCandidate/interface/IsoDeposit.h"
3737
#include "EgammaAnalysis/ElectronTools/interface/EGammaCutBasedEleId.h"
38+
#include "EgammaAnalysis/ElectronTools/interface/ElectronEffectiveArea.h"
3839
#include "FWCore/ServiceRegistry/interface/Service.h"
3940
#include "CommonTools/UtilAlgos/interface/TFileService.h"
4041

@@ -56,6 +57,7 @@ class EGammaCutBasedEleIdAnalyzer : public edm::EDAnalyzer {
5657
~EGammaCutBasedEleIdAnalyzer();
5758

5859
static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
60+
ElectronEffectiveArea::ElectronEffectiveAreaTarget EAtarget;
5961

6062

6163
private:
@@ -77,6 +79,7 @@ class EGammaCutBasedEleIdAnalyzer : public edm::EDAnalyzer {
7779
edm::EDGetTokenT<double> rhoIsoToken_;
7880
edm::EDGetTokenT<reco::VertexCollection> primaryVertexToken_;
7981
std::vector<edm::EDGetTokenT<edm::ValueMap<double> > > isoValTokens_;
82+
std::string EAtargetToken_;
8083

8184
// debug
8285
bool printDebug_;
@@ -109,6 +112,7 @@ EGammaCutBasedEleIdAnalyzer::EGammaCutBasedEleIdAnalyzer(const edm::ParameterSet
109112
rhoIsoToken_ = consumes<double>(iConfig.getParameter<edm::InputTag>("rhoIsoInputTag"));
110113
primaryVertexToken_ = consumes<reco::VertexCollection>(iConfig.getParameter<edm::InputTag>("primaryVertexInputTag"));
111114
isoValTokens_ = edm::vector_transform(iConfig.getParameter<std::vector<edm::InputTag> >("isoValInputTags"), [this](edm::InputTag const & tag){return consumes<edm::ValueMap<double> >(tag);});
115+
EAtargetToken_ = iConfig.getParameter<std::string>("EAtarget");//EleEANoCorr, EleEAData2011, EleEASummer11MC,EleEAFall11MC, EleEAData2012/
112116

113117
// debug
114118
printDebug_ = iConfig.getParameter<bool>("printDebug");
@@ -192,10 +196,10 @@ EGammaCutBasedEleIdAnalyzer::analyze(const edm::Event& iEvent, const edm::EventS
192196
//
193197

194198
// working points
195-
bool veto = EgammaCutBasedEleId::PassWP(EgammaCutBasedEleId::VETO, ele, conversions_h, beamSpot, vtx_h, iso_ch, iso_em, iso_nh, rhoIso);
196-
bool loose = EgammaCutBasedEleId::PassWP(EgammaCutBasedEleId::LOOSE, ele, conversions_h, beamSpot, vtx_h, iso_ch, iso_em, iso_nh, rhoIso);
197-
bool medium = EgammaCutBasedEleId::PassWP(EgammaCutBasedEleId::MEDIUM, ele, conversions_h, beamSpot, vtx_h, iso_ch, iso_em, iso_nh, rhoIso);
198-
bool tight = EgammaCutBasedEleId::PassWP(EgammaCutBasedEleId::TIGHT, ele, conversions_h, beamSpot, vtx_h, iso_ch, iso_em, iso_nh, rhoIso);
199+
bool veto = EgammaCutBasedEleId::PassWP(EgammaCutBasedEleId::VETO, ele, conversions_h, beamSpot, vtx_h, iso_ch, iso_em, iso_nh, rhoIso, EAtarget);
200+
bool loose = EgammaCutBasedEleId::PassWP(EgammaCutBasedEleId::LOOSE, ele, conversions_h, beamSpot, vtx_h, iso_ch, iso_em, iso_nh, rhoIso, EAtarget);
201+
bool medium = EgammaCutBasedEleId::PassWP(EgammaCutBasedEleId::MEDIUM, ele, conversions_h, beamSpot, vtx_h, iso_ch, iso_em, iso_nh, rhoIso, EAtarget);
202+
bool tight = EgammaCutBasedEleId::PassWP(EgammaCutBasedEleId::TIGHT, ele, conversions_h, beamSpot, vtx_h, iso_ch, iso_em, iso_nh, rhoIso, EAtarget);
199203

200204
// eop/fbrem cuts for extra tight ID
201205
bool fbremeopin = EgammaCutBasedEleId::PassEoverPCuts(ele);
@@ -242,6 +246,19 @@ EGammaCutBasedEleIdAnalyzer::analyze(const edm::Event& iEvent, const edm::EventS
242246
void
243247
EGammaCutBasedEleIdAnalyzer::beginJob()
244248
{
249+
if( EAtargetToken_ == "EleEANoCorr")
250+
EAtarget =ElectronEffectiveArea::kEleEANoCorr;
251+
else if( EAtargetToken_ == "EleEAData2011")
252+
EAtarget =ElectronEffectiveArea::kEleEAData2011;
253+
else if( EAtargetToken_ == "EleEASummer11MC")
254+
EAtarget =ElectronEffectiveArea::kEleEASummer11MC;
255+
else if( EAtargetToken_ == "EleEAFall11MC")
256+
EAtarget =ElectronEffectiveArea::kEleEAFall11MC;
257+
else if( EAtargetToken_ == "EleEAData2012")
258+
EAtarget =ElectronEffectiveArea::kEleEAData2012;
259+
else
260+
EAtarget =ElectronEffectiveArea::kEleEAData2012;
261+
245262
}
246263

247264
// ------------ method called once each job just after ending the event loop ------------

‎FastSimulation/Tracking/python/HLTPixelTracksProducer_cfi.py

+8
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
)
2525
)
2626

27+
28+
2729
hltFastPixelHitsVertex = FastSimulation.HighLevelTrigger.DummyModule_cfi.dummyModule.clone()
2830
hltFastPixelTracks = hltPixelTracks.clone()
2931
hltFastPixelTracksRecover = hltPixelTracks.clone()
@@ -40,3 +42,9 @@
4042
hltFastPVPixelTracks = hltPixelTracks.clone()
4143
hltFastPVPixelTracksRecover = hltPixelTracks.clone()
4244

45+
hltPixelLayerPairs = FastSimulation.HighLevelTrigger.DummyModule_cfi.dummyModule.clone()
46+
hltPixelLayerTriplets = FastSimulation.HighLevelTrigger.DummyModule_cfi.dummyModule.clone()
47+
hltPixelLayerTripletsReg = FastSimulation.HighLevelTrigger.DummyModule_cfi.dummyModule.clone()
48+
hltPixelLayerTripletsHITHB = FastSimulation.HighLevelTrigger.DummyModule_cfi.dummyModule.clone()
49+
hltPixelLayerTripletsHITHE = FastSimulation.HighLevelTrigger.DummyModule_cfi.dummyModule.clone()
50+
hltMixedLayerPairs = FastSimulation.HighLevelTrigger.DummyModule_cfi.dummyModule.clone()

‎FastSimulation/Tracking/python/IterativeDetachedTripletStep_cff.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
# 'BPix1+BPix2+FPix1_neg',
3131
# 'BPix1+FPix1_pos+FPix2_pos',
3232
# 'BPix1+FPix1_neg+FPix2_neg']
33-
from RecoTracker.TkSeedingLayers.PixelLayerTriplets_cfi import pixellayertriplets
34-
iterativeDetachedTripletSeeds.layerList = pixellayertriplets.layerList
33+
from RecoTracker.TkSeedingLayers.PixelLayerTriplets_cfi import PixelLayerTriplets
34+
iterativeDetachedTripletSeeds.layerList = PixelLayerTriplets.layerList
3535

3636
# candidate producer
3737
#from FastSimulation.Tracking.IterativeSecondCandidateProducer_cff import *

‎FastSimulation/Tracking/python/IterativeInitialStep_cff.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
# 'BPix1+BPix2+FPix1_neg',
3030
# 'BPix1+FPix1_pos+FPix2_pos',
3131
# 'BPix1+FPix1_neg+FPix2_neg']
32-
from RecoTracker.TkSeedingLayers.PixelLayerTriplets_cfi import pixellayertriplets
33-
iterativeInitialSeeds.layerList = pixellayertriplets.layerList
32+
from RecoTracker.TkSeedingLayers.PixelLayerTriplets_cfi import PixelLayerTriplets
33+
iterativeInitialSeeds.layerList = PixelLayerTriplets.layerList
3434

3535
# candidate producer
3636
import FastSimulation.Tracking.TrackCandidateProducer_cfi

‎FastSimulation/Tracking/python/IterativeLowPtTripletStep_cff.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
# 'BPix1+BPix2+FPix1_neg',
3030
# 'BPix1+FPix1_pos+FPix2_pos',
3131
# 'BPix1+FPix1_neg+FPix2_neg']
32-
from RecoTracker.TkSeedingLayers.PixelLayerTriplets_cfi import pixellayertriplets
33-
iterativeLowPtTripletSeeds.layerList = pixellayertriplets.layerList
32+
from RecoTracker.TkSeedingLayers.PixelLayerTriplets_cfi import PixelLayerTriplets
33+
iterativeLowPtTripletSeeds.layerList = PixelLayerTriplets.layerList
3434

3535
# candidate producer
3636
import FastSimulation.Tracking.TrackCandidateProducer_cfi

‎FastSimulation/Tracking/python/PixelTripletSeedProducer_cff.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@
1717
# 'BPix1+BPix2+FPix1_neg',
1818
# 'BPix1+FPix1_pos+FPix2_pos',
1919
# 'BPix1+FPix1_neg+FPix2_neg']
20-
from RecoTracker.TkSeedingLayers.PixelLayerTriplets_cfi import pixellayertriplets
21-
pixelTripletSeeds.layerList = pixellayertriplets.layerList
20+
from RecoTracker.TkSeedingLayers.PixelLayerTriplets_cfi import PixelLayerTriplets
21+
pixelTripletSeeds.layerList = PixelLayerTriplets.layerList

0 commit comments

Comments
 (0)