Changeset 439 in svn for trunk

Timestamp:

Jun 17, 2009, 11:08:32 PM (15 years ago)

Author:

Xavier Rouby

Message:

TRootGenFwdParticle better written

File:

• trunk/Utilities/ExRootAnalysis/src/BlockClasses.cc (modified) (4 diffs)

trunk/Utilities/ExRootAnalysis/src/BlockClasses.cc

@@ -124 +124 @@
 
 
-TRootGenFwdParticle::TRootGenFwdParticle(const TRootGenFwdParticle& p): 
+TRootGenFwdParticle::TRootGenFwdParticle(const TRootGenFwdParticle& p): TSortableObject(),
         genE(p.genE), genPx(p.genPx), genPy(p.genPy), genPz(p.genPz), genPT(p.genPT), genEta(p.genEta), genPhi(p.genPhi) {}
 
 TRootGenFwdParticle& TRootGenFwdParticle::operator=(const TRootGenFwdParticle& p){
+   if(this == &p) return *this;
         genE=p.genE;    genPx=p.genPx;   genPy=p.genPy;   genPz=p.genPz;   
         genPT=p.genPT;  genEta=p.genEta; genPhi=p.genPhi;
+   return *this;
 }
 
@@ -188 +190 @@
         Charge = UNDEFINED;
 }
-TRootTracks::TRootTracks(const TRootTracks& track) :
+TRootTracks::TRootTracks(const TRootTracks& track) : TSortableObject(),
         Eta(track.Eta), Phi(track.Phi), 
         EtaOuter(track.EtaOuter), PhiOuter(track.PhiOuter), 
@@ -219 +221 @@
         //Eta(UNDEFINED), Phi(UNDEFINED), E_em(UNDEFINED), E_had(UNDEFINED), E(UNDEFINED), ET(UNDEFINED) {}
 
-TRootCalo::TRootCalo(const TRootCalo& cal) {
+TRootCalo::TRootCalo(const TRootCalo& cal) : TSortableObject() {
         E_em=cal.E_em; E_had=cal.E_had;  ET=cal.ET;
         //Eta =cal.Eta;  Phi=cal.Phi; E_em=cal.E_em; E_had=cal.E_had;  E=cal.E;   ET=cal.ET;
@@ -237 +239 @@
 
 TRootZdcHits::TRootZdcHits(const float e, const float t, const int side, const bool had) : E(e), T(t), side(side), hadronic_hit(had) {}
-TRootZdcHits::TRootZdcHits(const TRootZdcHits& zdc) : E(zdc.E), T(zdc.T), side(zdc.side),  hadronic_hit(zdc.hadronic_hit) {}
+
+TRootZdcHits::TRootZdcHits(const TRootZdcHits& zdc) : TRootGenFwdParticle(zdc), E(zdc.E), T(zdc.T), side(zdc.side),  hadronic_hit(zdc.hadronic_hit) {}
+
 TRootZdcHits& TRootZdcHits::operator=(const TRootZdcHits& zdc) {
-        if(this==&zdc) return *this;
+  if(this==&zdc) return *this;
         E = zdc.E; T = zdc.T;  side = zdc.side; hadronic_hit = zdc.hadronic_hit;
   return *this;