Merge pull request #410 from amarini/submission_10X

Developments 102x
MiT-HEP · Sep 9, 2019 · aed8cbf · aed8cbf
2 parents 12ae05e + bea5416
commit aed8cbf
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 1 deletion.
diff --git a/Core/interface/BareLeptons.hpp b/Core/interface/BareLeptons.hpp
@@ -79,6 +79,11 @@ class BareLeptons : virtual public BareP4
         vector<float> *kinfitPtErr{0};
 
         TClonesArray  *fsrP4{0}; // at most 1.
+        vector<float> *dxy{0};
+        vector<float> *dz{0};
+
+        vector<float> *dxybs{0};
+        vector<float> *dzbs{0};
 
 };
 

diff --git a/Core/src/BareLeptons.cpp b/Core/src/BareLeptons.cpp
@@ -26,6 +26,10 @@ BareLeptons::~BareLeptons(){
     BareFunctions::Delete(kinfitP4);
     BareFunctions::Delete(kinfitPtErr);
     BareFunctions::Delete(fsrP4);
+    BareFunctions::Delete(dxy);
+    BareFunctions::Delete(dz);
+    BareFunctions::Delete(dxybs);
+    BareFunctions::Delete(dzbs);
 }
 
 void BareLeptons::init(){
@@ -53,6 +57,11 @@ void BareLeptons::init(){
     BareFunctions::New(kinfitP4);
     BareFunctions::New(kinfitPtErr);
     BareFunctions::New(fsrP4);
+    BareFunctions::New(dxy);
+    BareFunctions::New(dz);
+
+    BareFunctions::New(dxybs);
+    BareFunctions::New(dzbs);
 }
 
 void BareLeptons::clear(){
@@ -84,6 +93,11 @@ void BareLeptons::clear(){
     kinfitPtErr->clear();
     fsrP4->Clear();
 
+    dxy->clear();
+    dz->clear();
+    dxybs->clear();
+    dzbs->clear();
+
 }
 
 void BareLeptons::defineBranches(TTree*t){
@@ -123,6 +137,10 @@ void BareLeptons::defineBranches(TTree*t){
     t->Branch( "lepKinfitP4","TClonesArray", &kinfitP4, 128000, 0);
     t->Branch( "lepFsrP4","TClonesArray", &fsrP4, 128000, 0);
 
+    t->Branch("lepDxy","vector<float>",&dxy);
+    t->Branch("lepDz","vector<float>",&dz);
+    t->Branch("lepDxyBS","vector<float>",&dxybs);
+    t->Branch("lepDzBS","vector<float>",&dzbs);
 
 }
 
@@ -155,6 +173,12 @@ void BareLeptons::setBranchAddresses(TTree*t){
     BareFunctions::SetBranchAddress(t,"lepKinfitPtErr",&kinfitPtErr);
     BareFunctions::SetBranchAddress(t,"lepKinfitP4",&kinfitP4);
     BareFunctions::SetBranchAddress(t,"lepFsrP4",&fsrP4);
+
+    BareFunctions::SetBranchAddress(t,"lepDxy",&dxy);
+    BareFunctions::SetBranchAddress(t,"lepDz",&dz);
+
+    BareFunctions::SetBranchAddress(t,"lepDxyBS",&dxybs);
+    BareFunctions::SetBranchAddress(t,"lepDzBS",&dzbs);
 }
 
 BAREREGISTER(BareLeptons);

diff --git a/Nero/interface/NeroLeptons.hpp b/Nero/interface/NeroLeptons.hpp
@@ -9,6 +9,7 @@
 
 // Electron corrector
 #include "EgammaAnalysis/ElectronTools/interface/EnergyScaleCorrection_class.h"
+#include "DataFormats/BeamSpot/interface/BeamSpot.h"
 
 class NeroLeptons : virtual public NeroCollection,
     virtual public BareLeptons
@@ -26,7 +27,7 @@ class NeroLeptons : virtual public NeroCollection,
             public:
                 myLepton(){ chiso=-999; nhiso=-999; phoiso=-999; puiso=-999;mva = -999; miniiso=-999;
                             etasc=0; sieie=0; sipip=0; sieip=0; r9=0; ecorr=1; 
-                            resolution =-999; nlayers=-999;
+                            resolution =-999; nlayers=-999; 
                             kinfitP4.SetPxPyPzE(0,0,0,0);
                             kinfitPtErr=-999;
                             fsrP4.SetPxPyPzE(0,0,0,0);
@@ -57,6 +58,11 @@ class NeroLeptons : virtual public NeroCollection,
 
                 float resolution;
                 int nlayers;
+
+                float dxy{-999};
+                float dz{-999};
+                float dxy2{-999};
+                float dz2{-999};
 
         };
 
@@ -68,6 +74,7 @@ class NeroLeptons : virtual public NeroCollection,
         // --- Token
         edm::EDGetTokenT<reco::VertexCollection> vtx_token;
         edm::EDGetTokenT<pat::PackedCandidateCollection> token_pf;
+        edm::EDGetTokenT<reco::BeamSpot> beamspot_token;
 
         // Token
         edm::EDGetTokenT<pat::MuonCollection> mu_token;
@@ -106,6 +113,7 @@ class NeroLeptons : virtual public NeroCollection,
 
         edm::Handle<reco::VertexCollection> vtx_handle;
         edm::Handle<pat::PackedCandidateCollection> handle_pf;
+        edm::Handle<reco::BeamSpot> beamspot_handle;
 
         // for miniiso
         edm::Handle<double> rho_handle;

diff --git a/Nero/src/NeroLeptons.cpp b/Nero/src/NeroLeptons.cpp
@@ -57,6 +57,7 @@ NeroLeptons::NeroLeptons(edm::ConsumesCollector & cc,edm::ParameterSet iConfig):
 #endif
 
     vtx_token = cc.consumes<reco::VertexCollection>(iConfig.getParameter<edm::InputTag>("vertices"));
+    beamspot_token = cc.consumes<reco::BeamSpot>(edm::InputTag("offlineBeamSpot"));
     token_pf = cc.consumes<pat::PackedCandidateCollection>(iConfig.getParameter<edm::InputTag>("pfCands"));
     ea_ . reset (new EffectiveAreas( edm::FileInPath(iConfig.getParameter<std::string>("eleEA")).fullPath () ) );
     mu_token = cc.consumes<pat::MuonCollection>(iConfig.getParameter<edm::InputTag>("muons"));
@@ -121,6 +122,9 @@ int NeroLeptons::analyze(const edm::Event & iEvent)
     const reco::Vertex *pv  = &vtx_handle->front();
     iEvent.getByToken(token_pf, handle_pf);
 
+    iEvent.getByToken(beamspot_token, beamspot_handle);
+    const reco::BeamSpot *bs  = &(*beamspot_handle); // recast
+
     iEvent.getByToken(mu_token,mu_handle);	
     iEvent.getByToken(el_token,el_handle);	
 
@@ -234,6 +238,16 @@ int NeroLeptons::analyze(const edm::Event & iEvent)
             l.selBits |= unsigned(LepHighPt * myid::isHighPtMuon(mu,*pv)) ;
 
         l.pfPt = mu.pfP4().pt();
+
+        //
+        if (not mu.innerTrack().isNull())
+        {
+            l.dz = mu.innerTrack()->dz(pv->position());
+            l.dxy = mu.innerTrack()->dxy(pv->position());
+            //offlineBeamSpot
+            l.dz2 = mu.innerTrack()->dz(bs->position());
+            l.dxy2 = mu.innerTrack()->dxy(bs->position());
+        }
 
         if (mu.hasUserCand("cutBasedFsrPhoton"))
         {
@@ -379,6 +393,14 @@ int NeroLeptons::analyze(const edm::Event & iEvent)
         l.sieip = el.full5x5_sigmaIetaIphi();
         l.r9 = el.r9();
 
+        if ( not el.gsfTrack().isNull()){
+            l.dz = el.gsfTrack()->dz(pv->position());
+            l.dxy = el.gsfTrack()->dxy(pv->position());
+            //offlineBeamSpot
+            l.dz2 = el.gsfTrack()->dz(bs->position());
+            l.dxy2 = el.gsfTrack()->dxy(bs->position());
+        }
+
         // float chIso = el.chargedHadronIso();
         // float nhIso = el.neutralHadronIso();
         // float phoIso = el.photonIso();
@@ -533,6 +555,11 @@ int NeroLeptons::analyze(const edm::Event & iEvent)
         resolution -> push_back(l.resolution);
         nLayers -> push_back(l.nlayers);
 
+        dxy -> push_back(l.dxy);
+        dz -> push_back(l.dz);
+        dxybs -> push_back(l.dxy2);
+        dzbs -> push_back(l.dz2);
+
         //kinfit
         new ( (*kinfitP4)[kinfitP4->GetEntriesFast()]) TLorentzVector(l.kinfitP4);
         kinfitPtErr -> push_back(l.kinfitPtErr);

diff --git a/Nero/test/testNero.py b/Nero/test/testNero.py
@@ -416,6 +416,8 @@
 PhotonMVA="FSRPhotonRecovery/FSRPhotons/data/PhotonMVAv5_BDTG1000TreesDY.weights.xml"
 PhotonMVA="FSRPhotonRecovery/FSRPhotons/data/PhotonMVAv9_BDTG800TreesDY.weights.xml"
 addFSRphotonSequence(process, process.nero.NeroLeptons.muons.value(), PhotonMVA)
+#electrons = cms.InputTag("slimmedElectrons","","nero"),
+process.FSRRecovery.patphotons= cms.InputTag("slimmedPhotons","","nero")
 
 
 ###############################################################