remove L1Trigger/L1TMuon dependency from DataFormats/L1TMuon

cms-sw · Sep 10, 2020 · 0b34499 · 0b34499
1 parent fcd5a1f
commit 0b34499
Show file tree

Hide file tree

Showing 33 changed files with 107 additions and 103 deletions.
diff --git a/...CSCCommonTrigger/interface/CSCConstants.h → DataFormats/L1TMuon/interface/CSCConstants.h b/...CSCCommonTrigger/interface/CSCConstants.h → DataFormats/L1TMuon/interface/CSCConstants.h
@@ -1,5 +1,5 @@
-#ifndef L1Trigger_CSCCommonTrigger_CSCConstants_h
-#define L1Trigger_CSCCommonTrigger_CSCConstants_h
+#ifndef DataFormats_L1TMuon_CSCConstants_h
+#define DataFormats_L1TMuon_CSCConstants_h
 
 /**
  * \class CSCConstants

diff --git a/DataFormats/L1TMuon/interface/EMTFHit.h b/DataFormats/L1TMuon/interface/EMTFHit.h
@@ -16,10 +16,7 @@
 #include "DataFormats/CSCDigi/interface/CSCCorrelatedLCTDigi.h"
 #include "DataFormats/GEMDigi/interface/GEMPadDigiCluster.h"
 #include "DataFormats/L1TMuon/interface/CPPFDigi.h"
-
-// Included *only* for TrigerPrimitive::subsystem_type enum...
-// surely there's a better way/place for such common definitions
-#include "L1Trigger/L1TMuon/interface/MuonTriggerPrimitive.h"
+#include "DataFormats/L1TMuon/interface/L1TMuonSubsystems.h"
 
 namespace l1t {
 
@@ -267,12 +264,11 @@ namespace l1t {
     int ALCT_quality() const { return alct_quality; }
     int CLCT_quality() const { return clct_quality; }
 
-    // See L1Trigger/L1TMuon/interface/MuonTriggerPrimitive.h
-    bool Is_DT() const { return subsystem == l1tmu::TriggerPrimitive::kDT; }
-    bool Is_CSC() const { return subsystem == l1tmu::TriggerPrimitive::kCSC; }
-    bool Is_RPC() const { return subsystem == l1tmu::TriggerPrimitive::kRPC; }
-    bool Is_GEM() const { return subsystem == l1tmu::TriggerPrimitive::kGEM; }
-    bool Is_ME0() const { return subsystem == l1tmu::TriggerPrimitive::kME0; }
+    bool Is_DT() const { return subsystem == l1tmu::kDT; }
+    bool Is_CSC() const { return subsystem == l1tmu::kCSC; }
+    bool Is_RPC() const { return subsystem == l1tmu::kRPC; }
+    bool Is_GEM() const { return subsystem == l1tmu::kGEM; }
+    bool Is_ME0() const { return subsystem == l1tmu::kME0; }
 
   private:
     //CSCDetId csc_DetId;

diff --git a/DataFormats/L1TMuon/interface/L1TMuonSubsystems.h b/DataFormats/L1TMuon/interface/L1TMuonSubsystems.h
@@ -0,0 +1,8 @@
+#ifndef DataFormats_L1TMuon_L1TMuonSubsystems_hh
+#define DataFormats_L1TMuon_L1TMuonSubsystems_hh
+
+namespace L1TMuon {
+  enum subsystem_type { kDT, kCSC, kRPC, kGEM, kME0, kNSubsystems };
+}
+
+#endif
diff --git a/DataFormats/L1TMuon/src/EMTFHit.cc b/DataFormats/L1TMuon/src/EMTFHit.cc
@@ -1,5 +1,5 @@
 #include "DataFormats/L1TMuon/interface/EMTFHit.h"
-#include "L1Trigger/CSCCommonTrigger/interface/CSCConstants.h"
+#include "DataFormats/L1TMuon/interface/CSCConstants.h"
 
 namespace l1t {
 

diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFUnpackerTools.cc b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFUnpackerTools.cc
@@ -1,5 +1,5 @@
-
 #include "EMTFUnpackerTools.h"
+#include "DataFormats/L1TMuon/interface/L1TMuonSubsystems.h"
 
 namespace l1t {
   namespace stage2 {
@@ -18,7 +18,7 @@ namespace l1t {
         _hit.set_sync_err(_ME.SE());
         _hit.set_bx(_ME.TBIN() - 3);
         _hit.set_bc0(_ME.BC0());
-        _hit.set_subsystem(l1tmu::TriggerPrimitive::kCSC);
+        _hit.set_subsystem(l1tmu::kCSC);
         // _hit.set_layer();
 
         _hit.set_ring(L1TMuonEndCap::calc_ring(_hit.Station(), _hit.CSC_ID(), _hit.Strip()));
@@ -43,7 +43,7 @@ namespace l1t {
         _hit.set_bx(_RPC.TBIN() - 3);
         _hit.set_valid(_RPC.VP());
         _hit.set_bc0(_RPC.BC0());
-        _hit.set_subsystem(l1tmu::TriggerPrimitive::kRPC);
+        _hit.set_subsystem(l1tmu::kRPC);
 
         _hit.SetRPCDetId(_hit.CreateRPCDetId());
         // // Not yet implemented - AWB 15.03.17
@@ -77,7 +77,7 @@ namespace l1t {
         _hit.set_bx(_GEM.TBIN() - 3);
         _hit.set_valid(_GEM.VP());
         _hit.set_bc0(_GEM.BC0());
-        _hit.set_subsystem(l1tmu::TriggerPrimitive::kGEM);
+        _hit.set_subsystem(l1tmu::kGEM);
 
         _hit.set_ring(1);  // GEM only on ring 1
         // TODO: FIXME correct for GEM, should match CSC chamber, but GEM have 2 chambers (layers in a superchamber) per CSC chamber - JS 13.07.20

diff --git a/EventFilter/L1TRawToDigi/src/OmtfCscPacker.cc b/EventFilter/L1TRawToDigi/src/OmtfCscPacker.cc
@@ -2,7 +2,7 @@
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "DataFormats/L1TMuon/interface/OMTF/OmtfCscDataWord64.h"
-#include "L1Trigger/CSCCommonTrigger/interface/CSCConstants.h"
+#include "DataFormats/L1TMuon/interface/CSCConstants.h"
 
 namespace omtf {
 

diff --git a/EventFilter/L1TRawToDigi/src/OmtfCscUnpacker.cc b/EventFilter/L1TRawToDigi/src/OmtfCscUnpacker.cc
@@ -4,7 +4,7 @@
 
 #include "DataFormats/MuonDetId/interface/CSCDetId.h"
 #include "DataFormats/CSCDigi/interface/CSCCorrelatedLCTDigi.h"
-#include "L1Trigger/CSCCommonTrigger/interface/CSCConstants.h"
+#include "DataFormats/L1TMuon/interface/CSCConstants.h"
 
 #include "DataFormats/L1TMuon/interface/OMTF/OmtfCscDataWord64.h"
 

diff --git a/L1Trigger/CSCCommonTrigger/interface/CSCPatternLUT.h b/L1Trigger/CSCCommonTrigger/interface/CSCPatternLUT.h
@@ -9,7 +9,7 @@
  * This was factored out of the Sector Receiver since it is used in
  * parts of the trigger primitive generator (I think).
  */
-#include <L1Trigger/CSCCommonTrigger/interface/CSCConstants.h>
+#include <DataFormats/L1TMuon/interface/CSCConstants.h>
 
 class CSCPatternLUT {
 public:

diff --git a/L1Trigger/CSCTrackFinder/src/CSCSectorReceiverLUT.cc b/L1Trigger/CSCTrackFinder/src/CSCSectorReceiverLUT.cc
@@ -4,7 +4,7 @@
 #include <L1Trigger/CSCCommonTrigger/interface/CSCFrontRearLUT.h>
 #include <DataFormats/L1CSCTrackFinder/interface/CSCBitWidths.h>
 #include <DataFormats/L1CSCTrackFinder/interface/CSCTFConstants.h>
-#include <L1Trigger/CSCCommonTrigger/interface/CSCConstants.h>
+#include <DataFormats/L1TMuon/interface/CSCConstants.h>
 
 #include "Geometry/CSCGeometry/interface/CSCGeometry.h"
 #include <Geometry/CSCGeometry/interface/CSCLayerGeometry.h>

diff --git a/L1Trigger/CSCTrackFinder/src/CSCSectorReceiverMiniLUT.cc b/L1Trigger/CSCTrackFinder/src/CSCSectorReceiverMiniLUT.cc
@@ -2,7 +2,7 @@
 #include <L1Trigger/CSCCommonTrigger/interface/CSCFrontRearLUT.h>
 #include <DataFormats/L1CSCTrackFinder/interface/CSCBitWidths.h>
 #include <DataFormats/L1CSCTrackFinder/interface/CSCTFConstants.h>
-#include <L1Trigger/CSCCommonTrigger/interface/CSCConstants.h>
+#include <DataFormats/L1TMuon/interface/CSCConstants.h>
 
 #include <Geometry/CSCGeometry/interface/CSCLayerGeometry.h>
 #include "DataFormats/GeometryVector/interface/LocalPoint.h"

diff --git a/L1Trigger/CSCTrackFinder/src/CSCTFDTReceiver.cc b/L1Trigger/CSCTrackFinder/src/CSCTFDTReceiver.cc
@@ -4,7 +4,7 @@
 #include <DataFormats/MuonDetId/interface/CSCDetId.h>
 #include <DataFormats/MuonDetId/interface/CSCTriggerNumbering.h>
 #include <DataFormats/L1CSCTrackFinder/interface/CSCBitWidths.h>
-#include <L1Trigger/CSCCommonTrigger/interface/CSCConstants.h>
+#include <DataFormats/L1TMuon/interface/CSCConstants.h>
 #include <DataFormats/MuonDetId/interface/DTChamberId.h>
 
 #include <L1Trigger/CSCTrackFinder/src/CSCTFDTReceiverLUT.h>

diff --git a/L1Trigger/CSCTrackFinder/src/CSCTFMuonSorter.cc b/L1Trigger/CSCTrackFinder/src/CSCTFMuonSorter.cc
@@ -1,5 +1,5 @@
 #include <L1Trigger/CSCTrackFinder/interface/CSCTFMuonSorter.h>
-#include "L1Trigger/CSCCommonTrigger/interface/CSCConstants.h"
+#include "DataFormats/L1TMuon/interface/CSCConstants.h"
 #include <FWCore/MessageLogger/interface/MessageLogger.h>
 
 CSCTFMuonSorter::CSCTFMuonSorter(const edm::ParameterSet& pset) {

diff --git a/L1Trigger/CSCTriggerPrimitives/interface/CSCBaseboard.h b/L1Trigger/CSCTriggerPrimitives/interface/CSCBaseboard.h
@@ -6,7 +6,7 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "Geometry/CSCGeometry/interface/CSCGeometry.h"
-#include "L1Trigger/CSCCommonTrigger/interface/CSCConstants.h"
+#include "DataFormats/L1TMuon/interface/CSCConstants.h"
 #include "L1Trigger/CSCTriggerPrimitives/interface/CSCPatternBank.h"
 #include "L1Trigger/CSCTriggerPrimitives/interface/CSCUpgradeMotherboardLUT.h"
 #include "L1Trigger/CSCTriggerPrimitives/interface/CSCUpgradeMotherboardLUTGenerator.h"

diff --git a/L1Trigger/CSCTriggerPrimitives/interface/CSCPatternBank.h b/L1Trigger/CSCTriggerPrimitives/interface/CSCPatternBank.h
@@ -1,7 +1,7 @@
 #ifndef L1Trigger_CSCTriggerPrimitives_CSCPatternBank_h
 #define L1Trigger_CSCTriggerPrimitives_CSCPatternBank_h
 
-#include "L1Trigger/CSCCommonTrigger/interface/CSCConstants.h"
+#include "DataFormats/L1TMuon/interface/CSCConstants.h"
 #include <vector>
 
 //

diff --git a/L1Trigger/CSCTriggerPrimitives/interface/CSCUpgradeMotherboardLUT.h b/L1Trigger/CSCTriggerPrimitives/interface/CSCUpgradeMotherboardLUT.h
@@ -1,7 +1,7 @@
 #ifndef L1Trigger_CSCTriggerPrimitives_CSCUpgradeMotherboardLUT_h
 #define L1Trigger_CSCTriggerPrimitives_CSCUpgradeMotherboardLUT_h
 
-#include "L1Trigger/CSCCommonTrigger/interface/CSCConstants.h"
+#include "DataFormats/L1TMuon/interface/CSCConstants.h"
 #include "DataFormats/CSCDigi/interface/CSCALCTDigi.h"
 #include "DataFormats/CSCDigi/interface/CSCCLCTDigi.h"
 

diff --git a/L1Trigger/CSCTriggerPrimitives/interface/LCTContainer.h b/L1Trigger/CSCTriggerPrimitives/interface/LCTContainer.h
@@ -10,7 +10,7 @@
  */
 
 #include "DataFormats/CSCDigi/interface/CSCCorrelatedLCTDigi.h"
-#include "L1Trigger/CSCCommonTrigger/interface/CSCConstants.h"
+#include "DataFormats/L1TMuon/interface/CSCConstants.h"
 
 #include <vector>
 #include <algorithm>

diff --git a/L1Trigger/CSCTriggerPrimitives/plugins/CSCTriggerPrimitivesReader.h b/L1Trigger/CSCTriggerPrimitives/plugins/CSCTriggerPrimitivesReader.h
@@ -20,7 +20,7 @@
 #include "FWCore/Utilities/interface/InputTag.h"
 #include "FWCore/Utilities/interface/ESGetToken.h"
 
-#include "L1Trigger/CSCCommonTrigger/interface/CSCConstants.h"
+#include "DataFormats/L1TMuon/interface/CSCConstants.h"
 #include "DataFormats/GeometryVector/interface/GlobalPoint.h"
 #include "DataFormats/CSCDigi/interface/CSCALCTDigiCollection.h"
 #include "DataFormats/CSCDigi/interface/CSCCLCTDigiCollection.h"

diff --git a/L1Trigger/CSCTriggerPrimitives/src/CSCMuonPortCard.cc b/L1Trigger/CSCTriggerPrimitives/src/CSCMuonPortCard.cc
@@ -1,5 +1,5 @@
 #include "L1Trigger/CSCTriggerPrimitives/interface/CSCMuonPortCard.h"
-#include "L1Trigger/CSCCommonTrigger/interface/CSCConstants.h"
+#include "DataFormats/L1TMuon/interface/CSCConstants.h"
 #include <algorithm>
 
 CSCMuonPortCard::CSCMuonPortCard() {}

diff --git a/L1Trigger/L1TMuon/interface/MuonTriggerPrimitive.h b/L1Trigger/L1TMuon/interface/MuonTriggerPrimitive.h
@@ -23,6 +23,7 @@
 
 #include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/GeometryVector/interface/GlobalPoint.h"
+#include "DataFormats/L1TMuon/interface/L1TMuonSubsystems.h"
 
 // DT digi types
 class DTChamberId;
@@ -55,9 +56,6 @@ namespace L1TMuon {
 
   class TriggerPrimitive {
   public:
-    // define the subsystems that we have available
-    enum subsystem_type { kDT, kCSC, kRPC, kGEM, kME0, kNSubsystems };
-
     // define the data we save locally from each subsystem type
     // variables in these structs keep their colloquial meaning
     // within a subsystem

diff --git a/L1Trigger/L1TMuon/src/GeometryTranslator.cc b/L1Trigger/L1TMuon/src/GeometryTranslator.cc
@@ -12,7 +12,7 @@
 #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
 
 #include "L1Trigger/DTUtilities/interface/DTTrigGeom.h"
-#include "L1Trigger/CSCCommonTrigger/interface/CSCConstants.h"
+#include "DataFormats/L1TMuon/interface/CSCConstants.h"
 #include "L1Trigger/CSCCommonTrigger/interface/CSCPatternLUT.h"
 
 #include "L1Trigger/L1TMuon/interface/MuonTriggerPrimitive.h"
@@ -27,19 +27,19 @@ GeometryTranslator::~GeometryTranslator() {}
 
 double GeometryTranslator::calculateGlobalEta(const TriggerPrimitive& tp) const {
   switch (tp.subsystem()) {
-    case TriggerPrimitive::kDT:
+    case L1TMuon::kDT:
       return calcDTSpecificEta(tp);
       break;
-    case TriggerPrimitive::kCSC:
+    case L1TMuon::kCSC:
       return calcCSCSpecificEta(tp);
       break;
-    case TriggerPrimitive::kRPC:
+    case L1TMuon::kRPC:
       return calcRPCSpecificEta(tp);
       break;
-    case TriggerPrimitive::kGEM:
+    case L1TMuon::kGEM:
       return calcGEMSpecificEta(tp);
       break;
-    case TriggerPrimitive::kME0:
+    case L1TMuon::kME0:
       return calcME0SpecificEta(tp);
       break;
     default:
@@ -50,19 +50,19 @@ double GeometryTranslator::calculateGlobalEta(const TriggerPrimitive& tp) const
 
 double GeometryTranslator::calculateGlobalPhi(const TriggerPrimitive& tp) const {
   switch (tp.subsystem()) {
-    case TriggerPrimitive::kDT:
+    case L1TMuon::kDT:
       return calcDTSpecificPhi(tp);
       break;
-    case TriggerPrimitive::kCSC:
+    case L1TMuon::kCSC:
       return calcCSCSpecificPhi(tp);
       break;
-    case TriggerPrimitive::kRPC:
+    case L1TMuon::kRPC:
       return calcRPCSpecificPhi(tp);
       break;
-    case TriggerPrimitive::kGEM:
+    case L1TMuon::kGEM:
       return calcGEMSpecificPhi(tp);
       break;
-    case TriggerPrimitive::kME0:
+    case L1TMuon::kME0:
       return calcME0SpecificPhi(tp);
       break;
     default:
@@ -73,19 +73,19 @@ double GeometryTranslator::calculateGlobalPhi(const TriggerPrimitive& tp) const
 
 double GeometryTranslator::calculateBendAngle(const TriggerPrimitive& tp) const {
   switch (tp.subsystem()) {
-    case TriggerPrimitive::kDT:
+    case L1TMuon::kDT:
       return calcDTSpecificBend(tp);
       break;
-    case TriggerPrimitive::kCSC:
+    case L1TMuon::kCSC:
       return calcCSCSpecificBend(tp);
       break;
-    case TriggerPrimitive::kRPC:
+    case L1TMuon::kRPC:
       return calcRPCSpecificBend(tp);
       break;
-    case TriggerPrimitive::kGEM:
+    case L1TMuon::kGEM:
       return calcGEMSpecificBend(tp);
       break;
-    case TriggerPrimitive::kME0:
+    case L1TMuon::kME0:
       return calcME0SpecificBend(tp);
       break;
     default:
@@ -96,19 +96,19 @@ double GeometryTranslator::calculateBendAngle(const TriggerPrimitive& tp) const
 
 GlobalPoint GeometryTranslator::getGlobalPoint(const TriggerPrimitive& tp) const {
   switch (tp.subsystem()) {
-    case TriggerPrimitive::kDT:
+    case L1TMuon::kDT:
       return calcDTSpecificPoint(tp);
       break;
-    case TriggerPrimitive::kCSC:
+    case L1TMuon::kCSC:
       return getCSCSpecificPoint(tp);
       break;
-    case TriggerPrimitive::kRPC:
+    case L1TMuon::kRPC:
       return getRPCSpecificPoint(tp);
       break;
-    case TriggerPrimitive::kGEM:
+    case L1TMuon::kGEM:
       return getGEMSpecificPoint(tp);
       break;
-    case TriggerPrimitive::kME0:
+    case L1TMuon::kME0:
       return getME0SpecificPoint(tp);
       break;
     default: