adriano's comments

cms-sw · Aug 15, 2022 · fb2bed1 · fb2bed1
1 parent 54a25d8
commit fb2bed1
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 155 deletions.
diff --git a/DQMOffline/L1Trigger/interface/L1TPhase2MuonOffline.h b/DQMOffline/L1Trigger/interface/L1TPhase2MuonOffline.h
@@ -39,7 +39,6 @@
 #include "HLTrigger/HLTcore/interface/HLTConfigProvider.h"
 
 // Common tools
-//#include "MuonAnalysis/MuonAssociators/interface/PropagateToMuon.h"
 #include "TrackingTools/TransientTrack/interface/TransientTrack.h"
 #include "TrackingTools/TransientTrack/interface/TrackTransientTrack.h"
 #include "TrackingTools/TransientTrack/interface/TransientTrackBuilder.h"
@@ -120,33 +119,20 @@ class L1TPhase2MuonOffline : public DQMEDAnalyzer {
   std::map<MuType, std::string> muonNames_;
 
   // config params
-  std::string histFolder_;
-  std::vector<edm::ParameterSet> cutsVPSet_;
+  const std::string histFolder_;
+  const std::vector<edm::ParameterSet> cutsVPSet_;
 
-  std::vector<double> effVsPtBins_;
-  std::vector<double> effVsPhiBins_;
-  std::vector<double> effVsEtaBins_;
+  const std::vector<double> effVsPtBins_;
+  const std::vector<double> effVsPhiBins_;
+  const std::vector<double> effVsEtaBins_;
 
-  bool useAtVtxCoord_;
-  bool isParticleGun_;
-  float maxGmtMuonDR_;
+  const double maxGmtMuonDR_;
 
   // Helper methods
   void matchMuonsToGen(std::vector<const reco::GenParticle*> genmus);
   std::vector<float> getHistBinsEff(EffType eff);
   std::tuple<int, double, double> getHistBinsRes(ResType res);
 
-  // Keys for histogram maps
-  /*typedef std::tuple<MuType, ResType, EtaRegion, QualLevel> histoKeyResType_;  
-    typedef std::tuple<MuType, EffType, int, EtaRegion, QualLevel> histoKeyEffType_; 
-    typedef std::tuple<MuType, VarType> histoKeyVarType_;
-  */
-  // Histograms and histogram containers
-  //  std::map<std::tuple<MuType, EffType, int, EtaRegion, QualLevel>, MonitorElement*> efficiencyHistos_;
-  //  std::map<std::tuple<MuType, ResType, EtaRegion, QualLevel>, MonitorElement*> resolutionHistos_;
-  //  TH1F* efficiencyNum_[kNMuTypes][kNEtaRegions][kNQualLevels][kEffTypes];
-  //  TH1F* efficiencyDen_[kNMuTypes][kNEtaRegions][kNQualLevels][kEffTypes];
-
   MonitorElement* efficiencyNum_[kNMuTypes][kNEtaRegions][kNQualLevels][kEffTypes];
   MonitorElement* efficiencyDen_[kNMuTypes][kNEtaRegions][kNQualLevels][kEffTypes];
   MonitorElement* resolutionHistos_[kNMuTypes][kNEtaRegions][kNQualLevels][kNResTypes];
@@ -157,11 +143,11 @@ class L1TPhase2MuonOffline : public DQMEDAnalyzer {
   std::vector<GenMuonGMTPair> gmtTkMuonPairs_;
   std::vector<std::pair<int, QualLevel>> cuts_;
 
-  float lsb_pt;
-  float lsb_phi;
-  float lsb_eta;
-  float lsb_z0;
-  float lsb_d0;
+  float lsb_pt = Phase2L1GMT::LSBpt;
+  float lsb_phi = Phase2L1GMT::LSBphi;
+  float lsb_eta = Phase2L1GMT::LSBeta;
+  float lsb_z0 = Phase2L1GMT::LSBSAz0;
+  float lsb_d0 = Phase2L1GMT::LSBSAd0;
 };
 
 //

diff --git a/DQMOffline/L1Trigger/python/L1TPhase2MuonOffline_cfi.py b/DQMOffline/L1Trigger/python/L1TPhase2MuonOffline_cfi.py
@@ -47,6 +47,8 @@
     efficiencyVsPhiBins = cms.untracked.vdouble(effVsPhiBins),
     efficiencyVsEtaBins = cms.untracked.vdouble(effVsEtaBins),
     efficiencyVsVtxBins = cms.untracked.vdouble(effVsVtxBins),
+
+    maxDR = cms.untracked.double(0.3),
 )
 
 
diff --git a/DQMOffline/L1Trigger/src/L1TPhase2MuonOffline.cc b/DQMOffline/L1Trigger/src/L1TPhase2MuonOffline.cc
@@ -123,16 +123,9 @@ L1TPhase2MuonOffline::L1TPhase2MuonOffline(const ParameterSet& ps)
       effVsPtBins_(ps.getUntrackedParameter<std::vector<double>>("efficiencyVsPtBins")),
       effVsPhiBins_(ps.getUntrackedParameter<std::vector<double>>("efficiencyVsPhiBins")),
       effVsEtaBins_(ps.getUntrackedParameter<std::vector<double>>("efficiencyVsEtaBins")),
-      maxGmtMuonDR_(0.3) {
+      maxGmtMuonDR_(ps.getUntrackedParameter<double>("maxDR")) {
   edm::LogInfo("L1TPhase2MuonOffline") << "L1TPhase2MuonOffline::L1TPhase2MuonOffline()" << endl;
 
-  // Get Muon constants
-  lsb_pt = Phase2L1GMT::LSBpt;
-  lsb_phi = Phase2L1GMT::LSBphi;
-  lsb_eta = Phase2L1GMT::LSBeta;
-  lsb_z0 = Phase2L1GMT::LSBSAz0;
-  lsb_d0 = Phase2L1GMT::LSBSAd0;
-
   for (const auto& c : cutsVPSet_) {
     const auto qCut = c.getUntrackedParameter<int>("qualCut");
     QualLevel qLevel = kQualOpen;

diff --git a/DataFormats/HLTReco/src/classes_def.xml.generated b/DataFormats/HLTReco/src/classes_def.xml.generated
diff --git a/L1Trigger/L1TTrackMatch/plugins/L1TrackerEtMissProducer.cc b/L1Trigger/L1TTrackMatch/plugins/L1TrackerEtMissProducer.cc
@@ -39,10 +39,10 @@ class L1TrackerEtMissProducer : public edm::global::EDProducer<> {
   // ----------member data ---------------------------
   const edm::EDGetTokenT<L1TTTrackRefCollectionType> trackToken_;
   const edm::EDGetTokenT<L1TTTrackRefCollectionType> vtxAssocTrackToken_;
-  std::string L1MetCollectionName;
-  float maxPt_;       // in GeV
-  int highPtTracks_;  // saturate or truncate
-  bool debug_;
+  const std::string L1MetCollectionName;
+  const float maxPt_;       // in GeV
+  const int highPtTracks_;  // saturate or truncate
+  const bool debug_;
 };
 
 // constructor