Merge pull request #2415 from wmtan/ReplaceALinkdefWithXML

Avoid ROOT6 limitation by replaceing LinkDef files with xml specs.
cms-sw · Feb 12, 2014 · c313b92 · c313b92
2 parents 1ec7924 + 8030beb
commit c313b92
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 13 deletions.
diff --git a/SimDataFormats/CaloHit/interface/CastorShowerEvent.h b/SimDataFormats/CaloHit/interface/CastorShowerEvent.h
@@ -62,7 +62,7 @@
     float getPrimY()             { return primY; };
     float getPrimZ()             { return primZ; };
 
-    ClassDef(CastorShowerEvent,1)
+    ClassDef(CastorShowerEvent,2)
 
   };
 

diff --git a/SimDataFormats/CaloHit/src/CastorEventLinkDef.h b/SimDataFormats/CaloHit/src/CastorEventLinkDef.h
diff --git a/SimDataFormats/CaloHit/src/CastorShowerEvent.cc b/SimDataFormats/CaloHit/src/CastorShowerEvent.cc
@@ -1,8 +1,6 @@
 #include "SimDataFormats/CaloHit/interface/CastorShowerEvent.h"
 #include <iostream>
 
-ClassImp(CastorShowerEvent)
-
 CastorShowerEvent::CastorShowerEvent() {
    // Clear();
    // std::cout << "\n    *** CastorShowerEvent object created ***    " << std::endl;

diff --git a/SimDataFormats/CaloHit/src/CastorShowerLibraryInfo.cc b/SimDataFormats/CaloHit/src/CastorShowerLibraryInfo.cc
@@ -1,8 +1,6 @@
 #include "SimDataFormats/CaloHit/interface/CastorShowerLibraryInfo.h"
 #include <iostream>
 
-ClassImp(CastorShowerLibraryInfo)
-
 CastorShowerLibraryInfo::CastorShowerLibraryInfo() {
    // Clear();
    // std::cout << "\n    *** CastorShowerLibraryInfo object created ***    " << std::endl;

diff --git a/SimDataFormats/CaloHit/src/classes.h b/SimDataFormats/CaloHit/src/classes.h
@@ -1,3 +1,5 @@
+#include "SimDataFormats/CaloHit/interface/CastorShowerEvent.h"
+#include "SimDataFormats/CaloHit/interface/CastorShowerLibraryInfo.h"
 #include "SimDataFormats/CaloHit/interface/HFShowerLibraryEventInfo.h"
 #include "SimDataFormats/CaloHit/interface/HFShowerPhoton.h"
 #include "SimDataFormats/CaloHit/interface/PCaloHit.h"

diff --git a/SimDataFormats/CaloHit/src/classes_def.xml b/SimDataFormats/CaloHit/src/classes_def.xml
@@ -10,6 +10,15 @@
   </class>
   <class name="std::vector<HFShowerPhoton>"/>
   <class name="edm::Wrapper<std::vector<HFShowerPhoton> >"/>
+  <class name="CastorShowerEvent" ClassVersion="2">
+   <version ClassVersion="2" checksum="1459927119"/>
+  </class>
+  <class name="CastorShowerLibraryInfo" ClassVersion="1">
+   <version ClassVersion="1" checksum="12401705"/>
+  </class>
+  <class name="SLBin" ClassVersion="1">
+   <version ClassVersion="1" checksum="4099215368"/>
+  </class>
   <class name="HFShowerLibraryEventInfo" ClassVersion="10">
    <version ClassVersion="10" checksum="1929526838"/>
   </class>