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 and migrating edm::RefToBase to edm::Ptr (list 2 for RNTuple) #43080

Merged
merged 1 commit into from
Nov 1, 2023
Merged

Clean up and migrating edm::RefToBase to edm::Ptr (list 2 for RNTuple) #43080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
49 changes: 0 additions & 49 deletions AnalysisDataFormats/EWK/interface/WMuNuCandidate.h
View file
Open in desktop

This file was deleted.

49 changes: 0 additions & 49 deletions AnalysisDataFormats/EWK/interface/WMuNuCandidatePtr.h
View file
Open in desktop

This file was deleted.

50 changes: 0 additions & 50 deletions AnalysisDataFormats/EWK/src/WMuNuCandidate.cc
View file
Open in desktop

This file was deleted.

51 changes: 0 additions & 51 deletions AnalysisDataFormats/EWK/src/WMuNuCandidatePtr.cc
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions AnalysisDataFormats/EWK/src/classes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
#include "DataFormats/Common/interface/AssociationMap.h"
#include "DataFormats/Common/interface/Association.h"
#include "DataFormats/Candidate/interface/CompositeCandidate.h"
#include "AnalysisDataFormats/EWK/interface/WMuNuCandidatePtr.h"
#include "AnalysisDataFormats/EWK/interface/WMuNuCandidate.h"
#include "DataFormats/Candidate/interface/ShallowCloneCandidate.h"
#include "DataFormats/Candidate/interface/ShallowClonePtrCandidate.h"
#include "DataFormats/Candidate/interface/NamedCompositeCandidate.h"
Expand Down
54 changes: 0 additions & 54 deletions AnalysisDataFormats/EWK/src/classes_def.xml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion CommonTools/RecoAlgos/plugins/CaloRecHitCandidateProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ namespace reco {
math::RhoEtaPhiVector p(1, eta, phi);
p *= (energy / p.r());
CaloRecHitCandidate *c = new CaloRecHitCandidate(Candidate::LorentzVector(p.x(), p.y(), p.z(), energy));
c->setCaloRecHit(RefToBase<CaloRecHit>(Ref<HitCollection>(hits, idx)));
c->setCaloRecHit(Ptr<CaloRecHit>(hits, idx));
cands->push_back(c);
}
evt.put(std::move(cands));
Expand Down
2 changes: 1 addition & 1 deletion DataFormats/CaloRecHit/src/classes_def.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<class name="edm::Wrapper<std::vector<std::pair<unsigned long,edm::Ptr<reco::CaloCluster> > > >"/>
<class name="std::vector<std::pair<unsigned long,edm::Ptr<reco::CaloCluster> > >"/>
<class name="std::pair<unsigned long, edm::Ptr<reco::CaloCluster> >"/>
<class name="edm::RefToBase<CaloRecHit>"/>
<class name="edm::Ptr<CaloRecHit>"/>
<class name="edm::Ptr<reco::CaloCluster>"/>
<class name="edm::PtrVector<reco::CaloCluster>"/>
<class name="edm::Wrapper<edm::PtrVector<reco::CaloCluster> >"/>
Expand Down
6 changes: 3 additions & 3 deletions DataFormats/RecoCandidate/interface/CaloRecHitCandidate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
*/
#include "DataFormats/RecoCandidate/interface/RecoCandidate.h"
#include "DataFormats/CaloRecHit/interface/CaloRecHit.h"
#include "DataFormats/Common/interface/RefToBase.h"
#include "DataFormats/Common/interface/Ptr.h"

namespace reco {

class CaloRecHitCandidate : public LeafCandidate {
public:
typedef edm::RefToBase<CaloRecHit> CaloRecHitRef;
typedef edm::Ptr<CaloRecHit> CaloRecHitRef;
/// default constructor
CaloRecHitCandidate() : LeafCandidate() {}
/// constructor from values
Expand All @@ -41,7 +41,7 @@ namespace reco {
CaloRecHitRef caloRecHit_;
};
/// get default Track component
GET_DEFAULT_CANDIDATE_COMPONENT(CaloRecHitCandidate, edm::RefToBase<CaloRecHit>, caloRecHit);
GET_DEFAULT_CANDIDATE_COMPONENT(CaloRecHitCandidate, edm::Ptr<CaloRecHit>, caloRecHit);

} // namespace reco

Expand Down
4 changes: 2 additions & 2 deletions DataFormats/RecoCandidate/src/classes_def.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
<version ClassVersion="11" checksum="2294254376"/>
<version ClassVersion="10" checksum="4182970126"/>
</class>
<class name="reco::CaloRecHitCandidate" ClassVersion="12">
<class name="reco::CaloRecHitCandidate" ClassVersion="13">
<version ClassVersion="13" checksum="1653614292"/>
<version ClassVersion="12" checksum="878375709"/>
<version ClassVersion="11" checksum="85197237"/>
<version ClassVersion="10" checksum="1441861764"/>
Expand Down Expand Up @@ -113,7 +114,6 @@
<class name="edm::reftobase::VectorHolder<reco::Candidate, reco::RecoEcalCandidateRefVector>" />
<class name="edm::reftobase::RefVectorHolder<reco::RecoEcalCandidateRefVector>" />


<class name="reco::IsoDeposit" ClassVersion="10">
<version ClassVersion="10" checksum="2477314412"/>
</class>
Expand Down