Revert "First commit: compiles and runs"

This reverts commit aeba2b4. Also reverts PR cms-sw#13630 This is because it was merged before combo PR was created for 81X Boy I wish we didn't need to combo these...
cms-l1t-offline · Mar 22, 2016 · 3b69e64 · 3b69e64
1 parent 1032df4
commit 3b69e64
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 158 deletions.
diff --git a/DQM/Integration/python/clients/l1tstage2_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/l1tstage2_dqm_sourceclient-live_cfg.py
@@ -52,10 +52,7 @@
 
 process.gtDigis.DaqGtFedId = cms.untracked.int32(813)
 
-process.stage2UnpackPath = cms.Path(process.caloStage2Digis +
-                                    process.gmtStage2Digis +
-                                    process.emtfStage2Digis
-                                    )
+process.stage2UnpackPath = cms.Path(process.caloStage2Digis+process.gmtStage2Digis)
 
 process.l1tMonitorPath = cms.Path(process.l1tStage2online)
 

diff --git a/DQM/L1TMonitor/interface/L1TStage2EMTF.h b/DQM/L1TMonitor/interface/L1TStage2EMTF.h
diff --git a/DQM/L1TMonitor/python/L1TStage2EMTF_cfi.py b/DQM/L1TMonitor/python/L1TStage2EMTF_cfi.py
diff --git a/DQM/L1TMonitor/python/L1TStage2_cff.py b/DQM/L1TMonitor/python/L1TStage2_cff.py
@@ -2,14 +2,12 @@
 
 from DQM.L1TMonitor.L1TStage2CaloLayer2_cfi import *
 from DQM.L1TMonitor.L1TStage2mGMT_cfi import *
-from DQM.L1TMonitor.L1TStage2EMTF_cfi import *
+
 
 from EventFilter.L1TRawToDigi.caloStage2Digis_cfi import *
 from EventFilter.L1TRawToDigi.gmtStage2Digis_cfi import *
-from EventFilter.L1TRawToDigi.emtfStage2Digis_cfi import *
 
 l1tStage2online = cms.Sequence(
-    l1tStage2CaloLayer2 +
-    l1tStage2mGMT +
-    l1tStage2Emtf
+    l1tStage2CaloLayer2+
+    l1tStage2mGMT
     )
diff --git a/DQM/L1TMonitor/src/L1TStage2EMTF.cc b/DQM/L1TMonitor/src/L1TStage2EMTF.cc
diff --git a/DQM/L1TMonitor/src/SealModule.cc b/DQM/L1TMonitor/src/SealModule.cc
@@ -35,9 +35,6 @@ DEFINE_FWK_MODULE(L1TStage2mGMT);
 #include <DQM/L1TMonitor/interface/L1TStage2BMTF.h>
 DEFINE_FWK_MODULE(L1TStage2BMTF);
 
-#include <DQM/L1TMonitor/interface/L1TStage2EMTF.h>
-DEFINE_FWK_MODULE(L1TStage2EMTF);
-
 #include <DQM/L1TMonitor/interface/L1TGCT.h>
 DEFINE_FWK_MODULE(L1TGCT);
 

diff --git a/DataFormats/L1TMuon/interface/EMTFOutput.h b/DataFormats/L1TMuon/interface/EMTFOutput.h
@@ -50,27 +50,27 @@ namespace l1t {
     void set_AMC13Trailer(emtf::AMC13Trailer bits)  { AMC13Trailer = bits; hasAMC13Trailer = true; };
     void set_dataword(uint64_t bits)                { dataword = bits;               };
 
-    const bool HasAMC13Header()                  const { return hasAMC13Header;  };
-    const bool HasMTF7Header()                   const { return hasMTF7Header;   };
-    const bool HasEventHeader()                  const { return hasEventHeader;  };
-    const bool HasCounters()                     const { return hasCounters;     };
-    const int  NumSP()                           const { return numSP;           };
-    const int  NumRPC()                          const { return numRPC;          };
-    const int  NumME()                           const { return numME;           };
-    const bool HasAMC13Trailer()                 const { return hasAMC13Trailer; };
-    const bool HasMTF7Trailer()                  const { return hasMTF7Trailer;  };
-    const bool HasEventTrailer()                 const { return hasEventTrailer; };
-    const emtf::AMC13Header GetAMC13Header()     const { return AMC13Header;     };
-    const emtf::MTF7Header GetMTF7Header()       const { return MTF7Header;      };
-    const emtf::EventHeader GetEventHeader()     const { return EventHeader;     };
-    const emtf::Counters GetCounters()           const { return Counters;        };
-    const emtf::MECollection GetMECollection()   const { return MECollection;    };
-    const emtf::RPCCollection GetRPCCollection() const { return RPCCollection;   };
-    const emtf::SPCollection GetSPCollection()   const { return SPCollection;    };
-    const emtf::EventTrailer GetEventTrailer()   const { return EventTrailer;    };
-    const emtf::MTF7Trailer GetMTF7Trailer()     const { return MTF7Trailer;     };
-    const emtf::AMC13Trailer GetAMC13Trailer()   const { return AMC13Trailer;    };
-    const uint64_t Dataword()                    const { return dataword;        };
+    bool HasAMC13Header()                   { return hasAMC13Header;  };
+    bool HasMTF7Header()                    { return hasMTF7Header;   };
+    bool HasEventHeader()                   { return hasEventHeader;  };
+    bool HasCounters()                      { return hasCounters;     };
+    int  NumSP()                            { return numSP;           };
+    int  NumRPC()                           { return numRPC;          };
+    int  NumME()                            { return numME;           };
+    bool HasAMC13Trailer()                  { return hasAMC13Trailer; };
+    bool HasMTF7Trailer()                   { return hasMTF7Trailer;  };
+    bool HasEventTrailer()                  { return hasEventTrailer; };
+    emtf::AMC13Header GetAMC13Header()      { return AMC13Header;   };
+    emtf::MTF7Header GetMTF7Header()        { return MTF7Header;    };
+    emtf::EventHeader GetEventHeader()      { return EventHeader;   };
+    emtf::Counters GetCounters()            { return Counters;      };
+    emtf::MECollection GetMECollection()    { return MECollection;  };
+    emtf::RPCCollection GetRPCCollection()  { return RPCCollection; };
+    emtf::SPCollection GetSPCollection()    { return SPCollection;  };
+    emtf::EventTrailer GetEventTrailer()    { return EventTrailer;  };
+    emtf::MTF7Trailer GetMTF7Trailer()      { return MTF7Trailer;   };
+    emtf::AMC13Trailer GetAMC13Trailer()    { return AMC13Trailer;  };
+    const uint64_t Dataword() const     { return dataword; };
 
   private:
     bool hasAMC13Header; 

diff --git a/EventFilter/L1TRawToDigi/python/emtfStage2Digis_cfi.py b/EventFilter/L1TRawToDigi/python/emtfStage2Digis_cfi.py