Add missing GEM DetID vars and use patMuons

cms-sw · Jun 1, 2023 · 307ff10 · 307ff10
1 parent 2ceed12
commit 307ff10
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/DPGAnalysis/MuonTools/plugins/MuCSCTnPFlatTableProducer.cc b/DPGAnalysis/MuonTools/plugins/MuCSCTnPFlatTableProducer.cc
@@ -233,7 +233,6 @@ void MuCSCTnPFlatTableProducer::getFromES(const edm::EventSetup& environment) {
 
 void MuCSCTnPFlatTableProducer::fillTable(edm::Event& ev) {
   unsigned int m_nZCands = 0;  // the # of digis (size of all following vectors)
-  int nMuon = 0;
 
   // Muon track tag variables
   std::vector<float> m_muonPt;        // muon pT [GeV/c]
@@ -323,8 +322,6 @@ void MuCSCTnPFlatTableProducer::fillTable(edm::Event& ev) {
   if (muons.isValid() && tracks.isValid() && segments.isValid() && primaryVertices.isValid() &&
       m_transientTrackBuilder.isValid()) {
     for (const auto& muon : (*muons)) {
-      nMuon++;
-
       if (!muonTagSelection(muon))
         continue;
 

diff --git a/DPGAnalysis/MuonTools/plugins/MuDTMuonExtTableProducer.cc b/DPGAnalysis/MuonTools/plugins/MuDTMuonExtTableProducer.cc
@@ -31,6 +31,7 @@
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 
+#include "DataFormats/Common/interface/View.h"
 #include "DataFormats/MuonReco/interface/Muon.h"
 #include "DataFormats/VertexReco/interface/Vertex.h"
 #include "DataFormats/MuonReco/interface/MuonFwd.h"
@@ -60,7 +61,7 @@ class MuDTMuonExtTableProducer : public MuBaseFlatTableProducer {
 
 private:
   /// Tokens
-  nano_mu::EDTokenHandle<reco::MuonCollection> m_muToken;
+  nano_mu::EDTokenHandle<edm::View<reco::Muon>> m_muToken;
   nano_mu::EDTokenHandle<DTRecSegment4DCollection> m_dtSegmentToken;
 
   nano_mu::EDTokenHandle<edm::TriggerResults> m_trigResultsToken;
@@ -110,7 +111,7 @@ void MuDTMuonExtTableProducer::fillDescriptions(edm::ConfigurationDescriptions&
   edm::ParameterSetDescription desc;
 
   desc.add<std::string>("name", "muon");
-  desc.add<edm::InputTag>("src", edm::InputTag{"muons"});
+  desc.add<edm::InputTag>("src", edm::InputTag{"patMuons"});
   desc.add<edm::InputTag>("dtSegmentSrc", edm::InputTag{"dt4DSegments"});
   desc.add<edm::InputTag>("trigEventSrc", edm::InputTag{"hltTriggerSummaryAOD::HLT"});
   desc.add<edm::InputTag>("trigResultsSrc", edm::InputTag{"TriggerResults::HLT"});

diff --git a/DPGAnalysis/MuonTools/plugins/MuGEMMuonExtTableProducer.cc b/DPGAnalysis/MuonTools/plugins/MuGEMMuonExtTableProducer.cc
@@ -12,6 +12,7 @@
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 
+#include "DataFormats/Common/interface/View.h"
 #include "DataFormats/MuonReco/interface/Muon.h"
 #include "DataFormats/MuonReco/interface/MuonFwd.h"
 
@@ -43,7 +44,7 @@ class MuGEMMuonExtTableProducer : public MuBaseFlatTableProducer {
 
 private:
   /// The RECO mu token
-  nano_mu::EDTokenHandle<reco::MuonCollection> m_token;
+  nano_mu::EDTokenHandle<edm::View<reco::Muon>> m_token;
 
   /// Fill matches table
   bool m_fillPropagated;
@@ -77,7 +78,7 @@ void MuGEMMuonExtTableProducer::fillDescriptions(edm::ConfigurationDescriptions&
   edm::ParameterSetDescription desc;
 
   desc.add<std::string>("name", "muon");
-  desc.add<edm::InputTag>("src", edm::InputTag{"muons"});
+  desc.add<edm::InputTag>("src", edm::InputTag{"patMuons"});
 
   desc.add<bool>("fillPropagated", true);
   desc.setAllowAnything();

diff --git a/DPGAnalysis/MuonTools/python/nano_mu_digi_cff.py b/DPGAnalysis/MuonTools/python/nano_mu_digi_cff.py
@@ -72,7 +72,11 @@
         region = DetIdVar("region()", "int8", doc = "GE11 region where the digi is detected"
                                             "<br />(int, positive endcap: +1, negative endcap: -1)"),
         roll = DetIdVar("roll()", "int8", doc = "roll id (also known as eta partition)"
-                                        "<br />(partitions numbered from 1 to 8)")
+                                        "<br />(partitions numbered from 1 to 8)"),
+        chamber = DetIdVar("chamber()", "int8", doc = "GE11 superchamber where the hit is reconstructed"
+                                              "<br />(chambers numbered from 0 to 35)"),
+        layer = DetIdVar("layer()", "int8", doc = "GE11 layer where the hit is reconstructed"
+                                          "<br />(layer1: 1, layer2: 2)")        
 )
 
 

diff --git a/DPGAnalysis/MuonTools/python/nano_mu_local_reco_cff.py b/DPGAnalysis/MuonTools/python/nano_mu_local_reco_cff.py
@@ -138,6 +138,8 @@
                                             "<br />(int, positive endcap: +1, negative endcap: -1)"),
         ring = DetIdVar("ring()", "int8", doc = ""),
         station = DetIdVar("station()", "int8", doc = "GEM station <br />(always 1 for GE1/1)"),
+        chamber = DetIdVar("chamber()", "int8", doc = "GE11 superchamber where the hit is reconstructed"
+                                              "<br />(chambers numbered from 0 to 35)")
 )
 
 gemSegmentFlatTableProducer.globalPosVariables = cms.PSet(