Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Clean up deprecated edm::RefToBase list 1 for RNTuple #43055

Merged
merged 2 commits into from
Oct 19, 2023
Merged

Clean up deprecated edm::RefToBase list 1 for RNTuple #43055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9f5a9a
remove deprecated edm::RefToBase
jeongeun Oct 19, 2023
6af155e
minor fix
jeongeun Oct 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion DataFormats/BTauReco/src/classes_def.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,6 @@
<class name="std::vector<Measurement1D>"/>

<!-- RefToBase stuff -->
<class name="edm::RefToBase<reco::BaseTagInfo>" />
<class name="edm::reftobase::BaseHolder<reco::BaseTagInfo>" />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR was incomplete. All these ::reftobase:: dictionaries should be cleaned up as well. Could you do that?

<class name="edm::reftobase::IndirectHolder<reco::BaseTagInfo>" />
<class name="edm::reftobase::Holder<reco::BaseTagInfo, reco::BaseTagInfoRef>" />
Expand Down
4 changes: 0 additions & 4 deletions DataFormats/Candidate/interface/CompositeCandidateFwd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,8 @@ namespace reco {
typedef edm::View<CompositeCandidate> CompositeCandidateView;
/// persistent reference to an object in a collection of Candidate objects
typedef edm::Ref<CompositeCandidateCollection> CompositeCandidateRef;
/// persistent reference to an object in a collection of Candidate objects
typedef edm::RefToBase<CompositeCandidate> CompositeCandidateBaseRef;
/// vector of references to objects in the same collection of Candidate objects
typedef edm::RefVector<CompositeCandidateCollection> CompositeCandidateRefVector;
/// vector of references to objects in the same collection of Candidate objects via base type
typedef edm::RefToBaseVector<CompositeCandidate> CompositeCandidateBaseRefVector;
/// reference to a collection of Candidate objects
typedef edm::RefProd<CompositeCandidateCollection> CompositeCandidateRefProd;
/// vector of references to objects in the same collection of Candidate objects via base type
Expand Down
2 changes: 0 additions & 2 deletions DataFormats/Candidate/interface/NamedCompositeCandidateFwd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ namespace reco {
typedef edm::RefToBase<NamedCompositeCandidate> NamedCompositeCandidateBaseRef;
/// vector of references to objects in the same collection of Candidate objects
typedef edm::RefVector<NamedCompositeCandidateCollection> NamedCompositeCandidateRefVector;
/// vector of references to objects in the same collection of Candidate objects via base type
typedef edm::RefToBaseVector<NamedCompositeCandidate> NamedCompositeCandidateBaseRefVector;
/// reference to a collection of Candidate objects
typedef edm::RefProd<NamedCompositeCandidateCollection> NamedCompositeCandidateRefProd;
/// vector of references to objects in the same collection of Candidate objects via base type
Expand Down
4 changes: 0 additions & 4 deletions DataFormats/Candidate/interface/VertexCompositeCandidateFwd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,8 @@ namespace reco {
typedef edm::View<VertexCompositeCandidate> VertexCompositeCandidateView;
/// persistent reference to an object in a collection of Candidate objects
typedef edm::Ref<VertexCompositeCandidateCollection> VertexCompositeCandidateRef;
/// persistent reference to an object in a collection of Candidate objects
typedef edm::RefToBase<VertexCompositeCandidate> VertexCompositeCandidateBaseRef;
/// vector of references to objects in the same collection of Candidate objects
typedef edm::RefVector<VertexCompositeCandidateCollection> VertexCompositeCandidateRefVector;
/// vector of references to objects in the same collection of Candidate objects via base type
typedef edm::RefToBaseVector<VertexCompositeCandidate> VertexCompositeCandidateBaseRefVector;
/// reference to a collection of Candidate objects
typedef edm::RefProd<VertexCompositeCandidateCollection> VertexCompositeCandidateRefProd;
/// vector of references to objects in the same collection of Candidate objects via base type
Expand Down
2 changes: 0 additions & 2 deletions DataFormats/Candidate/interface/VertexCompositePtrCandidateFwd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ namespace reco {
typedef edm::View<VertexCompositePtrCandidate> VertexCompositePtrCandidateView;
/// persistent reference to an object in a collection of Candidate objects
typedef edm::Ref<VertexCompositePtrCandidateCollection> VertexCompositePtrCandidateRef;
/// persistent reference to an object in a collection of Candidate objects
typedef edm::RefToBase<VertexCompositePtrCandidate> VertexCompositePtrCandidateBaseRef;
/// vector of references to objects in the same collection of Candidate objects
typedef edm::RefVector<VertexCompositePtrCandidateCollection> VertexCompositePtrCandidateRefVector;
/// vector of references to objects in the same collection of Candidate objects via base type
Expand Down
6 changes: 0 additions & 6 deletions DataFormats/EgammaCandidates/src/classes_def.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,8 @@

<class name="std::vector<reco::PhotonCore>"/>
<class name="edm::reftobase::BaseHolder<reco::PhotonCore>"/>
<class name="edm::RefToBase<reco::PhotonCore>"/>
<class name="edm::reftobase::IndirectHolder<reco::PhotonCore>" />
<class name="edm::RefToBaseProd<reco::PhotonCore>" />
<class name="edm::RefToBaseVector<reco::PhotonCore>" />
<class name="edm::Wrapper<edm::RefToBaseVector<reco::PhotonCore> >" />
<class name="edm::reftobase::BaseVectorHolder<reco::PhotonCore>" />
<class name="edm::Wrapper<std::vector<reco::PhotonCore> >"/>
<class name="edm::Ref<std::vector<reco::PhotonCore>,reco::PhotonCore,edm::refhelper::FindUsingAdvance<std::vector<reco::PhotonCore>,reco::PhotonCore> >"/>
Expand Down Expand Up @@ -144,11 +141,8 @@

<class name="std::vector<reco::GsfElectronCore>"/>
<class name="edm::reftobase::BaseHolder<reco::GsfElectronCore>"/>
<class name="edm::RefToBase<reco::GsfElectronCore>"/>
<class name="edm::reftobase::IndirectHolder<reco::GsfElectronCore>" />
<class name="edm::RefToBaseProd<reco::GsfElectronCore>" />
<class name="edm::RefToBaseVector<reco::GsfElectronCore>" />
<class name="edm::Wrapper<edm::RefToBaseVector<reco::GsfElectronCore> >" />
<class name="edm::reftobase::BaseVectorHolder<reco::GsfElectronCore>" />
<class name="edm::Wrapper<std::vector<reco::GsfElectronCore> >"/>
<class name="edm::Ref<std::vector<reco::GsfElectronCore>,reco::GsfElectronCore,edm::refhelper::FindUsingAdvance<std::vector<reco::GsfElectronCore>,reco::GsfElectronCore> >"/>
Expand Down
1 change: 0 additions & 1 deletion DataFormats/EgammaReco/src/classes_def.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@
<class name="edm::Wrapper<std::vector<reco::ElectronSeed> >"/>
<class name="edm::RefVector<std::vector<reco::ElectronSeed>,reco::ElectronSeed,edm::refhelper::FindUsingAdvance<std::vector<reco::ElectronSeed>,reco::ElectronSeed> >"/>
<class name="edm::Wrapper<edm::RefVector<std::vector<reco::ElectronSeed>,reco::ElectronSeed,edm::refhelper::FindUsingAdvance<std::vector<reco::ElectronSeed>,reco::ElectronSeed> > >"/>
<class name="edm::RefToBase<reco::ElectronSeed>"/>
<class name="edm::reftobase::BaseHolder<reco::ElectronSeed>" />
<class name="edm::reftobase::IndirectHolder<reco::ElectronSeed>" />
<class name="edm::reftobase::RefHolder<edm::Ref<std::vector<reco::ElectronSeed>,reco::ElectronSeed,edm::refhelper::FindUsingAdvance<std::vector<reco::ElectronSeed>,reco::ElectronSeed> > >"/>
Expand Down
2 changes: 0 additions & 2 deletions DataFormats/MuonSeed/src/classes_def.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<version ClassVersion="11" checksum="541533207"/>
<version ClassVersion="10" checksum="2502730614"/>
</class>
<class name="edm::RefToBase<L2MuonTrajectorySeed>"/>
<class name="edm::reftobase::BaseHolder<L2MuonTrajectorySeed>" />
<class name="edm::reftobase::IndirectHolder<L2MuonTrajectorySeed>" />

Expand Down Expand Up @@ -34,7 +33,6 @@
<version ClassVersion="11" checksum="981061883"/>
<version ClassVersion="10" checksum="2200485484"/>
</class>
<class name="edm::RefToBase<L3MuonTrajectorySeed>"/>
<class name="edm::reftobase::BaseHolder<L3MuonTrajectorySeed>" />
<class name="edm::reftobase::IndirectHolder<L3MuonTrajectorySeed>" />

Expand Down
1 change: 0 additions & 1 deletion DataFormats/ParticleFlowReco/src/classes_def_1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
<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> > >"/>
Expand Down
4 changes: 0 additions & 4 deletions DataFormats/TauReco/src/classes_def_2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,8 @@
<class name="edm::RefToBaseProd<reco::PFTau>" >
<!-- <field name="view_" transient="true" /> -->
</class>
<class name="edm::RefToBase<reco::PFTau>" />
<class name="edm::reftobase::BaseHolder<reco::PFTau>" />
<class name="edm::reftobase::IndirectHolder<reco::PFTau>" />
<!---<class name="edm::reftobase::Holder<reco::PFTau,edm::RefToBase<reco::PFTau> > "/>-->
<class name="edm::RefToBaseVector<reco::PFTau>"/>
<class name="edm::Wrapper<edm::RefToBaseVector<reco::PFTau> >"/>
<class name="edm::reftobase::BaseVectorHolder<reco::PFTau>"/>
<class name="edm::reftobase::Holder<reco::PFTau, reco::PFTauRef>" />
<class name="edm::reftobase::RefHolder<reco::PFTauRef>" />
Expand Down
3 changes: 0 additions & 3 deletions SimDataFormats/TrackingHit/interface/PSimHitContainer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@ namespace edm {
typedef edm::Ref<edm::PSimHitContainer> TrackPSimHitRef;
typedef edm::RefProd<edm::PSimHitContainer> TrackPSimHitRefProd;

typedef std::vector<edm::RefToBase<PSimHit> > TrackPSimHitRefToBaseVector;
typedef edm::RefToBase<PSimHit> TrackPSimHitRefToBase;
typedef std::vector<edm::RefToBase<PSimHit> > TrackPSimHitRefToBaseVector;
typedef edm::reftobase::Holder<PSimHit, TrackPSimHitRef> TrackPSimHitRefToBaseHolder;

#endif
2 changes: 0 additions & 2 deletions SimDataFormats/TrackingHit/src/classes_def.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
<class name="edm::Ref<std::vector<PSimHit>,PSimHit,edm::refhelper::FindUsingAdvance<std::vector<PSimHit>,PSimHit> >"/>

<class name="edm::reftobase::BaseHolder<PSimHit>"/>
<class name="edm::RefToBase<PSimHit>"/>
<class name="std::vector<edm::RefToBase<PSimHit> >"/>
<class name="edm::reftobase::Holder<PSimHit,edm::Ref<std::vector<PSimHit>,PSimHit,edm::refhelper::FindUsingAdvance<std::vector<PSimHit>,PSimHit> > >"/>

</lcgdict>