X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EMCAL%2FAliEMCALHit.cxx;h=4177a619836fac71a1e207c00d5939bcc3de3e73;hb=0ee65027dd9b256d65f47048cd30a00dc8f0e0b1;hp=d3d6a7d18885878fea2d137a317fbfb7a8e6858b;hpb=fdebddebb521c2f316af46d2034286ce5100c285;p=u%2Fmrichter%2FAliRoot.git

diff --git a/EMCAL/AliEMCALHit.cxx b/EMCAL/AliEMCALHit.cxx
index d3d6a7d1888..4177a619836 100644
--- a/EMCAL/AliEMCALHit.cxx
+++ b/EMCAL/AliEMCALHit.cxx
@@ -33,46 +33,60 @@
 ClassImp(AliEMCALHit)
 
 //______________________________________________________________________
-AliEMCALHit::AliEMCALHit(){
+AliEMCALHit::AliEMCALHit()
+  : fId(0),
+    fELOS(0.),
+    fPrimary(0),
+    fPx(0.),
+    fPy(0.),
+    fPz(0.),
+    fPe(0.),
+    fIparent(0),
+    fIenergy(0.),
+    fTime(0.)
+{
     // Default ctor
-   
-    fId      = 0;
-    fELOS    = 0.0;
-    fTime    = 0.0;
-    fPrimary = 0;
-    fTrack   = 0;
-    fX       = 0.0;
-    fY       = 0.0;
-    fZ       = 0.0;
-    fPx      = 0.0;
-    fPy      = 0.0;
-    fPz      = 0.0;
-    fPe      = 0.0;
-    fIparent = 0;
-    fIenergy = 0.0;
 }
+
 //______________________________________________________________________
-AliEMCALHit::AliEMCALHit(const AliEMCALHit & hit) : AliHit(hit){
+AliEMCALHit::AliEMCALHit(const AliEMCALHit & hit) 
+  : AliHit(hit),
+    fId(hit.fId),
+    fELOS(hit.fELOS),
+    fPrimary(hit.fPrimary),
+    fPx(hit.fPx),
+    fPy(hit.fPy),
+    fPz(hit.fPz),
+    fPe(hit.fPe),
+    fIparent(hit.fIparent),
+    fIenergy(hit.fIenergy),
+    fTime(hit.fTime)
+{
     // copy ctor
-   
-    fId      = hit.fId ; 
-    fELOS    = hit.fELOS ;
-    fPrimary = hit.fPrimary ; 
-    fTrack   = hit.fTrack ; 
-    fX       = hit.fX;
-    fY       = hit.fY;
-    fZ       = hit.fZ;
-    fPx       = hit.fPx;
-    fPy       = hit.fPy;
-    fPz       = hit.fPz;
-    fPe       = hit.fPe;
-    fIparent = hit.fIparent;
-    fIenergy = hit.fIenergy;
-    fTime    = hit.fTime  ;
+}
+//_____________________________________________________________________
+AliEMCALHit& AliEMCALHit::operator = (const AliEMCALHit &source)
+{ // assignment operator; use copy ctor
+  if (&source == this) return *this;
+
+  new (this) AliEMCALHit(source);
+  return *this;
 }
 //______________________________________________________________________
 AliEMCALHit::AliEMCALHit(Int_t shunt, Int_t primary, Int_t track,Int_t iparent, Float_t ienergy, Int_t id,
-			 Float_t *hits,Float_t *p):AliHit(shunt, track){
+			 Float_t *hits,Float_t *p)
+  : AliHit(shunt, track),
+    fId(id),
+    fELOS(0.),
+    fPrimary(primary),
+    fPx(0.),
+    fPy(0.),
+    fPz(0.),
+    fPe(0.),
+    fIparent(iparent),
+    fIenergy(ienergy),
+    fTime(0.)
+{
     //
     // Create an EMCAL  hit object
     //
@@ -80,15 +94,11 @@ AliEMCALHit::AliEMCALHit(Int_t shunt, Int_t primary, Int_t track,Int_t iparent,
     fY          = hits[1];
     fZ          = hits[2];
     fTime       = hits[3] ;
-    fId         = id;
     fELOS       = hits[4];
-    fPrimary    = primary;
     fPx          = p[0];
     fPy          = p[1];
     fPz          = p[2];
     fPe          = p[3];
-    fIparent    = iparent;
-    fIenergy    = ienergy;
 }
 
 //______________________________________________________________________