Clean BuildFiles in EventFilter

DQM/L1TMonitor/src/L1TStage2CaloLayer1.cc

@@ -14,8 +14,8 @@
 #include "CondFormats/RunInfo/interface/RunInfo.h"
 #include "CondFormats/DataRecord/interface/RunSummaryRcd.h"
 
-#include "EventFilter/L1TXRawToDigi/plugins/UCTDAQRawData.h"
-#include "EventFilter/L1TXRawToDigi/plugins/UCTAMCRawData.h"
+#include "EventFilter/L1TXRawToDigi/interface/UCTDAQRawData.h"
+#include "EventFilter/L1TXRawToDigi/interface/UCTAMCRawData.h"
 
 L1TStage2CaloLayer1::L1TStage2CaloLayer1(const edm::ParameterSet& ps)
     : ecalTPSourceRecd_(consumes<EcalTrigPrimDigiCollection>(ps.getParameter<edm::InputTag>("ecalTPSourceRecd"))),

EventFilter/CSCTFRawToDigi/test/BuildFile.xml

@@ -1,6 +1,5 @@
 <use name="FWCore/Framework"/>
 <use name="FWCore/Utilities"/>
-<use name="FWCore/PluginManager"/>
 <library file="CSCTFSingleGen.cc" name="EventFilterCSCTFSingleGen_test">
   <use name="DataFormats/CSCDigi"/>
   <use name="DataFormats/MuonDetId"/>

EventFilter/L1TXRawToDigi/BuildFile.xml

@@ -0,0 +1 @@
+<use name="FWCore/MessageLogger"/>

EventFilter/L1TXRawToDigi/plugins/BuildFile.xml

@@ -1,6 +1,7 @@
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/MessageLogger"/>
+<use name="EventFilter/L1TXRawToDigi"/>
 <use name="EventFilter/Utilities"/>
 <use name="DataFormats/FEDRawData"/>
 <use name="DataFormats/HcalDigi"/>

EventFilter/L1TXRawToDigi/plugins/L1TCaloLayer1RawToDigi.cc

@@ -54,9 +54,9 @@
 #include "DataFormats/L1CaloTrigger/interface/L1CaloCollections.h"
 #include "DataFormats/L1CaloTrigger/interface/L1CaloRegion.h"
 
-#include "UCTDAQRawData.h"
-#include "UCTAMCRawData.h"
-#include "UCTCTP7RawData.h"
+#include "EventFilter/L1TXRawToDigi/interface/UCTDAQRawData.h"
+#include "EventFilter/L1TXRawToDigi/interface/UCTAMCRawData.h"
+#include "EventFilter/L1TXRawToDigi/interface/UCTCTP7RawData.h"
 
 using namespace edm;
 

EventFilter/L1TXRawToDigi/plugins/L1TTwinMuxRawToDigi.cc

@@ -21,7 +21,15 @@
 //
 //--------------------------------------------------
 
-#include "L1TTwinMuxRawToDigi.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
+#include "DataFormats/L1DTTrackFinder/interface/L1MuDTChambPhContainer.h"
+#include "DataFormats/L1DTTrackFinder/interface/L1MuDTChambThContainer.h"
+#include "DataFormats/L1DTTrackFinder/interface/L1MuDTTrackContainer.h"
+
+#include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
+#include "FWCore/Framework/interface/global/EDProducer.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Utilities/interface/InputTag.h"
 
 #include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/Event.h"
@@ -31,6 +39,57 @@
 #include <iostream>
 #include <fstream>
 
+class L1TTwinMuxRawToDigi : public edm::global::EDProducer<> {
+public:
+  /// Constructor
+  L1TTwinMuxRawToDigi(const edm::ParameterSet& pset);
+
+  /// Destructor
+  ~L1TTwinMuxRawToDigi() override;
+
+  /// Produce digis out of raw data
+  void produce(edm::StreamID, edm::Event& e, const edm::EventSetup& c) const override;
+
+  /// Generate and fill FED raw data for a full event
+  bool fillRawData(edm::Event& e,
+                   L1MuDTChambPhContainer::Phi_Container& phi_data,
+                   L1MuDTChambThContainer::The_Container& the_data,
+                   L1MuDTChambPhContainer::Phi_Container& phi_out_data) const;
+
+  void processFed(int twinmuxfed,
+                  int wheel,
+                  std::array<short, 12> const& twinMuxAmcSec,
+                  edm::Handle<FEDRawDataCollection> data,
+                  L1MuDTChambPhContainer::Phi_Container& phi_data,
+                  L1MuDTChambThContainer::The_Container& the_data,
+                  L1MuDTChambPhContainer::Phi_Container& phi_out_data) const;
+
+private:
+  bool debug_;
+  size_t nfeds_;
+  edm::InputTag DTTM7InputTag_;
+  std::vector<int> feds_;
+  std::vector<int> wheels_;
+  std::vector<long long int> amcsecmap_;
+  std::vector<std::array<short, 12> > amcsec_;
+
+  // utilities
+  inline unsigned char* readline(unsigned char* lineFED, int& lines, long& dataWord) const {
+    dataWord = *((long*)lineFED);
+    lineFED += 8;
+    ++lines;
+    return lineFED;
+  }
+
+  edm::InputTag getDTTM7InputTag() const { return DTTM7InputTag_; }
+
+  edm::EDGetTokenT<FEDRawDataCollection> Raw_token;
+
+  int normBx(int bx_, int bxCnt_) const;
+  int radAngConversion(int radAng_) const;
+  int benAngConversion(int benAng_) const;
+};
+
 L1TTwinMuxRawToDigi::L1TTwinMuxRawToDigi(const edm::ParameterSet& pset)
     :
 

EventFilter/L1TXRawToDigi/test/BuildFile.xml

@@ -1,7 +1,3 @@
-<use name="FWCore/Framework"/>
-<use name="FWCore/ParameterSet"/>
-<use name="FWCore/PluginManager"/>
-<use name="FWCore/MessageLogger"/>
-<use name="DataFormats/FEDRawData"/>
 <bin name="testUCTUnpacker" file="testUCTUnpacker.cpp">
+  <use name="EventFilter/L1TXRawToDigi"/>
 </bin>

EventFilter/L1TXRawToDigi/test/testUCTUnpacker.cpp

@@ -7,9 +7,9 @@
 
 using namespace std;
 
-#include "EventFilter/L1TXRawToDigi/plugins/UCTDAQRawData.h"
-#include "EventFilter/L1TXRawToDigi/plugins/UCTAMCRawData.h"
-#include "EventFilter/L1TXRawToDigi/plugins/UCTCTP7RawData.h"
+#include "EventFilter/L1TXRawToDigi/interface/UCTDAQRawData.h"
+#include "EventFilter/L1TXRawToDigi/interface/UCTAMCRawData.h"
+#include "EventFilter/L1TXRawToDigi/interface/UCTCTP7RawData.h"
 
 int main(int argc, char** argv) {
   uint32_t index = 0;