Replace LinkDef file in IORawData/HcalTBInputService

IORawData/HcalTBInputService/BuildFile.xml

@@ -1,11 +1,4 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/Sources"/>
-<use   name="FWCore/Utilities"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/FEDRawData"/>
-<use   name="boost"/>
 <use   name="root"/>
-<flags   EDM_PLUGIN="1"/>
+<export>
+  <lib name="1"/>
+</export>

IORawData/HcalTBInputService/plugins/BuildFile.xml

@@ -0,0 +1,16 @@
+<use   name="IORawData/HcalTBInputService"/>
+<use   name="DataFormats/FEDRawData"/>
+<use   name="FWCore/Framework"/>
+<use   name="FWCore/MessageLogger"/>
+<use   name="FWCore/ParameterSet"/>
+<use   name="root"/>
+<library   file="HcalTBWriter.cc" name="HcalTBWriter">
+  <use   name="DataFormats/Common"/>
+  <use   name="FWCore/Utilities"/>
+  <use   name="boost"/>
+  <flags   EDM_PLUGIN="1"/>
+</library>
+<library   file="HcalTBSource.cc" name="HcalTBSource.cc">
+  <use   name="FWCore/Sources"/>
+  <flags   EDM_PLUGIN="1"/>
+</library>

IORawData/HcalTBInputService/src/HcalTBSource.cc → IORawData/HcalTBInputService/plugins/HcalTBSource.cc

@@ -1,10 +1,9 @@
 #include "TFile.h"
 #include "TTree.h"
-#include "IORawData/HcalTBInputService/interface/HcalTBSource.h"
-#include "CDFChunk.h"
-#include "CDFEventInfo.h"
+#include "IORawData/HcalTBInputService/plugins/HcalTBSource.h"
+#include "IORawData/HcalTBInputService/src/CDFChunk.h"
+#include "IORawData/HcalTBInputService/src/CDFEventInfo.h"
 #include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
-#include "FWCore/PluginManager/interface/PluginCapabilities.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include <iostream>
 
@@ -171,4 +170,7 @@ void HcalTBSource::produce(edm::Event& e) {
   e.put(bare_product);
 }
 
+#include "FWCore/Framework/interface/InputSourceMacros.h"
+
+DEFINE_FWK_INPUT_SOURCE(HcalTBSource);
 

IORawData/HcalTBInputService/interface/HcalTBSource.h → IORawData/HcalTBInputService/plugins/HcalTBSource.h

@@ -17,12 +17,7 @@ class CDFEventInfo;
 
 
 /** \class HcalTBSource
-
    \note Notice that there is a hack to renumber events from runs where the first event number was zero.
-    
-   $Date: 2008/10/16 08:09:12 $
-   $Revision: 1.7 $
-   \author J. Mans - Minnesota
 */
 class HcalTBSource : public edm::ProducerSourceFromFiles {
 public:

IORawData/HcalTBInputService/src/HcalTBWriter.cc → IORawData/HcalTBInputService/plugins/HcalTBWriter.cc

@@ -2,7 +2,7 @@
 #include <TTree.h>
 #include "IORawData/HcalTBInputService/src/CDFChunk.h"
 #include "IORawData/HcalTBInputService/src/CDFEventInfo.h"
-#include "IORawData/HcalTBInputService/src/HcalTBWriter.h"
+#include "IORawData/HcalTBInputService/plugins/HcalTBWriter.h"
 #include "DataFormats/FEDRawData/interface/FEDNumbering.h"
 #include "DataFormats/FEDRawData/interface/FEDHeader.h"
 #include <unistd.h>
@@ -153,3 +153,7 @@ void HcalTBWriter::extractEventInfo(const FEDRawDataCollection& raw, const edm::
 
   eventInfo_->Set(runno,seqid,eventNo,l1aNo,orbitNo,bunchNo); 
 }
+
+#include "FWCore/Framework/interface/MakerMacros.h"
+
+DEFINE_FWK_MODULE(HcalTBWriter);

IORawData/HcalTBInputService/src/CDFChunk.cc

@@ -0,0 +1,7 @@
+#include "IORawData/HcalTBInputService/src/CDFChunk.h"
+
+CDFChunk::CDFChunk() : TObject(), fChunkName(), fHeaderSize(0), fTrailerSize(0), fChunkLength(0), fChunk(new ULong64_t[1]) {
+}
+
+CDFChunk::CDFChunk(const char* name) : TObject(), fChunkName(name), fHeaderSize(0), fTrailerSize(0), fChunkLength(0), fChunk(nullptr) {
+}

IORawData/HcalTBInputService/src/CDFChunk.h

@@ -2,11 +2,12 @@
 #define CDFChunk_h_included 1
 
 #include "TObject.h"
+#include "TString.h"
 
 class CDFChunk : public TObject {
 public:
-  CDFChunk() { fChunkLength=0; fChunk=new ULong64_t[1]; }
-  CDFChunk(const char* name) { fChunkLength=0; fChunk=0; fChunkName=name; }
+  CDFChunk();
+  CDFChunk(const char* name);
   void adoptBuffer(ULong64_t* buffer, Int_t length) { fChunk=buffer; fChunkLength=length; fHeaderSize=2; fTrailerSize=1; }
   void releaseBuffer() { fChunk=0; fChunkLength=0; }
   void setChunkName(const char* name) { fChunkName=name; }

IORawData/HcalTBInputService/src/CDFEventInfo.cc

@@ -0,0 +1,4 @@
+#include "IORawData/HcalTBInputService/src/CDFEventInfo.h"
+
+CDFEventInfo::CDFEventInfo() {
+}

IORawData/HcalTBInputService/src/CDFEventInfo.h

@@ -7,7 +7,7 @@
  */
 class CDFEventInfo : public TObject {
 public:
-  CDFEventInfo() { }
+  CDFEventInfo();
   /// get the run number
   inline UInt_t getRunNumber() const { return fRunNumber; }
   /// get the run number sequence id (whose run number is this?)

IORawData/HcalTBInputService/src/classes.h

@@ -0,0 +1,8 @@
+#include "TString.h"
+#include "IORawData/HcalTBInputService/src/CDFChunk.h"
+#include "IORawData/HcalTBInputService/src/CDFEventInfo.h"
+
+namespace IORawData_HcalTBInputService {
+  struct dictionary {
+  };
+}

IORawData/HcalTBInputService/src/classes_def.xml

@@ -0,0 +1,4 @@
+<lcgdict>
+  <class name="CDFChunk"/>
+  <class name="CDFEventInfo"/>
+</lcgdict>