Merge pull request #34 from gmelachr/from-CMSSW_15_1_0_pre3

BPH NanoAODs: increase precision and add decay modes

Author: gmelachr

PhysicsTools/BPHNano/plugins/BPHTrackMerger.cc

@@ -150,13 +150,17 @@ void BPHTrackMerger::produce(edm::StreamID, edm::Event &evt, edm::EventSetup con
 
     // clean tracks wrt to all muons
     int matchedToMuon = 0;
+    int indexToMuon = -1;
+    int mu_idx = -1;
     for (const pat::Muon &imutmp : *muons) {
+      mu_idx++;
       for (unsigned int i = 0; i < imutmp.numberOfSourceCandidatePtrs(); ++i) {
         if (!((imutmp.sourceCandidatePtr(i)).isNonnull() && (imutmp.sourceCandidatePtr(i)).isAvailable()))
           continue;
 
         const edm::Ptr<reco::Candidate> &source = imutmp.sourceCandidatePtr(i);
         if (source.id() == tracks.id() && source.key() == iTrk) {
+	  indexToMuon = mu_idx;
           matchedToMuon = 1;
           break;
         }
@@ -195,6 +199,7 @@ void BPHTrackMerger::produce(edm::StreamID, edm::Event &evt, edm::EventSetup con
     pcand.addUserFloat("DCASig", DCASig);
     pcand.addUserFloat("dzTrg", dzTrg);
     pcand.addUserInt("isMatchedToMuon", matchedToMuon);
+    pcand.addUserInt("MatchedMuonIdx", indexToMuon);    
     pcand.addUserInt("isMatchedToEle", matchedToEle);
     pcand.addUserInt("nValidHits", trk.bestTrack()->found());
     pcand.addUserInt("keyPacked", iTrk);

PhysicsTools/BPHNano/plugins/BToTrkLLBuilder.cc

@@ -122,6 +122,7 @@ void BToTrkLLBuilder::produce(edm::StreamID, edm::Event &evt, edm::EventSetup co
       cand.addUserInt("l1_idx", l1_idx);
       cand.addUserInt("l2_idx", l2_idx);
       cand.addUserInt("trk_idx", k_idx);
+      cand.addUserInt("ll_idx", ll_idx);
 
       auto dr_info = bph::min_max_dr({l1_ptr, l2_ptr, k_ptr});
       cand.addUserFloat("min_dr", dr_info.first);
@@ -167,6 +168,19 @@ void BToTrkLLBuilder::produce(edm::StreamID, edm::Event &evt, edm::EventSetup co
       if (!post_vtx_selection_(cand))
         continue;
 
+      reco::BeamSpot beamSpot = *beamspot;
+      TrajectoryStateClosestToPoint theDCAXBS = fitter.fitted_candidate_ttrk().trajectoryStateClosestToPoint(GlobalPoint(beamSpot.position().x(),beamSpot.position().y(),beamSpot.position().z()));
+      double DCAB0BS = -99.;
+      double DCAB0BSErr = -99.;
+
+      if (theDCAXBS.isValid() == true){
+          DCAB0BS    = theDCAXBS.perigeeParameters().transverseImpactParameter();
+          DCAB0BSErr = theDCAXBS.perigeeError().transverseImpactParameterError();
+      }
+      cand.addUserFloat("dca", DCAB0BS);
+      cand.addUserFloat("dcaErr", DCAB0BSErr);
+
+
       cand.addUserFloat("vtx_x", cand.vx());
       cand.addUserFloat("vtx_y", cand.vy());
       cand.addUserFloat("vtx_z", cand.vz());

PhysicsTools/BPHNano/plugins/BToTrkTrkLLBuilder.cc

@@ -134,6 +134,7 @@ void BToTrkTrkLLBuilder::produce(edm::StreamID, edm::Event &evt, edm::EventSetup
       cand.addUserInt("trk1_idx", trk1_idx);
       cand.addUserInt("trk2_idx", trk2_idx);
       cand.addUserInt("ditrack_idx", ditracks_idx);
+      cand.addUserInt("ll_idx", ll_idx);
 
       auto lep1_p4 = l1_ptr->polarP4();
       auto lep2_p4 = l2_ptr->polarP4();
@@ -243,6 +244,19 @@ void BToTrkTrkLLBuilder::produce(edm::StreamID, edm::Event &evt, edm::EventSetup
       if (!post_vtx_selection_(cand))
         continue;
 
+      reco::BeamSpot beamSpot = *beamspot;
+      TrajectoryStateClosestToPoint theDCAXBS = fitter.fitted_candidate_ttrk().trajectoryStateClosestToPoint(GlobalPoint(beamSpot.position().x(),beamSpot.position().y(),beamSpot.position().z()));
+      double DCAB0BS = -99.;
+      double DCAB0BSErr = -99.;
+
+      if (theDCAXBS.isValid() == true){
+          DCAB0BS    = theDCAXBS.perigeeParameters().transverseImpactParameter();
+          DCAB0BSErr = theDCAXBS.perigeeError().transverseImpactParameterError();
+      }
+      cand.addUserFloat("dca", DCAB0BS);
+      cand.addUserFloat("dcaErr", DCAB0BSErr);
+      
+
       cand.addUserFloat("vtx_x", cand.vx());
       cand.addUserFloat("vtx_y", cand.vy());
       cand.addUserFloat("vtx_z", cand.vz());

PhysicsTools/BPHNano/plugins/BToV0LLBuilder.cc

@@ -168,6 +168,18 @@ void BToV0LLBuilder::produce(edm::StreamID, edm::Event &evt, edm::EventSetup con
       if (!post_vtx_selection_(cand))
         continue;
 
+      reco::BeamSpot beamSpot = *beamspot;
+      TrajectoryStateClosestToPoint theDCAXBS = fitter.fitted_candidate_ttrk().trajectoryStateClosestToPoint(GlobalPoint(beamSpot.position().x(),beamSpot.position().y(),beamSpot.position().z()));
+      double DCAB0BS = -99.;
+      double DCAB0BSErr = -99.;
+
+      if (theDCAXBS.isValid() == true){
+          DCAB0BS    = theDCAXBS.perigeeParameters().transverseImpactParameter();
+          DCAB0BSErr = theDCAXBS.perigeeError().transverseImpactParameterError();
+      }
+      cand.addUserFloat("dca", DCAB0BS);
+      cand.addUserFloat("dcaErr", DCAB0BSErr);
+
       cand.addUserFloat("vtx_x", cand.vx());
       cand.addUserFloat("vtx_y", cand.vy());
       cand.addUserFloat("vtx_z", cand.vz());
@@ -307,7 +319,7 @@ void BToV0LLBuilder::produce(edm::StreamID, edm::Event &evt, edm::EventSetup con
       cand.addUserFloat("cstr_cos_theta_2D", cstr_cos_theta_2D);
 
       ret_val->push_back(cand);
-    }
+    }// for(size_t ll_idx = 0; ll_idx < dileptons->size(); ++ll_idx) {
   }
   evt.put(std::move(ret_val));
 }