Merged emtfpp_for_13_3_0_pre3 from repository omiguelc with cms-merge-topic

Author: watson-ij

L1Trigger/L1TGEM/python/me0TriggerPseudoDigis_cff.py

@@ -42,10 +42,7 @@
 from RecoLocalMuon.GEMSegment.gemSegments_cfi import *
 
 ge0TriggerPseudoDigiTask = cms.Task(
-    simMuonME0PseudoReDigisCoarse,
-    me0RecHitsCoarse,
-    me0TriggerPseudoDigis,
-    ## need to run the standard ME0 RECO sequence for converted triggers
+    ## need to run the standard GE0 RECO sequence for converted triggers
     gemRecHits,
     gemSegments,
     ge0TriggerConvertedPseudoDigis

L1Trigger/L1TGEM/src/GE0TriggerPseudoBuilder.cc

@@ -149,19 +149,19 @@ ME0TriggerDigi GE0TriggerPseudoBuilder::segmentConversion(const GEMSegment segme
 void GE0TriggerPseudoBuilder::dumpAllME0Segments(const GEMSegmentCollection& segments) const {
   LogTrace("L1GE0Trigger") << "dumpt all ME0 Segments" << std::endl;
   for (auto iC = segments.id_begin(); iC != segments.id_end(); ++iC) {
-     auto ch_segs = segments.get(*iC);
-     for (auto iS = ch_segs.first; iS != ch_segs.second; ++iS) {
-       if (iS->gemDetId().station() != 0) // only dump GE0 segments
-         continue;
-       GlobalPoint gp = me0_g->idToDet(iS->gemDetId())->surface().toGlobal(iS->localPosition());
-       LogTrace("L1ME0Trigger") << "ME0Detid " << iS->gemDetId() << " segment " << *iS << " eta " << gp.eta() << " phi "
-                                << gp.phi() << std::endl;
-       auto recHits(iS->recHits());
-       LogTrace("L1GE0Trigger") << "\t has " << recHits.size() << " me0 rechits" << std::endl;
-       for (auto& rh : recHits) {
-         const GEMRecHit* me0rh(dynamic_cast<const GEMRecHit*>(rh));
-         LogTrace("L1GEMTrigger") << "\t  detid " << me0rh->gemId() << " rechit " << *me0rh << std::endl;
-       }
-     }
+    auto ch_segs = segments.get(*iC);
+    for (auto iS = ch_segs.first; iS != ch_segs.second; ++iS) {
+      if (iS->gemDetId().station() != 0)  // only dump GE0 segments
+        continue;
+      GlobalPoint gp = me0_g->idToDet(iS->gemDetId())->surface().toGlobal(iS->localPosition());
+      LogTrace("L1ME0Trigger") << "ME0Detid " << iS->gemDetId() << " segment " << *iS << " eta " << gp.eta() << " phi "
+                               << gp.phi() << std::endl;
+      auto recHits(iS->recHits());
+      LogTrace("L1GE0Trigger") << "\t has " << recHits.size() << " me0 rechits" << std::endl;
+      for (auto& rh : recHits) {
+        const GEMRecHit* me0rh(dynamic_cast<const GEMRecHit*>(rh));
+        LogTrace("L1GEMTrigger") << "\t  detid " << me0rh->gemId() << " rechit " << *me0rh << std::endl;
+      }
+    }
   }
 }

L1Trigger/L1TMuonEndCapPhase2/interface/DAQ/CSCTPCollector.h

@@ -11,7 +11,7 @@ namespace emtf::phase2 {
   public:
     explicit CSCTPCollector(const EMTFContext&, edm::ConsumesCollector&);
 
-    ~CSCTPCollector() = default;
+    ~CSCTPCollector() override = default;
 
     void collect(const edm::Event&, BXTPCMap&) const final;
 

L1Trigger/L1TMuonEndCapPhase2/interface/DAQ/CSCTPConverter.h

@@ -14,7 +14,7 @@ namespace emtf::phase2 {
   public:
     explicit CSCTPConverter(const EMTFContext&, const int&, const int&);
 
-    ~CSCTPConverter() = default;
+    ~CSCTPConverter() override = default;
 
     void convert(const TriggerPrimitive&, const TPInfo&, EMTFHit&) const final;
 

L1Trigger/L1TMuonEndCapPhase2/interface/DAQ/CSCTPSelector.h

@@ -12,7 +12,7 @@ namespace emtf::phase2 {
   public:
     explicit CSCTPSelector(const EMTFContext&, const int&, const int&);
 
-    ~CSCTPSelector() = default;
+    ~CSCTPSelector() override = default;
 
     void select(const TriggerPrimitive&, TPInfo, ILinkTPCMap&) const final;
 

L1Trigger/L1TMuonEndCapPhase2/interface/DAQ/GE0TPCollector.h

@@ -11,7 +11,7 @@ namespace emtf::phase2 {
   public:
     explicit GE0TPCollector(const EMTFContext&, edm::ConsumesCollector&);
 
-    ~GE0TPCollector() = default;
+    ~GE0TPCollector() override = default;
 
     void collect(const edm::Event&, BXTPCMap&) const final;
 

L1Trigger/L1TMuonEndCapPhase2/interface/DAQ/GE0TPConverter.h

@@ -12,7 +12,7 @@ namespace emtf::phase2 {
   public:
     explicit GE0TPConverter(const EMTFContext&, const int&, const int&);
 
-    ~GE0TPConverter() = default;
+    ~GE0TPConverter() override = default;
 
     void convert(const TriggerPrimitive&, const TPInfo&, EMTFHit&) const final;
 

L1Trigger/L1TMuonEndCapPhase2/interface/DAQ/GE0TPSelector.h

@@ -12,7 +12,7 @@ namespace emtf::phase2 {
   public:
     explicit GE0TPSelector(const EMTFContext&, const int&, const int&);
 
-    ~GE0TPSelector() = default;
+    ~GE0TPSelector() override = default;
 
     void select(const TriggerPrimitive&, TPInfo, ILinkTPCMap&) const final;
 

L1Trigger/L1TMuonEndCapPhase2/interface/DAQ/GEMTPCollector.h

@@ -11,7 +11,7 @@ namespace emtf::phase2 {
   public:
     explicit GEMTPCollector(const EMTFContext&, edm::ConsumesCollector&);
 
-    ~GEMTPCollector() = default;
+    ~GEMTPCollector() override = default;
 
     void collect(const edm::Event&, BXTPCMap&) const final;
 

L1Trigger/L1TMuonEndCapPhase2/interface/DAQ/GEMTPConverter.h

@@ -12,7 +12,7 @@ namespace emtf::phase2 {
   public:
     explicit GEMTPConverter(const EMTFContext&, const int&, const int&);
 
-    ~GEMTPConverter() = default;
+    ~GEMTPConverter() override = default;
 
     void convert(const TriggerPrimitive&, const TPInfo&, EMTFHit&) const final;