-
Notifications
You must be signed in to change notification settings - Fork 4.6k
Improve PortableHost{Collection,Object} dictionary declarations
#48824
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
6026db4
69ddd79
7e8047f
5bebe3b
d001897
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,29 +1,29 @@ | ||
| <lcgdict> | ||
| <class name="reco::CaloRecHitHostCollection"/> | ||
| <!-- reco::CaloRecHitHostCollection::Layout must be listed before the aliased-to type --> | ||
| <class name="reco::CaloRecHitHostCollection::Layout"/> | ||
| <class name="reco::CaloRecHitSoA"/> | ||
| <class name="reco::CaloRecHitSoA::View"/> | ||
| <class name="reco::CaloRecHitHostCollection" ClassVersion="3"> | ||
| <version ClassVersion="3" checksum="1876594952"/> | ||
| </class> | ||
|
Comment on lines
-4
to
-6
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I also removed the explicit versions and checksums for the
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I assume that we could extend the mechanism documented at |
||
| <class name="edm::Wrapper<reco::CaloRecHitHostCollection>" splitLevel="0"/> | ||
|
|
||
| <class name="reco::PFRecHitHostCollection"/> | ||
| <!-- reco::PFRecHitHostCollection::Layout must be listed before the aliased-to type --> | ||
| <class name="reco::PFRecHitHostCollection::Layout"/> | ||
| <class name="reco::PFRecHitSoA"/> | ||
| <class name="reco::PFRecHitSoA::View"/> | ||
| <class name="reco::PFRecHitHostCollection" ClassVersion="3"> | ||
| <version ClassVersion="3" checksum="1936051484"/> | ||
| </class> | ||
| <class name="edm::Wrapper<reco::PFRecHitHostCollection>" splitLevel="0"/> | ||
|
|
||
| <class name="reco::PFClusterHostCollection"/> | ||
| <!-- reco::PFClusterHostCollection::Layout must be listed before the aliased-to type --> | ||
| <class name="reco::PFClusterHostCollection::Layout"/> | ||
| <class name="reco::PFClusterSoA"/> | ||
| <class name="reco::PFClusterSoA::View"/> | ||
| <class name="reco::PFClusterHostCollection" ClassVersion="3"> | ||
| <version ClassVersion="3" checksum="1232566394"/> | ||
| </class> | ||
| <class name="edm::Wrapper<reco::PFClusterHostCollection>" splitLevel="0"/> | ||
|
|
||
| <class name="reco::PFRecHitFractionHostCollection"/> | ||
| <!-- reco::PFRecHitFractionHostCollection::Layout must be listed before the aliased-to type --> | ||
| <class name="reco::PFRecHitFractionHostCollection::Layout"/> | ||
| <class name="reco::PFRecHitFractionSoA"/> | ||
| <class name="reco::PFRecHitFractionSoA::View"/> | ||
| <class name="reco::PFRecHitFractionHostCollection" ClassVersion="3"> | ||
| <version ClassVersion="3" checksum="2181211668"/> | ||
| </class> | ||
| <class name="edm::Wrapper<reco::PFRecHitFractionHostCollection>" splitLevel="0"/> | ||
| </lcgdict> | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| <lcgdict> | ||
| <class name="PortableHostCollection<SiPixelClustersSoA>"/> | ||
| <!-- PortableHostCollection<SiPixelClustersSoA>::Layout must be listed before the aliased-to type --> | ||
| <class name="PortableHostCollection<SiPixelClustersSoA>::Layout"/> | ||
| <class name="SiPixelClustersSoA"/> | ||
| <class name="SiPixelClustersSoA::View"/> | ||
| <class name="PortableHostCollection<SiPixelClustersSoA>"/> | ||
|
|
||
| <class name="SiPixelClustersHost" ClassVersion="3"> | ||
| <version ClassVersion="3" checksum="3089948089"/> | ||
| </class> | ||
| <class name="SiPixelClustersHost"/> | ||
| <class name="edm::Wrapper<SiPixelClustersHost>" splitLevel="0"/> | ||
| </lcgdict> |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,17 @@ | ||
| <lcgdict> | ||
| <class name="PortableHostCollection<SiPixelDigisSoA>"/> | ||
| <!-- PortableHostCollection<SiPixelDigisSoA>::Layout must be listed before the aliased-to type --> | ||
| <class name="PortableHostCollection<SiPixelDigisSoA>::Layout"/> | ||
| <class name="SiPixelDigisSoA"/> | ||
| <class name="SiPixelDigisSoA::View"/> | ||
| <class name="PortableHostCollection<SiPixelDigisSoA>"/> | ||
| <class name="SiPixelDigisHost" ClassVersion="4"> | ||
| <version ClassVersion="4" checksum="2247404879"/> | ||
| <version ClassVersion="3" checksum="3022474662"/> | ||
| </class> | ||
| <class name="SiPixelDigisHost"/> | ||
| <class name="edm::Wrapper<SiPixelDigisHost>" splitLevel="0"/> | ||
|
|
||
| <class name="PortableHostCollection<SiPixelDigiErrorsSoA>"/> | ||
| <!-- PortableHostCollection<SiPixelDigiErrorsSoA>::Layout must be listed before the aliased-to type --> | ||
| <class name="PortableHostCollection<SiPixelDigiErrorsSoA>::Layout"/> | ||
| <class name="SiPixelDigiErrorsSoA"/> | ||
| <class name="SiPixelDigiErrorsSoA::View"/> | ||
| <class name="PortableHostCollection<SiPixelDigiErrorsSoA>"/> | ||
| <class name="SiPixelDigiErrorsHost" ClassVersion="3"> | ||
| <version ClassVersion="3" checksum="958593711"/> | ||
| </class> | ||
| <class name="SiPixelDigiErrorsHost"/> | ||
| <class name="edm::Wrapper<SiPixelDigiErrorsHost>" splitLevel="0"/> | ||
| </lcgdict> |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,16 +2,21 @@ | |
| <class name="lst::HitsBaseSoALayout<128,false>"/> | ||
| <class name="lst::PixelSeedsSoALayout<128,false>"/> | ||
|
|
||
| <class name="lst::LSTInputHostCollection"/> | ||
| <!-- lst::LSTInputHostCollection::Implementation must be listed before the aliased-to type --> | ||
| <class name="lst::LSTInputHostCollection::Implementation"/> | ||
|
|
||
| <class name="portablecollection::CollectionImpl<0,lst::HitsBaseSoALayout<128,false>,lst::PixelSeedsSoALayout<128,false> >"/> | ||
| <class name="portablecollection::CollectionImpl<1,lst::PixelSeedsSoALayout<128,false> >"/> | ||
|
|
||
| <class name="portablecollection::CollectionLeaf<0,lst::HitsBaseSoALayout<128,false> >"/> | ||
| <class name="portablecollection::CollectionLeaf<1,lst::PixelSeedsSoALayout<128,false> >"/> | ||
|
|
||
| <class name="lst::LSTInputHostCollection"/> | ||
| <class name="edm::Wrapper<lst::LSTInputHostCollection>" splitLevel="0"/> | ||
| <class name="edm::Wrapper<lst::LSTInputHostCollection>" splitLevel="0" persistent="false"/> | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I also marked the LST collections as transient (by policy non-DataFormat packages should not define persistable data products). |
||
|
|
||
| <class name="lst::TrackCandidatesBaseSoALayout<128,false>"/> | ||
| <class name="lst::TrackCandidatesBaseHostCollection"/> | ||
| <class name="edm::Wrapper<lst::TrackCandidatesBaseHostCollection>" splitLevel="0"/> | ||
| <!-- lst::TrackCandidatesBaseHostCollection::Layout must be listed before the aliased-to type --> | ||
| <class name="lst::TrackCandidatesBaseHostCollection::Layout"/> | ||
| <class name="lst::TrackCandidatesBaseSoALayout<128,false>"/> | ||
| <class name="edm::Wrapper<lst::TrackCandidatesBaseHostCollection>" splitLevel="0" persistent="false"/> | ||
| </lcgdict> | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@pcanal I think we discussed about the apparent need to define the class versions and checksums twice (the
BeamSpotHost::Productis an alias forBeamSpotPOD). Or, I didn't manage to come up with any other way that would result in both type names to end up in the.rootmapfile. I wouldn't hold this PR for an improvement, but we should follow up in #49458.