diff --git a/NANOProducer/test/produceNANO.py b/NANOProducer/test/produceNANO.py index 0f598cf..e1c823b 100644 --- a/NANOProducer/test/produceNANO.py +++ b/NANOProducer/test/produceNANO.py @@ -200,7 +200,8 @@ jetCorrections = jetCorrectionsAK4PFchs, pfCandidates = cms.InputTag('packedPFCandidates'), pvSource = cms.InputTag("offlineSlimmedPrimaryVertices"), - svSource = cms.InputTag('adaptedSlimmedSecondaryVertices'), + #svSource = cms.InputTag('adaptedSlimmedSecondaryVertices'), + svSource = cms.InputTag('slimmedSecondaryVertices'), muSource = cms.InputTag('slimmedMuons'), elSource = cms.InputTag('slimmedElectrons'), btagInfos = [ @@ -218,7 +219,8 @@ electronSrc = cms.InputTag("slimmedElectrons"), shallow_tag_infos = cms.InputTag('pfDeepCSVTagInfosXTag'), vertices = cms.InputTag('offlineSlimmedPrimaryVertices'), - secondary_vertices = cms.InputTag("adaptedSlimmedSecondaryVertices") + #secondary_vertices = cms.InputTag("adaptedSlimmedSecondaryVertices") + secondary_vertices = cms.InputTag("slimmedSecondaryVertices") ) process.nanoTable = cms.EDProducer("NANOProducer", @@ -293,7 +295,7 @@ electronPtThreshold = cms.double(1.), ) #process.load('RecoVertex.AdaptiveVertexFinder.inclusiveVertexing_cff') -process.load('LLPReco.NANOProducer.adaptedSV_cff') +#process.load('LLPReco.NANOProducer.adaptedSV_cff') process.selectedMuonsForFilter = cms.EDFilter("CandViewSelector", @@ -324,14 +326,14 @@ process.llpnanoAOD_step = cms.Path( process.muonFilterSequence+ process.nanoSequence+ - process.adaptedVertexing+ + #process.adaptedVertexing+ process.pfXTagInfos+ process.nanoTable ) else: process.llpnanoAOD_step = cms.Path( process.nanoSequenceMC+ - process.adaptedVertexing+ + #process.adaptedVertexing+ process.pfXTagInfos+ process.displacedGenVertexSequence+ process.llpGenDecayInfo+ diff --git a/XTagInfoProducer/plugins/XTagInfoProducer.cc b/XTagInfoProducer/plugins/XTagInfoProducer.cc index d4143b3..f78410f 100644 --- a/XTagInfoProducer/plugins/XTagInfoProducer.cc +++ b/XTagInfoProducer/plugins/XTagInfoProducer.cc @@ -612,9 +612,15 @@ XTagInfoProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) elec_features.elec_superClusterFbrem = -1.; } elec_features.elec_e5x5 = electron.e5x5(); + elec_features.elec_e5x5Rel = electron.e5x5()/jet.pt(); elec_features.elec_e1x5Overe5x5 = electron.e1x5()/electron.e5x5(); elec_features.elec_e2x5MaxOvere5x5 = electron.e2x5Max()/electron.e5x5(); + + if (electron.e5x5() == 0){ + elec_features.elec_e1x5Overe5x5 = -1.; + elec_features.elec_e2x5MaxOvere5x5 = -1.; + } elec_features.elec_hcalOverEcal = electron.hcalOverEcal(); elec_features.elec_hcalDepth1OverEcal = electron.hcalDepth1OverEcal(); elec_features.elec_hcalDepth2OverEcal = electron.hcalDepth2OverEcal();