diff --git a/DataFormats/EcalDigi/src/classes.cc b/DataFormats/EcalDigi/src/classes.cc new file mode 100644 index 0000000000000..0df23cbb7001e --- /dev/null +++ b/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); diff --git a/DataFormats/EcalDigi/src/classes_def.xml b/DataFormats/EcalDigi/src/classes_def.xml index 539e51c5acc49..3dc84399124ab 100644 --- a/DataFormats/EcalDigi/src/classes_def.xml +++ b/DataFormats/EcalDigi/src/classes_def.xml @@ -149,36 +149,16 @@ - - - - - + + + - - - - - + + + diff --git a/DataFormats/EcalRecHit/src/classes.cc b/DataFormats/EcalRecHit/src/classes.cc new file mode 100644 index 0000000000000..c52911f9a852d --- /dev/null +++ b/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); diff --git a/DataFormats/EcalRecHit/src/classes_def.xml b/DataFormats/EcalRecHit/src/classes_def.xml index 3f880bbcf1beb..8439f27a50f64 100644 --- a/DataFormats/EcalRecHit/src/classes_def.xml +++ b/DataFormats/EcalRecHit/src/classes_def.xml @@ -42,19 +42,9 @@ - - - - - + + + diff --git a/DataFormats/ParticleFlowReco/src/classes_1.h b/DataFormats/ParticleFlowReco/src/classes_1.h index 874750a6bf83f..a75b2163519c3 100644 --- a/DataFormats/ParticleFlowReco/src/classes_1.h +++ b/DataFormats/ParticleFlowReco/src/classes_1.h @@ -1,54 +1,55 @@ -#include "DataFormats/Common/interface/Wrapper.h" -#include "DataFormats/Common/interface/Ref.h" -#include -#include -#include "DataFormats/Common/interface/ValueMap.h" +// C++ headers +#include -#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 +#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" diff --git a/DataFormats/ParticleFlowReco/src/classes_2.h b/DataFormats/ParticleFlowReco/src/classes_2.h index 460acc941900c..80573bdcb9844 100644 --- a/DataFormats/ParticleFlowReco/src/classes_2.h +++ b/DataFormats/ParticleFlowReco/src/classes_2.h @@ -1,56 +1,56 @@ -#include "DataFormats/Common/interface/Wrapper.h" -#include "DataFormats/Common/interface/Ref.h" -#include -#include -#include "DataFormats/Common/interface/ValueMap.h" +// C++ headers +#include -#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 +#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" diff --git a/DataFormats/ParticleFlowReco/src/classes_serial.cc b/DataFormats/ParticleFlowReco/src/classes_serial.cc new file mode 100644 index 0000000000000..9aa4a6df5ce97 --- /dev/null +++ b/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); diff --git a/DataFormats/ParticleFlowReco/src/classes_serial.h b/DataFormats/ParticleFlowReco/src/classes_serial.h index cf1fb1569a577..1f506370711e0 100644 --- a/DataFormats/ParticleFlowReco/src/classes_serial.h +++ b/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" diff --git a/DataFormats/ParticleFlowReco/src/classes_serial_def.xml b/DataFormats/ParticleFlowReco/src/classes_serial_def.xml index 1eb1e7c34c123..a3a14bd53e9a4 100644 --- a/DataFormats/ParticleFlowReco/src/classes_serial_def.xml +++ b/DataFormats/ParticleFlowReco/src/classes_serial_def.xml @@ -1,65 +1,29 @@ - - - - + + + - - - - + + + - - - - + + + - - - - + + +