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

Thread safe changes for Particle class #1129

Merged
merged 10 commits into from
Nov 25, 2013
Merged

Thread safe changes for Particle class #1129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
93f4ec9
Thread safe changes
vkuznet Oct 22, 2013
5a2b521
Convert p4Polar_ and p4Cartesian_ to atomic pointers; re-factor code …
vkuznet Nov 7, 2013
3ec52a8
Convert all (*) to use load/store
vkuznet Nov 7, 2013
a51049f
Adjust HLTReco build file to link against Candidate library
vkuznet Nov 7, 2013
a6856e4
Re-factor code to be more efficient with memory order calls
vkuznet Nov 8, 2013
9963d17
Invoke cachePolar earlier to prevent uninitialized p4Polar_
vkuznet Nov 11, 2013
fd7dc23
Add ioread
vkuznet Nov 11, 2013
e17e11f
Fix issue with p4Cartesian_ assignment
vkuznet Nov 22, 2013
6e5762c
Fix typo
vkuznet Nov 22, 2013
c57cdae
properly initialize p4Cartesian_ pointer
vkuznet Nov 25, 2013
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
167 changes: 64 additions & 103 deletions DataFormats/Candidate/interface/Particle.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
* \version $Id: Particle.h,v 1.29 2011/10/27 16:29:58 wmtan Exp $
*
*/
#if !defined(__CINT__) && !defined(__MAKECINT__) && !defined(__REFLEX__)
#include <atomic>
#endif
#include "DataFormats/Math/interface/Point3D.h"
#include "DataFormats/Math/interface/Vector3D.h"
#include "DataFormats/Math/interface/LorentzVector.h"
Expand All @@ -30,136 +33,101 @@ namespace reco {
/// point in the space
typedef math::XYZVector Vector;
/// default constructor
Particle() :
qx3_(0), pt_(0), eta_(0), phi_(0), mass_(0),
vertex_(0, 0, 0), pdgId_(0), status_(0),
cachePolarFixed_( false ) { }
Particle();
/// constructor from values
Particle( Charge q, const LorentzVector & p4, const Point & vertex = Point( 0, 0, 0 ),
int pdgId = 0, int status = 0, bool integerCharge = true ) :
qx3_( q ), pt_( p4.pt() ), eta_( p4.eta() ), phi_( p4.phi() ), mass_( p4.mass() ),
vertex_( vertex ), pdgId_( pdgId ), status_( status ),
cachePolarFixed_( false ), cacheCartesianFixed_( false ) {
if ( integerCharge ) qx3_ *= 3;
}
int pdgId = 0, int status = 0, bool integerCharge = true );
/// constructor from values
Particle( Charge q, const PolarLorentzVector & p4, const Point & vertex = Point( 0, 0, 0 ),
int pdgId = 0, int status = 0, bool integerCharge = true ) :
qx3_( q ), pt_( p4.pt() ), eta_( p4.eta() ), phi_( p4.phi() ), mass_( p4.mass() ),
vertex_( vertex ), pdgId_( pdgId ), status_( status ),
cachePolarFixed_( false ), cacheCartesianFixed_( false ) {
if ( integerCharge ) qx3_ *= 3;
}
int pdgId = 0, int status = 0, bool integerCharge = true );
void swap(Particle& other);
/// destructor
virtual ~Particle() { }
virtual ~Particle();
// copy ctor
Particle(const Particle& srv);
// assignment operator
Particle& operator=(const Particle& rhs);
/// electric charge
int charge() const { return qx3_ / 3; }
int charge() const;
/// set electric charge
void setCharge( Charge q ) { qx3_ = q * 3; }
void setCharge( Charge q );
/// electric charge
int threeCharge() const { return qx3_; }
int threeCharge() const;
/// set electric charge
void setThreeCharge( Charge qx3 ) { qx3_ = qx3; }
void setThreeCharge( Charge qx3 );
/// four-momentum Lorentz vector
const LorentzVector & p4() const { cacheCartesian(); return p4Cartesian_; }
const LorentzVector & p4() const;
/// four-momentum Lorentz vector
const PolarLorentzVector & polarP4() const { cachePolar(); return p4Polar_; }
const PolarLorentzVector & polarP4() const;
/// spatial momentum vector
Vector momentum() const { cacheCartesian(); return p4Cartesian_.Vect(); }
Vector momentum() const;
/// boost vector to boost a Lorentz vector
/// to the particle center of mass system
Vector boostToCM() const { cacheCartesian(); return p4Cartesian_.BoostToCM(); }
Vector boostToCM() const;
/// magnitude of momentum vector
double p() const { cacheCartesian(); return p4Cartesian_.P(); }
double p() const;
/// energy
double energy() const { cacheCartesian(); return p4Cartesian_.E(); }
double energy() const;
/// transverse energy
double et() const { cachePolar(); return p4Polar_.Et(); }
double et() const;
/// mass
double mass() const { return mass_; }
double mass() const;
/// mass squared
double massSqr() const { return mass_ * mass_; }
double massSqr() const;
/// transverse mass
double mt() const { cachePolar(); return p4Polar_.Mt(); }
double mt() const;
/// transverse mass squared
double mtSqr() const { cachePolar(); return p4Polar_.Mt2(); }
double mtSqr() const;
/// x coordinate of momentum vector
double px() const { cacheCartesian(); return p4Cartesian_.Px(); }
double px() const;
/// y coordinate of momentum vector
double py() const { cacheCartesian(); return p4Cartesian_.Py(); }
double py() const;
/// z coordinate of momentum vector
double pz() const { cacheCartesian(); return p4Cartesian_.Pz(); }
double pz() const;
/// transverse momentum
double pt() const { return pt_; }
double pt() const;
/// momentum azimuthal angle
double phi() const { return phi_; }
double phi() const;
/// momentum polar angle
double theta() const { cacheCartesian(); return p4Cartesian_.Theta(); }
double theta() const;
/// momentum pseudorapidity
double eta() const { return eta_; }
double eta() const;
/// repidity
double rapidity() const { cachePolar(); return p4Polar_.Rapidity(); }
double rapidity() const;
/// repidity
double y() const { return rapidity(); }
double y() const;
/// set 4-momentum
void setP4( const LorentzVector & p4 ) {
p4Cartesian_ = p4;
p4Polar_ = p4;
pt_ = p4Polar_.pt();
eta_ = p4Polar_.eta();
phi_ = p4Polar_.phi();
mass_ = p4Polar_.mass();
cachePolarFixed_ = true;
cacheCartesianFixed_ = true;
}
void setP4( const LorentzVector & p4 );
/// set 4-momentum
void setP4( const PolarLorentzVector & p4 ) {
p4Polar_ = p4;
pt_ = p4Polar_.pt();
eta_ = p4Polar_.eta();
phi_ = p4Polar_.phi();
mass_ = p4Polar_.mass();
cachePolarFixed_ = true;
cacheCartesianFixed_ = false;
}
void setP4( const PolarLorentzVector & p4 );
/// set particle mass
void setMass( double m ) {
mass_ = m;
clearCache();
}
void setPz( double pz ) {
cacheCartesian();
p4Cartesian_.SetPz(pz);
p4Polar_ = p4Cartesian_;
pt_ = p4Polar_.pt();
eta_ = p4Polar_.eta();
phi_ = p4Polar_.phi();
mass_ = p4Polar_.mass();
}
void setMass( double m );
/// set Pz
void setPz( double pz );
/// vertex position
const Point & vertex() const { return vertex_; }
const Point & vertex() const;
/// x coordinate of vertex position
double vx() const { return vertex_.X(); }
double vx() const;
/// y coordinate of vertex position
double vy() const { return vertex_.Y(); }
double vy() const;
/// z coordinate of vertex position
double vz() const { return vertex_.Z(); }
double vz() const;
/// set vertex
void setVertex( const Point & vertex ) { vertex_ = vertex; }
void setVertex( const Point & vertex );
/// PDG identifier
int pdgId() const { return pdgId_; }
int pdgId() const;
// set PDG identifier
void setPdgId( int pdgId ) { pdgId_ = pdgId; }
void setPdgId( int pdgId );
/// status word
int status() const { return status_; }
int status() const;
/// set status word
void setStatus( int status ) { status_ = status; }
void setStatus( int status );
/// long lived flag
static const unsigned int longLivedTag;
/// set long lived flag
void setLongLived() { status_ |= longLivedTag; }
void setLongLived();
/// is long lived?
bool longLived() const { return status_ & longLivedTag; }
bool longLived() const;

protected:
/// electric charge
Expand All @@ -172,30 +140,23 @@ namespace reco {
int pdgId_;
/// status word
int status_;
#if !defined(__CINT__) && !defined(__MAKECINT__) && !defined(__REFLEX__)
/// internal cache for p4
mutable std::atomic<PolarLorentzVector*> p4Polar_;
/// internal cache for p4
mutable PolarLorentzVector p4Polar_;
mutable std::atomic<LorentzVector*> p4Cartesian_;
#else
/// internal cache for p4
mutable LorentzVector p4Cartesian_;
/// has cache been set?
mutable bool cachePolarFixed_, cacheCartesianFixed_;
mutable PolarLorentzVector* p4Polar_;
/// internal cache for p4
mutable LorentzVector* p4Cartesian_;
#endif
/// set internal cache
inline void cachePolar() const {
if ( cachePolarFixed_ ) return;
p4Polar_ = PolarLorentzVector( pt_, eta_, phi_, mass_ );
cachePolarFixed_ = true;
}
void cachePolar() const;
/// set internal cache
inline void cacheCartesian() const {
if ( cacheCartesianFixed_ ) return;
cachePolar();
p4Cartesian_ = p4Polar_;
cacheCartesianFixed_ = true;
}
void cacheCartesian() const;
/// clear internal cache
inline void clearCache() const {
cachePolarFixed_ = false;
cacheCartesianFixed_ = false;
}
void clearCache() const;
};

}
Expand Down
Loading