diff --git a/DataFormats/interface/ElectronCandidateFeatures.h b/DataFormats/interface/ElectronCandidateFeatures.h index ca9e459..76e1d35 100644 --- a/DataFormats/interface/ElectronCandidateFeatures.h +++ b/DataFormats/interface/ElectronCandidateFeatures.h @@ -39,7 +39,6 @@ class ElectronCandidateFeatures { float elec_eSeedClusterOverP; float elec_eSeedClusterOverPout; float elec_eSuperClusterOverP; - float elec_eTopOvere5x5; // shower shape float elec_sigmaEtaEta; @@ -91,14 +90,7 @@ class ElectronCandidateFeatures { float elec_pfSumNeutralHadronEt; float elec_pfSumPUPt; - float elec_dr03TkSumPt; - - - float elec_dr03EcalRecHitSumEt; - float elec_dr03HcalDepth1TowerSumEt; - float elec_dr03HcalDepth1TowerSumEtBc; - float elec_dr03HcalDepth2TowerSumEt; - float elec_dr03HcalDepth2TowerSumEtBc; + float elec_dr04TkSumPt; float elec_dr04EcalRecHitSumEt; float elec_dr04HcalDepth1TowerSumEt; float elec_dr04HcalDepth1TowerSumEtBc; diff --git a/NANOProducer/plugins/NANOProducer.cc b/NANOProducer/plugins/NANOProducer.cc index 97fff47..dd8124b 100644 --- a/NANOProducer/plugins/NANOProducer.cc +++ b/NANOProducer/plugins/NANOProducer.cc @@ -292,7 +292,6 @@ NANOProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) std::vector elec_eSeedClusterOverP; std::vector elec_eSeedClusterOverPout; std::vector elec_eSuperClusterOverP; - std::vector elec_eTopOvere5x5; std::vector elec_deltaEtaEleClusterTrackAtCalo; std::vector elec_deltaEtaSeedClusterTrackAtCalo; @@ -326,16 +325,11 @@ NANOProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) std::vector elec_hcalDepth2OverEcal; std::vector elec_ecalPFClusterIso; std::vector elec_hcalPFClusterIso; - std::vector elec_dr03TkSumPt; - std::vector elec_dr03EcalRecHitSumEt; - std::vector elec_dr03HcalDepth1TowerSumEt; - std::vector elec_dr03HcalDepth1TowerSumEtBc; - std::vector elec_dr03HcalDepth2TowerSumEt; - std::vector elec_dr03HcalDepth2TowerSumEtBc; std::vector elec_pfSumPhotonEt; std::vector elec_pfSumChargedHadronPt; std::vector elec_pfSumNeutralHadronEt; std::vector elec_pfSumPUPt; + std::vector elec_dr04TkSumPt; std::vector elec_dr04EcalRecHitSumEt; std::vector elec_dr04HcalDepth1TowerSumEt; std::vector elec_dr04HcalDepth1TowerSumEtBc; @@ -640,7 +634,6 @@ NANOProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) elec_eSeedClusterOverP.push_back(elec_features.elec_eSeedClusterOverP ); elec_eSeedClusterOverPout.push_back(elec_features.elec_eSeedClusterOverPout ); elec_eSuperClusterOverP.push_back(elec_features.elec_eSuperClusterOverP ); - elec_eTopOvere5x5.push_back(elec_features.elec_eTopOvere5x5 ); elec_deltaEtaEleClusterTrackAtCalo.push_back(elec_features.elec_deltaEtaEleClusterTrackAtCalo ); elec_deltaEtaSeedClusterTrackAtCalo.push_back(elec_features.elec_deltaEtaSeedClusterTrackAtCalo ); @@ -674,16 +667,11 @@ NANOProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) elec_hcalDepth2OverEcal.push_back(elec_features.elec_hcalDepth2OverEcal ); elec_ecalPFClusterIso.push_back(elec_features.elec_ecalPFClusterIso ); elec_hcalPFClusterIso.push_back(elec_features.elec_hcalPFClusterIso ); - elec_dr03TkSumPt.push_back(elec_features.elec_dr03TkSumPt ); - elec_dr03EcalRecHitSumEt.push_back(elec_features.elec_dr03EcalRecHitSumEt ); - elec_dr03HcalDepth1TowerSumEt.push_back(elec_features.elec_dr03HcalDepth1TowerSumEt ); - elec_dr03HcalDepth1TowerSumEtBc.push_back(elec_features.elec_dr03HcalDepth1TowerSumEtBc ); - elec_dr03HcalDepth2TowerSumEt.push_back(elec_features.elec_dr03HcalDepth2TowerSumEt ); - elec_dr03HcalDepth2TowerSumEtBc.push_back(elec_features.elec_dr03HcalDepth2TowerSumEtBc ); elec_pfSumPhotonEt.push_back(elec_features.elec_pfSumPhotonEt ); elec_pfSumChargedHadronPt.push_back(elec_features.elec_pfSumChargedHadronPt ); elec_pfSumNeutralHadronEt.push_back(elec_features.elec_pfSumNeutralHadronEt ); elec_pfSumPUPt.push_back(elec_features.elec_pfSumPUPt ); + elec_dr04TkSumPt.push_back(elec_features.elec_dr04TkSumPt ); elec_dr04EcalRecHitSumEt.push_back(elec_features.elec_dr04EcalRecHitSumEt ); elec_dr04HcalDepth1TowerSumEt.push_back(elec_features.elec_dr04HcalDepth1TowerSumEt ); elec_dr04HcalDepth1TowerSumEtBc.push_back(elec_features.elec_dr04HcalDepth1TowerSumEtBc ); @@ -896,7 +884,6 @@ NANOProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) electronTable->addColumn("eSeedClusterOverP",elec_eSeedClusterOverP,"the seed cluster energy / track momentum at the PCA to the beam spot",nanoaod::FlatTable::FloatColumn); electronTable->addColumn("eSeedClusterOverPout",elec_eSeedClusterOverPout,"the seed cluster energy / track momentum at calo extrapolated from the outermost track state",nanoaod::FlatTable::FloatColumn); electronTable->addColumn("eSuperClusterOverP",elec_eSuperClusterOverP,"the supercluster energy / track momentum at the PCA to the beam spot",nanoaod::FlatTable::FloatColumn); - electronTable->addColumn("eTopOvere5x5",elec_eTopOvere5x5,"electron.full5x5_eTop()/ electron.full5x5_e5x5()",nanoaod::FlatTable::FloatColumn); electronTable->addColumn("deltaEtaEleClusterTrackAtCalo",elec_deltaEtaEleClusterTrackAtCalo,"doc",nanoaod::FlatTable::FloatColumn); electronTable->addColumn("deltaEtaSeedClusterTrackAtCalo",elec_deltaEtaSeedClusterTrackAtCalo,"doc",nanoaod::FlatTable::FloatColumn); @@ -932,16 +919,11 @@ NANOProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) electronTable->addColumn("hcalDepth2OverEcal",elec_hcalDepth2OverEcal,"HCAL over ECAL seed cluster energy using 2nd HCAL depth (using HCAL towers within a cone)",nanoaod::FlatTable::FloatColumn); electronTable->addColumn("ecalPFClusterIso",elec_ecalPFClusterIso,"sum pt of isolated ECAL clusters, vetoing clusters part of electron",nanoaod::FlatTable::FloatColumn); electronTable->addColumn("hcalPFClusterIso",elec_hcalPFClusterIso,"sum pt of isolated HCAL clusters, vetoing clusters part of electron",nanoaod::FlatTable::FloatColumn); - electronTable->addColumn("dr03TkSumPt",elec_dr03TkSumPt,"track iso deposit with electron footprint removed relative to the electron pt",nanoaod::FlatTable::FloatColumn); - electronTable->addColumn("dr03EcalRecHitSumEt",elec_dr03EcalRecHitSumEt,"ECAL iso deposit with electron footprint removed relative to the electron pt",nanoaod::FlatTable::FloatColumn); - electronTable->addColumn("dr03HcalDepth1TowerSumEt",elec_dr03HcalDepth1TowerSumEt,"HCAL depth 1 iso deposit with electron footprint removed relative to the electron pt",nanoaod::FlatTable::FloatColumn); - electronTable->addColumn("dr03HcalDepth1TowerSumEtBc",elec_dr03HcalDepth1TowerSumEtBc,"HCAL depth 1 iso deposit without towers behind cluster relative to the electron pt",nanoaod::FlatTable::FloatColumn); - electronTable->addColumn("dr03HcalDepth2TowerSumEt",elec_dr03HcalDepth2TowerSumEt,"HCAL depth 2 iso deposit with electron footprint removed relative to the electron pt",nanoaod::FlatTable::FloatColumn); - electronTable->addColumn("dr03HcalDepth2TowerSumEtBc",elec_dr03HcalDepth2TowerSumEtBc,"HCAL depth 2 iso deposit without towers behind cluster relative to the electron pt",nanoaod::FlatTable::FloatColumn); electronTable->addColumn("pfSumPhotonEt",elec_pfSumPhotonEt,"sum pt of PF photons // old float photonIso, relative to the electron pt",nanoaod::FlatTable::FloatColumn); electronTable->addColumn("pfSumChargedHadronPt",elec_pfSumChargedHadronPt,"sum pt of charged hadron // old float chargedHadronIso, relative to the electron pt",nanoaod::FlatTable::FloatColumn); electronTable->addColumn("pfSumNeutralHadronEt",elec_pfSumNeutralHadronEt,"sum transverse energy of neutral hadron // old float neutralHadronIso, relative to the electron pt",nanoaod::FlatTable::FloatColumn); electronTable->addColumn("pfSumPUPt",elec_pfSumPUPt,"sum pt of charged particles not from PV (for PU corrections) ",nanoaod::FlatTable::FloatColumn); + electronTable->addColumn("dr04TkSumPt",elec_dr04TkSumPt,"track iso deposit with electron footprint removed relative to the electron pt",nanoaod::FlatTable::FloatColumn); electronTable->addColumn("dr04EcalRecHitSumEt",elec_dr04EcalRecHitSumEt,"ECAL iso deposit with electron footprint removed relative to the electron pt",nanoaod::FlatTable::FloatColumn); electronTable->addColumn("dr04HcalDepth1TowerSumEt",elec_dr04HcalDepth1TowerSumEt,"HCAL depth 1 iso deposit with electron footprint removed relative to the electron pt",nanoaod::FlatTable::FloatColumn); electronTable->addColumn("dr04HcalDepth1TowerSumEtBc",elec_dr04HcalDepth1TowerSumEtBc,"HCAL depth 1 iso deposit without towers behind cluster relative to the electron pt",nanoaod::FlatTable::FloatColumn); diff --git a/XTagInfoProducer/plugins/XTagInfoProducer.cc b/XTagInfoProducer/plugins/XTagInfoProducer.cc index f78410f..8a785d8 100644 --- a/XTagInfoProducer/plugins/XTagInfoProducer.cc +++ b/XTagInfoProducer/plugins/XTagInfoProducer.cc @@ -559,8 +559,6 @@ XTagInfoProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) elec_features.elec_eSeedClusterOverP = electron.eSeedClusterOverP(); elec_features.elec_eSeedClusterOverPout = electron.eSeedClusterOverPout(); elec_features.elec_eSuperClusterOverP = electron.eSuperClusterOverP(); - elec_features.elec_eTopOvere5x5 = electron.eTop()/electron.e5x5(); - elec_features.elec_hadronicOverEm = electron.hadronicOverEm(); @@ -639,20 +637,14 @@ XTagInfoProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) - elec_features.elec_dr03TkSumPt = electron.dr03TkSumPt()/electron.pt(); - elec_features.elec_dr03EcalRecHitSumEt = electron.dr03EcalRecHitSumEt()/electron.pt(); - - elec_features.elec_dr03HcalDepth1TowerSumEt = electron.dr03HcalDepth1TowerSumEt()/electron.pt(); - elec_features.elec_dr03HcalDepth1TowerSumEtBc = electron.dr03HcalDepth1TowerSumEtBc()/electron.pt(); - elec_features.elec_dr03HcalDepth2TowerSumEt = electron.dr03HcalDepth2TowerSumEt()/electron.pt(); - elec_features.elec_dr03HcalDepth2TowerSumEtBc = electron.dr03HcalDepth2TowerSumEtBc()/electron.pt(); - elec_features.elec_pfSumPhotonEt = electron.pfIsolationVariables().sumPhotonEt/electron.pt(); elec_features.elec_pfSumChargedHadronPt = electron.pfIsolationVariables().sumChargedHadronPt/electron.pt(); elec_features.elec_pfSumNeutralHadronEt = electron.pfIsolationVariables().sumNeutralHadronEt/electron.pt(); elec_features.elec_pfSumPUPt = electron.pfIsolationVariables().sumPUPt/electron.pt(); + // isolation + elec_features.elec_dr04TkSumPt = electron.dr04TkSumPt()/electron.pt(); elec_features.elec_dr04EcalRecHitSumEt = electron.dr04EcalRecHitSumEt()/electron.pt(); elec_features.elec_dr04HcalDepth1TowerSumEt = electron.dr04HcalDepth1TowerSumEt()/electron.pt(); elec_features.elec_dr04HcalDepth1TowerSumEtBc = electron.dr04HcalDepth1TowerSumEtBc()/electron.pt();