forked from cms-sw/cmssw
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request cms-sw#13 from jsamudio/fllorUpdates
Fllor updates
- Loading branch information
Showing
27 changed files
with
182 additions
and
104 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| #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" | ||
|
|
||
| #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" | ||
| #include "Rtypes.h" | ||
| #include "DataFormats/Math/interface/Vector3D.h" | ||
| #include "Math/PxPyPzE4D.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/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/PFBlockElementCluster.h" | ||
| #include "DataFormats/ParticleFlowReco/interface/PFBlock.h" | ||
| #include "DataFormats/ParticleFlowReco/interface/PFDisplacedTrackerVertex.h" | ||
| #include "DataFormats/ParticleFlowReco/interface/PFNuclearInteraction.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/PFDisplacedVertex.h" | ||
| #include "DataFormats/ParticleFlowReco/interface/PFDisplacedVertexCandidateFwd.h" | ||
| #include "DataFormats/ParticleFlowReco/interface/PFDisplacedVertexSeedFwd.h" | ||
| #include "DataFormats/ParticleFlowReco/interface/PFDisplacedVertexFwd.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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| <lcgdict> | ||
| <selection> | ||
|
|
||
|
|
||
| <class name="reco::PFNuclearInteraction" ClassVersion="10"> | ||
| <version ClassVersion="10" checksum="1573561360"/> | ||
| </class> | ||
| <class name="std::vector<reco::PFNuclearInteraction>" /> | ||
| <class name="edm::Wrapper<std::vector<reco::PFNuclearInteraction> >" /> | ||
| <class name="edm::Ref<std::vector<reco::PFNuclearInteraction>, reco::PFNuclearInteraction, edm::refhelper::FindUsingAdvance<std::vector<reco::PFNuclearInteraction>, reco::PFNuclearInteraction> >" /> | ||
| <class name="edm::RefProd<std::vector<reco::PFNuclearInteraction> >" /> | ||
| <class name="edm::RefVector<std::vector<reco::PFNuclearInteraction>, reco::PFNuclearInteraction, edm::refhelper::FindUsingAdvance<std::vector<reco::PFNuclearInteraction>, reco::PFNuclearInteraction> >" /> | ||
|
|
||
|
|
||
| <class name="reco::PFDisplacedTrackerVertex" ClassVersion="10"> | ||
| <version ClassVersion="10" checksum="2059737151"/> | ||
| </class> | ||
| <class name="std::vector<reco::PFDisplacedTrackerVertex>" /> | ||
| <class name="edm::Wrapper<std::vector<reco::PFDisplacedTrackerVertex> >" /> | ||
| <class name="edm::Ref<std::vector<reco::PFDisplacedTrackerVertex>, reco::PFDisplacedTrackerVertex, edm::refhelper::FindUsingAdvance<std::vector<reco::PFDisplacedTrackerVertex>, reco::PFDisplacedTrackerVertex> >" /> | ||
| <class name="edm::RefProd<std::vector<reco::PFDisplacedTrackerVertex> >" /> | ||
| <class name="edm::RefVector<std::vector<reco::PFDisplacedTrackerVertex>, reco::PFDisplacedTrackerVertex, edm::refhelper::FindUsingAdvance<std::vector<reco::PFDisplacedTrackerVertex>, reco::PFDisplacedTrackerVertex> >" /> | ||
|
|
||
| <class name="reco::PFConversion" ClassVersion="10"> | ||
| <version ClassVersion="10" checksum="2417207933"/> | ||
| </class> | ||
| <class name="std::vector<reco::PFConversion>"/> | ||
| <class name="edm::Wrapper<std::vector<reco::PFConversion> >"/> | ||
| <class name="edm::Ref<std::vector<reco::PFConversion>,reco::PFConversion,edm::refhelper::FindUsingAdvance<std::vector<reco::PFConversion>,reco::PFConversion> >"/> | ||
| <class name="edm::RefProd<std::vector<reco::PFConversion> >"/> | ||
| <class name="edm::RefVector<std::vector<reco::PFConversion>,reco::PFConversion,edm::refhelper::FindUsingAdvance<std::vector<reco::PFConversion>,reco::PFConversion> >"/> | ||
| <class name="std::vector<edm::Ref<std::vector<reco::PFRecTrack>,reco::PFRecTrack,edm::refhelper::FindUsingAdvance<std::vector<reco::PFRecTrack>,reco::PFRecTrack> > >"/> | ||
|
|
||
| <class name="reco::PFV0" ClassVersion="10"> | ||
| <version ClassVersion="10" checksum="40832700"/> | ||
| </class> | ||
| <class name="std::vector<reco::PFV0>" /> | ||
| <class name="edm::Wrapper<std::vector<reco::PFV0> >" /> | ||
| <class name="edm::Ref<std::vector<reco::PFV0>, reco::PFV0, edm::refhelper::FindUsingAdvance<std::vector<reco::PFV0>, reco::PFV0> >" /> | ||
| <class name="edm::RefProd<std::vector<reco::PFV0> >" /> | ||
| <class name="edm::RefVector<std::vector<reco::PFV0>, reco::PFV0, edm::refhelper::FindUsingAdvance<std::vector<reco::PFV0>, reco::PFV0> >" /> | ||
| <class name="edm::Ref<std::vector<reco::VertexCompositeCandidate>,reco::VertexCompositeCandidate,edm::refhelper::FindUsingAdvance<std::vector<reco::VertexCompositeCandidate>,reco::VertexCompositeCandidate> >" /> | ||
|
|
||
|
|
||
| <class name="reco::ConvBremSeed" ClassVersion="12"> | ||
| <version ClassVersion="10" checksum="2980747190"/> | ||
| <version ClassVersion="11" checksum="637662266"/> | ||
| <version ClassVersion="12" checksum="2604169839"/> | ||
| </class> | ||
| <class name="std::vector<reco::ConvBremSeed>"/> | ||
| <class name="edm::Ref<std::vector<reco::ConvBremSeed>,reco::ConvBremSeed,edm::refhelper::FindUsingAdvance<std::vector<reco::ConvBremSeed>,reco::ConvBremSeed> >"/> | ||
| <class name="edm::RefProd<std::vector<reco::ConvBremSeed> >"/> | ||
| <class name="edm::Wrapper<std::vector<reco::ConvBremSeed> >"/> | ||
| <class name="edm::RefVector<std::vector<reco::ConvBremSeed>,reco::ConvBremSeed,edm::refhelper::FindUsingAdvance<std::vector<reco::ConvBremSeed>,reco::ConvBremSeed> >"/> | ||
| <class name="edm::Wrapper<edm::RefVector<std::vector<reco::ConvBremSeed>,reco::ConvBremSeed,edm::refhelper::FindUsingAdvance<std::vector<reco::ConvBremSeed>,reco::ConvBremSeed> > >"/> | ||
| <class name="edm::RefToBase<reco::ConvBremSeed>"/> | ||
| <class name="edm::reftobase::BaseHolder<reco::ConvBremSeed>" /> | ||
| <class name="edm::reftobase::RefHolder<edm::Ref<std::vector<reco::ConvBremSeed>,reco::ConvBremSeed,edm::refhelper::FindUsingAdvance<std::vector<reco::ConvBremSeed>,reco::ConvBremSeed> > >"/> | ||
| <class name="edm::reftobase::Holder<reco::ConvBremSeed,edm::Ref<std::vector<reco::ConvBremSeed>,reco::ConvBremSeed,edm::refhelper::FindUsingAdvance<std::vector<reco::ConvBremSeed>,reco::ConvBremSeed> > >"/> | ||
|
|
||
|
|
||
| </selection> | ||
| </lcgdict> | ||
|
|
62 changes: 0 additions & 62 deletions
62
...mats/ParticleFlowReco/src/classes_def.xml → ...ts/ParticleFlowReco/src/classes_def_2.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| <use name="rootcore"/> | ||
| <use name="eigen"/> | ||
| <use name="DataFormats/Common"/> | ||
| <use name="DataFormats/Portable"/> | ||
| <use name="DataFormats/SoATemplate"/> | ||
| <use name="HeterogeneousCore/AlpakaInterface"/> | ||
| <flags ALPAKA_BACKENDS="1"/> | ||
| <export> | ||
| <lib name="1"/> | ||
| </export> | ||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
2 changes: 1 addition & 1 deletion
2
...owReco/interface/PFRecHitHostCollection.h → ...Alpaka/interface/PFRecHitHostCollection.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
2 changes: 1 addition & 1 deletion
2
...rface/alpaka/CaloRecHitDeviceCollection.h → ...rface/alpaka/CaloRecHitDeviceCollection.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 7 additions & 0 deletions
7
DataFormats/ParticleFlowReco_Alpaka/src/alpaka/classes_cuda.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| #include "DataFormats/Common/interface/DeviceProduct.h" | ||
| #include "DataFormats/Common/interface/Wrapper.h" | ||
| #include "DataFormats/Portable/interface/Product.h" | ||
| #include "DataFormats/ParticleFlowReco_Alpaka/interface/PFRecHitSoA.h" | ||
| #include "DataFormats/ParticleFlowReco_Alpaka/interface/alpaka/PFRecHitDeviceCollection.h" | ||
| #include "DataFormats/ParticleFlowReco_Alpaka/interface/CaloRecHitSoA.h" | ||
| #include "DataFormats/ParticleFlowReco_Alpaka/interface/alpaka/CaloRecHitDeviceCollection.h" |
File renamed without changes.
6 changes: 6 additions & 0 deletions
6
DataFormats/ParticleFlowReco_Alpaka/src/alpaka/classes_serial.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| #include "DataFormats/Common/interface/Wrapper.h" | ||
| #include "DataFormats/Portable/interface/Product.h" | ||
| #include "DataFormats/ParticleFlowReco_Alpaka/interface/PFRecHitSoA.h" | ||
| #include "DataFormats/ParticleFlowReco_Alpaka/interface/PFRecHitHostCollection.h" | ||
| #include "DataFormats/ParticleFlowReco_Alpaka/interface/CaloRecHitSoA.h" | ||
| #include "DataFormats/ParticleFlowReco_Alpaka/interface/CaloRecHitHostCollection.h" |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| #include "DataFormats/ParticleFlowReco_Alpaka/interface/PFRecHitSoA.h" | ||
| #include "DataFormats/ParticleFlowReco_Alpaka/interface/CaloRecHitSoA.h" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| <lcgdict> | ||
| <selection> | ||
| <class name="CaloRecHitSoA"/> | ||
| <class name="CaloRecHitSoA::View"/> | ||
| <class name="PFRecHitSoA"/> | ||
| <class name="PFRecHitSoA::View"/> | ||
| </selection> | ||
| </lcgdict> | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.