Merge pull request #44021 from fwyzard/update_SoA_dictionaries_141x

Move SoA collections ROOT read rules to classes.cc

DataFormats/EcalDigi/src/classes.cc

@@ -0,0 +1,6 @@
+#include "DataFormats/EcalDigi/interface/EcalDigiHostCollection.h"
+#include "DataFormats/EcalDigi/interface/EcalDigiPhase2HostCollection.h"
+#include "DataFormats/Portable/interface/PortableHostCollectionReadRules.h"
+
+SET_PORTABLEHOSTCOLLECTION_READ_RULES(EcalDigiHostCollection);
+SET_PORTABLEHOSTCOLLECTION_READ_RULES(EcalDigiPhase2HostCollection);

DataFormats/EcalDigi/src/classes_def.xml

@@ -149,36 +149,16 @@
    <class name="EcalDataArray"/>
    <class name="EcalDigiSoA"/>
    <class name="EcalDigiSoA::View"/>
-
-   <class name="EcalDigiHostCollection"/>
-   <read
-     sourceClass="EcalDigiHostCollection"
-     targetClass="EcalDigiHostCollection"
-     version="[1-]"
-     source="EcalDigiSoA layout_;"
-     target="buffer_,layout_,view_"
-     embed="false">
-   <![CDATA[
-     EcalDigiHostCollection::ROOTReadStreamer(newObj, onfile.layout_);
-   ]]>
-   </read>
+   <class name="EcalDigiHostCollection" ClassVersion="3">
+     <version ClassVersion="3" checksum="9207964"/>
+   </class>
    <class name="edm::Wrapper<EcalDigiHostCollection>" splitLevel="0"/>
 
    <class name="EcalDataArrayPhase2"/>
    <class name="EcalDigiPhase2SoA"/>
    <class name="EcalDigiPhase2SoA::View"/>
-
-   <class name="EcalDigiPhase2HostCollection"/>
-   <read
-     sourceClass="EcalDigiPhase2HostCollection"
-     targetClass="EcalDigiPhase2HostCollection"
-     version="[1-]"
-     source="EcalDigiPhase2SoA layout_;"
-     target="buffer_,layout_,view_"
-     embed="false">
-   <![CDATA[
-     EcalDigiPhase2HostCollection::ROOTReadStreamer(newObj, onfile.layout_);
-   ]]>
-   </read>
+   <class name="EcalDigiPhase2HostCollection" ClassVersion="3">
+     <version ClassVersion="3" checksum="2567280384"/>
+   </class>
    <class name="edm::Wrapper<EcalDigiPhase2HostCollection>" splitLevel="0"/>
 </lcgdict>

DataFormats/EcalRecHit/src/classes.cc

@@ -0,0 +1,4 @@
+#include "DataFormats/EcalRecHit/interface/EcalUncalibratedRecHitHostCollection.h"
+#include "DataFormats/Portable/interface/PortableHostCollectionReadRules.h"
+
+SET_PORTABLEHOSTCOLLECTION_READ_RULES(EcalUncalibratedRecHitHostCollection);

DataFormats/EcalRecHit/src/classes_def.xml

@@ -42,19 +42,9 @@
   <class name="EcalOotAmpArray"/>
   <class name="EcalUncalibratedRecHitSoA"/>
   <class name="EcalUncalibratedRecHitSoA::View"/>
-
-  <class name="EcalUncalibratedRecHitHostCollection"/>
-  <read
-    sourceClass="EcalUncalibratedRecHitHostCollection"
-    targetClass="EcalUncalibratedRecHitHostCollection"
-    version="[1-]"
-    source="EcalUncalibratedRecHitSoA layout_;"
-    target="buffer_,layout_,view_"
-    embed="false">
-  <![CDATA[
-    EcalUncalibratedRecHitHostCollection::ROOTReadStreamer(newObj, onfile.layout_);
-  ]]>
-  </read>
+  <class name="EcalUncalibratedRecHitHostCollection" ClassVersion="3">
+    <version ClassVersion="3" checksum="2717044868"/>
+  </class>
   <class name="edm::Wrapper<EcalUncalibratedRecHitHostCollection>" splitLevel="0"/>
 
 </lcgdict>

DataFormats/ParticleFlowReco/src/classes_1.h

@@ -1,54 +1,55 @@
-#include "DataFormats/Common/interface/Wrapper.h"
-#include "DataFormats/Common/interface/Ref.h"
-#include <DataFormats/Common/interface/OwnVector.h>
-#include <DataFormats/Common/interface/ClonePolicy.h>
-#include "DataFormats/Common/interface/ValueMap.h"
+// C++ headers
+#include <map>
 
-#include "DataFormats/ParticleFlowReco/interface/PFCluster.h"
-#include "Math/Cartesian3D.h"
-#include "DataFormats/ParticleFlowReco/interface/PFRecHit.h"
-#include "Math/Polar3D.h"
-#include "Math/CylindricalEta3D.h"
-#include "DataFormats/ParticleFlowReco/interface/PFRecTrack.h"
-#include "DataFormats/ParticleFlowReco/interface/GsfPFRecTrack.h"
-#include "Math/GenVector/PositionVector3D.h"
-#include "DataFormats/Math/interface/Point3D.h"
+// ROOT headers
 #include "Rtypes.h"
-#include "DataFormats/Math/interface/Vector3D.h"
-#include "Math/PxPyPzE4D.h"
+
+// CMSSW headers
+#include "DataFormats/Common/interface/ClonePolicy.h"
+#include "DataFormats/Common/interface/OwnVector.h"
+#include "DataFormats/Common/interface/Ref.h"
+#include "DataFormats/Common/interface/ValueMap.h"
+#include "DataFormats/Common/interface/Wrapper.h"
 #include "DataFormats/DetId/interface/DetId.h"
-#include "DataFormats/TrackReco/interface/Track.h"
-#include "DataFormats/TrackReco/interface/TrackFwd.h"
 #include "DataFormats/GsfTrackReco/interface/GsfTrack.h"
 #include "DataFormats/GsfTrackReco/interface/GsfTrackExtra.h"
-#include "DataFormats/ParticleFlowReco/interface/PFSimParticle.h"
-#include "DataFormats/ParticleFlowReco/interface/PFTrajectoryPoint.h"
+#include "DataFormats/Math/interface/Point3D.h"
+#include "DataFormats/Math/interface/Vector3D.h"
+#include "DataFormats/ParticleFlowReco/interface/ConvBremSeed.h"
+#include "DataFormats/ParticleFlowReco/interface/ConvBremSeedFwd.h"
+#include "DataFormats/ParticleFlowReco/interface/GsfPFRecTrack.h"
+#include "DataFormats/ParticleFlowReco/interface/PFBlock.h"
 #include "DataFormats/ParticleFlowReco/interface/PFBlockElement.h"
-#include "DataFormats/ParticleFlowReco/interface/PFBlockElementTrack.h"
-#include "DataFormats/ParticleFlowReco/interface/PFBlockElementGsfTrack.h"      //Daniele
-#include "DataFormats/ParticleFlowReco/interface/PFBlockElementBrem.h"          //Daniele
-#include "DataFormats/ParticleFlowReco/interface/PFBlockElementSuperCluster.h"  //Florian
+#include "DataFormats/ParticleFlowReco/interface/PFBlockElementBrem.h"
 #include "DataFormats/ParticleFlowReco/interface/PFBlockElementCluster.h"
-#include "DataFormats/ParticleFlowReco/interface/PFBlock.h"
-#include "DataFormats/ParticleFlowReco/interface/PFDisplacedTrackerVertex.h"
-#include "DataFormats/ParticleFlowReco/interface/PFNuclearInteraction.h"
+#include "DataFormats/ParticleFlowReco/interface/PFBlockElementGsfTrack.h"
+#include "DataFormats/ParticleFlowReco/interface/PFBlockElementSuperCluster.h"
+#include "DataFormats/ParticleFlowReco/interface/PFBlockElementTrack.h"
+#include "DataFormats/ParticleFlowReco/interface/PFCluster.h"
 #include "DataFormats/ParticleFlowReco/interface/PFConversion.h"
 #include "DataFormats/ParticleFlowReco/interface/PFConversionFwd.h"
-#include "DataFormats/ParticleFlowReco/interface/PFV0.h"
-#include "DataFormats/ParticleFlowReco/interface/ConvBremSeed.h"
-#include "DataFormats/ParticleFlowReco/interface/ConvBremSeedFwd.h"
-#include "DataFormats/ParticleFlowReco/interface/ParticleFiltrationDecision.h"
-
-#include "DataFormats/ParticleFlowReco/interface/PFDisplacedVertexCandidate.h"
-#include "DataFormats/ParticleFlowReco/interface/PFDisplacedVertexSeed.h"
+#include "DataFormats/ParticleFlowReco/interface/PFDisplacedTrackerVertex.h"
 #include "DataFormats/ParticleFlowReco/interface/PFDisplacedVertex.h"
+#include "DataFormats/ParticleFlowReco/interface/PFDisplacedVertexCandidate.h"
 #include "DataFormats/ParticleFlowReco/interface/PFDisplacedVertexCandidateFwd.h"
-#include "DataFormats/ParticleFlowReco/interface/PFDisplacedVertexSeedFwd.h"
 #include "DataFormats/ParticleFlowReco/interface/PFDisplacedVertexFwd.h"
-
+#include "DataFormats/ParticleFlowReco/interface/PFDisplacedVertexSeed.h"
+#include "DataFormats/ParticleFlowReco/interface/PFDisplacedVertexSeedFwd.h"
+#include "DataFormats/ParticleFlowReco/interface/PFNuclearInteraction.h"
+#include "DataFormats/ParticleFlowReco/interface/PFRecHit.h"
+#include "DataFormats/ParticleFlowReco/interface/PFRecTrack.h"
+#include "DataFormats/ParticleFlowReco/interface/PFSimParticle.h"
+#include "DataFormats/ParticleFlowReco/interface/PFTrajectoryPoint.h"
+#include "DataFormats/ParticleFlowReco/interface/PFV0.h"
+#include "DataFormats/ParticleFlowReco/interface/ParticleFiltrationDecision.h"
 #include "DataFormats/ParticleFlowReco/interface/PreId.h"
 #include "DataFormats/ParticleFlowReco/interface/PreIdFwd.h"
 #include "DataFormats/ParticleFlowReco/interface/RecoPFClusterRefCandidate.h"
 #include "DataFormats/ParticleFlowReco/interface/RecoPFClusterRefCandidateFwd.h"
-
-#include <map>
+#include "DataFormats/TrackReco/interface/Track.h"
+#include "DataFormats/TrackReco/interface/TrackFwd.h"
+#include "Math/Cartesian3D.h"
+#include "Math/CylindricalEta3D.h"
+#include "Math/GenVector/PositionVector3D.h"
+#include "Math/Polar3D.h"
+#include "Math/PxPyPzE4D.h"

DataFormats/ParticleFlowReco/src/classes_2.h

@@ -1,56 +1,56 @@
-#include "DataFormats/Common/interface/Wrapper.h"
-#include "DataFormats/Common/interface/Ref.h"
-#include <DataFormats/Common/interface/OwnVector.h>
-#include <DataFormats/Common/interface/ClonePolicy.h>
-#include "DataFormats/Common/interface/ValueMap.h"
+// C++ headers
+#include <map>
 
-#include "DataFormats/ParticleFlowReco/interface/PFCluster.h"
-#include "Math/Cartesian3D.h"
-#include "DataFormats/ParticleFlowReco/interface/PFRecHit.h"
-#include "Math/Polar3D.h"
-#include "Math/CylindricalEta3D.h"
-#include "DataFormats/ParticleFlowReco/interface/PFRecTrack.h"
-#include "DataFormats/ParticleFlowReco/interface/GsfPFRecTrack.h"
-#include "Math/GenVector/PositionVector3D.h"
-#include "DataFormats/Math/interface/Point3D.h"
+// ROOT headers
 #include "Rtypes.h"
-#include "DataFormats/Math/interface/Vector3D.h"
-#include "Math/PxPyPzE4D.h"
+
+// CMSSW headers
+#include "DataFormats/Common/interface/ClonePolicy.h"
+#include "DataFormats/Common/interface/OwnVector.h"
+#include "DataFormats/Common/interface/Ref.h"
+#include "DataFormats/Common/interface/ValueMap.h"
+#include "DataFormats/Common/interface/Wrapper.h"
 #include "DataFormats/DetId/interface/DetId.h"
-#include "DataFormats/TrackReco/interface/Track.h"
-#include "DataFormats/TrackReco/interface/TrackFwd.h"
 #include "DataFormats/GsfTrackReco/interface/GsfTrack.h"
 #include "DataFormats/GsfTrackReco/interface/GsfTrackExtra.h"
-#include "DataFormats/ParticleFlowReco/interface/PFSimParticle.h"
-#include "DataFormats/ParticleFlowReco/interface/PFTrajectoryPoint.h"
+#include "DataFormats/Math/interface/Point3D.h"
+#include "DataFormats/Math/interface/Vector3D.h"
+#include "DataFormats/ParticleFlowReco/interface/ConvBremSeed.h"
+#include "DataFormats/ParticleFlowReco/interface/ConvBremSeedFwd.h"
+#include "DataFormats/ParticleFlowReco/interface/GsfPFRecTrack.h"
+#include "DataFormats/ParticleFlowReco/interface/HGCalMultiCluster.h"
+#include "DataFormats/ParticleFlowReco/interface/PFBlock.h"
 #include "DataFormats/ParticleFlowReco/interface/PFBlockElement.h"
-#include "DataFormats/ParticleFlowReco/interface/PFBlockElementTrack.h"
-#include "DataFormats/ParticleFlowReco/interface/PFBlockElementGsfTrack.h"      //Daniele
-#include "DataFormats/ParticleFlowReco/interface/PFBlockElementBrem.h"          //Daniele
-#include "DataFormats/ParticleFlowReco/interface/PFBlockElementSuperCluster.h"  //Florian
+#include "DataFormats/ParticleFlowReco/interface/PFBlockElementBrem.h"
 #include "DataFormats/ParticleFlowReco/interface/PFBlockElementCluster.h"
-#include "DataFormats/ParticleFlowReco/interface/PFBlock.h"
-#include "DataFormats/ParticleFlowReco/interface/PFDisplacedTrackerVertex.h"
-#include "DataFormats/ParticleFlowReco/interface/PFNuclearInteraction.h"
+#include "DataFormats/ParticleFlowReco/interface/PFBlockElementGsfTrack.h"
+#include "DataFormats/ParticleFlowReco/interface/PFBlockElementSuperCluster.h"
+#include "DataFormats/ParticleFlowReco/interface/PFBlockElementTrack.h"
+#include "DataFormats/ParticleFlowReco/interface/PFCluster.h"
 #include "DataFormats/ParticleFlowReco/interface/PFConversion.h"
 #include "DataFormats/ParticleFlowReco/interface/PFConversionFwd.h"
-#include "DataFormats/ParticleFlowReco/interface/PFV0.h"
-#include "DataFormats/ParticleFlowReco/interface/ConvBremSeed.h"
-#include "DataFormats/ParticleFlowReco/interface/ConvBremSeedFwd.h"
-#include "DataFormats/ParticleFlowReco/interface/ParticleFiltrationDecision.h"
-
-#include "DataFormats/ParticleFlowReco/interface/PFDisplacedVertexCandidate.h"
-#include "DataFormats/ParticleFlowReco/interface/PFDisplacedVertexSeed.h"
+#include "DataFormats/ParticleFlowReco/interface/PFDisplacedTrackerVertex.h"
 #include "DataFormats/ParticleFlowReco/interface/PFDisplacedVertex.h"
+#include "DataFormats/ParticleFlowReco/interface/PFDisplacedVertexCandidate.h"
 #include "DataFormats/ParticleFlowReco/interface/PFDisplacedVertexCandidateFwd.h"
-#include "DataFormats/ParticleFlowReco/interface/PFDisplacedVertexSeedFwd.h"
 #include "DataFormats/ParticleFlowReco/interface/PFDisplacedVertexFwd.h"
-
+#include "DataFormats/ParticleFlowReco/interface/PFDisplacedVertexSeed.h"
+#include "DataFormats/ParticleFlowReco/interface/PFDisplacedVertexSeedFwd.h"
+#include "DataFormats/ParticleFlowReco/interface/PFNuclearInteraction.h"
+#include "DataFormats/ParticleFlowReco/interface/PFRecHit.h"
+#include "DataFormats/ParticleFlowReco/interface/PFRecTrack.h"
+#include "DataFormats/ParticleFlowReco/interface/PFSimParticle.h"
+#include "DataFormats/ParticleFlowReco/interface/PFTrajectoryPoint.h"
+#include "DataFormats/ParticleFlowReco/interface/PFV0.h"
+#include "DataFormats/ParticleFlowReco/interface/ParticleFiltrationDecision.h"
 #include "DataFormats/ParticleFlowReco/interface/PreId.h"
 #include "DataFormats/ParticleFlowReco/interface/PreIdFwd.h"
 #include "DataFormats/ParticleFlowReco/interface/RecoPFClusterRefCandidate.h"
 #include "DataFormats/ParticleFlowReco/interface/RecoPFClusterRefCandidateFwd.h"
-
-#include "DataFormats/ParticleFlowReco/interface/HGCalMultiCluster.h"
-
-#include <map>
+#include "DataFormats/TrackReco/interface/Track.h"
+#include "DataFormats/TrackReco/interface/TrackFwd.h"
+#include "Math/Cartesian3D.h"
+#include "Math/CylindricalEta3D.h"
+#include "Math/GenVector/PositionVector3D.h"
+#include "Math/Polar3D.h"
+#include "Math/PxPyPzE4D.h"

DataFormats/ParticleFlowReco/src/classes_serial.cc

@@ -0,0 +1,10 @@
+#include "DataFormats/ParticleFlowReco/interface/CaloRecHitHostCollection.h"
+#include "DataFormats/ParticleFlowReco/interface/PFClusterHostCollection.h"
+#include "DataFormats/ParticleFlowReco/interface/PFRecHitFractionHostCollection.h"
+#include "DataFormats/ParticleFlowReco/interface/PFRecHitHostCollection.h"
+#include "DataFormats/Portable/interface/PortableHostCollectionReadRules.h"
+
+SET_PORTABLEHOSTCOLLECTION_READ_RULES(reco::CaloRecHitHostCollection);
+SET_PORTABLEHOSTCOLLECTION_READ_RULES(reco::PFClusterHostCollection);
+SET_PORTABLEHOSTCOLLECTION_READ_RULES(reco::PFRecHitFractionHostCollection);
+SET_PORTABLEHOSTCOLLECTION_READ_RULES(reco::PFRecHitHostCollection);

DataFormats/ParticleFlowReco/src/classes_serial.h

@@ -1,10 +1,9 @@
 #include "DataFormats/Common/interface/Wrapper.h"
 #include "DataFormats/ParticleFlowReco/interface/CaloRecHitHostCollection.h"
 #include "DataFormats/ParticleFlowReco/interface/CaloRecHitSoA.h"
-#include "DataFormats/ParticleFlowReco/interface/PFRecHitHostCollection.h"
-#include "DataFormats/ParticleFlowReco/interface/PFRecHitSoA.h"
-
-#include "DataFormats/ParticleFlowReco/interface/PFClusterSoA.h"
 #include "DataFormats/ParticleFlowReco/interface/PFClusterHostCollection.h"
-#include "DataFormats/ParticleFlowReco/interface/PFRecHitFractionSoA.h"
+#include "DataFormats/ParticleFlowReco/interface/PFClusterSoA.h"
 #include "DataFormats/ParticleFlowReco/interface/PFRecHitFractionHostCollection.h"
+#include "DataFormats/ParticleFlowReco/interface/PFRecHitFractionSoA.h"
+#include "DataFormats/ParticleFlowReco/interface/PFRecHitHostCollection.h"
+#include "DataFormats/ParticleFlowReco/interface/PFRecHitSoA.h"

DataFormats/ParticleFlowReco/src/classes_serial_def.xml

@@ -1,65 +1,29 @@
 <lcgdict>
   <class name="reco::CaloRecHitSoA"/>
   <class name="reco::CaloRecHitSoA::View"/>
-  <class name="reco::CaloRecHitHostCollection"/>
-  <read
-    sourceClass="reco::CaloRecHitHostCollection"
-    targetClass="reco::CaloRecHitHostCollection"
-    version="[1-]"
-    source="reco::CaloRecHitSoA layout_;"
-    target="buffer_,layout_,view_"
-    embed="false">
-  <![CDATA[
-    reco::CaloRecHitHostCollection::ROOTReadStreamer(newObj, onfile.layout_);
-  ]]>
-  </read>
+  <class name="reco::CaloRecHitHostCollection" ClassVersion="3">
+    <version ClassVersion="3" checksum="1876594952"/>
+  </class>
   <class name="edm::Wrapper<reco::CaloRecHitHostCollection>" splitLevel="0"/>
 
   <class name="reco::PFRecHitSoA"/>
   <class name="reco::PFRecHitSoA::View"/>
-  <class name="reco::PFRecHitHostCollection"/>
-  <read
-    sourceClass="reco::PFRecHitHostCollection"
-    targetClass="reco::PFRecHitHostCollection"
-    version="[1-]"
-    source="reco::PFRecHitSoA layout_;"
-    target="buffer_,layout_,view_"
-    embed="false">
-  <![CDATA[
-    reco::PFRecHitHostCollection::ROOTReadStreamer(newObj, onfile.layout_);
-  ]]>
-  </read>
+  <class name="reco::PFRecHitHostCollection" ClassVersion="3">
+    <version ClassVersion="3" checksum="1936051484"/>
+  </class>
   <class name="edm::Wrapper<reco::PFRecHitHostCollection>" splitLevel="0"/>
 
   <class name="reco::PFClusterSoA"/>
   <class name="reco::PFClusterSoA::View"/>
-  <class name="reco::PFClusterHostCollection"/>
-  <read
-    sourceClass="reco::PFClusterHostCollection"
-    targetClass="reco::PFClusterHostCollection"
-    version="[1-]"
-    source="reco::PFClusterSoA layout_;"
-    target="buffer_,layout_,view_"
-    embed="false">
-  <![CDATA[
-    reco::PFClusterHostCollection::ROOTReadStreamer(newObj, onfile.layout_);
-  ]]>
-  </read>
+  <class name="reco::PFClusterHostCollection" ClassVersion="3">
+    <version ClassVersion="3" checksum="1232566394"/>
+  </class>
   <class name="edm::Wrapper<reco::PFClusterHostCollection>" splitLevel="0"/>
 
   <class name="reco::PFRecHitFractionSoA"/>
   <class name="reco::PFRecHitFractionSoA::View"/>
-  <class name="reco::PFRecHitFractionHostCollection"/>
-  <read
-    sourceClass="reco::PFRecHitFractionHostCollection"
-    targetClass="reco::PFRecHitFractionHostCollection"
-    version="[1-]"
-    source="reco::PFRecHitFractionSoA layout_;"
-    target="buffer_,layout_,view_"
-    embed="false">
-  <![CDATA[
-    reco::PFRecHitFractionHostCollection::ROOTReadStreamer(newObj, onfile.layout_);
-  ]]>
-  </read>
+  <class name="reco::PFRecHitFractionHostCollection" ClassVersion="3">
+    <version ClassVersion="3" checksum="2181211668"/>
+  </class>
   <class name="edm::Wrapper<reco::PFRecHitFractionHostCollection>" splitLevel="0"/>
 </lcgdict>