Skip to content

[EVO] PFCandidate no longer inherits from CompositeCandidate #50682

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

Merged
cmsbuild merged 1 commit into from
Apr 15, 2026
Merged

[EVO] PFCandidate no longer inherits from CompositeCandidate #50682

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
4 changes: 2 additions & 2 deletions DataFormats/ParticleFlowCandidate/interface/PFCandidate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#include "DataFormats/Math/interface/Point3D.h"

#include "DataFormats/Candidate/interface/CompositeCandidate.h"
#include "DataFormats/Candidate/interface/LeafCandidate.h"
#include "DataFormats/ParticleFlowReco/interface/PFBlockFwd.h"
#include "DataFormats/TrackReco/interface/TrackFwd.h"
#include "DataFormats/GsfTrackReco/interface/GsfTrack.h"
Expand All @@ -39,7 +39,7 @@ namespace reco {
\date February 2007
*/

class PFCandidate : public CompositeCandidate {
class PFCandidate : public LeafCandidate {
public:
/// particle types
enum ParticleType {
Expand Down
6 changes: 3 additions & 3 deletions DataFormats/ParticleFlowCandidate/src/PFCandidate.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ PFCandidate::PFCandidate(const PFCandidatePtr& sourcePtr) : PFCandidate(*sourceP
}

PFCandidate::PFCandidate(Charge charge, const LorentzVector& p4, ParticleType partId)
: CompositeCandidate(charge, p4),
: LeafCandidate(charge, p4),
elementsInBlocks_(nullptr),
ecalERatio_(1.),
hcalERatio_(1.),
Expand Down Expand Up @@ -123,7 +123,7 @@ PFCandidate::PFCandidate(Charge charge, const LorentzVector& p4, ParticleType pa
}

PFCandidate::PFCandidate(PFCandidate const& iOther)
: CompositeCandidate(iOther),
: LeafCandidate(static_cast<LeafCandidate const&>(iOther)),
elementsInBlocks_(nullptr),
blocksStorage_(iOther.blocksStorage_),
elementsStorage_(iOther.elementsStorage_),
Expand Down Expand Up @@ -168,7 +168,7 @@ PFCandidate::PFCandidate(PFCandidate const& iOther)
}

PFCandidate& PFCandidate::operator=(PFCandidate const& iOther) {
CompositeCandidate::operator=(iOther);
LeafCandidate::operator=(iOther);
auto tmp = iOther.elementsInBlocks_.load(std::memory_order_acquire);
if (nullptr != tmp) {
delete elementsInBlocks_.exchange(new ElementsInBlocks{*tmp}, std::memory_order_acq_rel);
Expand Down
6 changes: 3 additions & 3 deletions DataFormats/ParticleFlowCandidate/src/classes_def.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<lcgdict>

<class name="reco::io_v1::PFCandidate" ClassVersion="3">
<version ClassVersion="3" checksum="3624191462"/>
<version ClassVersion="3" checksum="2023344531"/>
<field name="elementsInBlocks_" transient="true"/>
<field name="getter_" transient="true"/>
<field name="refsCollectionCache_" transient="true"/>
Expand Down Expand Up @@ -48,7 +48,7 @@
<class name="edm::Wrapper<edm::PtrVector<reco::io_v1::PFCandidate> >"/>

<class name="reco::IsolatedPFCandidate" ClassVersion="3">
<version ClassVersion="3" checksum="1014378071"/>
<version ClassVersion="3" checksum="2477942852"/>
</class>
<class name="std::vector<reco::IsolatedPFCandidate>"/>
<class name="edm::Wrapper<std::vector<reco::IsolatedPFCandidate> >"/>
Expand All @@ -58,7 +58,7 @@
<class name="reco::IsolatedPFCandidatePtr"/>

<class name="reco::PileUpPFCandidate" ClassVersion="3">
<version ClassVersion="3" checksum="4065313068"/>
<version ClassVersion="3" checksum="3974747921"/>
</class>
<class name="std::vector<reco::PileUpPFCandidate>"/>
<class name="edm::Wrapper<std::vector<reco::PileUpPFCandidate> >"/>
Expand Down
2 changes: 1 addition & 1 deletion DataFormats/PatCandidates/src/classes_def_objects.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
<version ClassVersion="3" checksum="3450971292"/>
</class>
<class name="pat::PFParticle" ClassVersion="3">
<version ClassVersion="3" checksum="213995894"/>
<version ClassVersion="3" checksum="2508658165"/>
</class>
<class name="pat::GenericParticle" ClassVersion="3">
<version ClassVersion="3" checksum="3105008866"/>
Expand Down