Adding include path to allow compilation of CleanGeom task

[u/mrichter/AliRoot.git] / EMCAL / AliEMCALTrack.cxx

diff --git a/EMCAL/AliEMCALTrack.cxx b/EMCAL/AliEMCALTrack.cxx
old mode 100755 (executable)
new mode 100644 (file)
index ce2098f..912a7d9
--- a/EMCAL/AliEMCALTrack.cxx
+++ b/EMCAL/AliEMCALTrack.cxx
@@ -64,7 +64,7 @@ AliEMCALTrack::AliEMCALTrack(const AliESDtrack& t)
   : AliExternalTrackParam(),
     fClusterIndex(-1),
     fClusterDist(1000.0),
-    fMass(t.GetMass()),
+    fMass(t.GetMass(kTRUE)),
     fSeedIndex(-1),
     fSeedLabel(t.GetLabel())
 {
@@ -73,7 +73,7 @@ AliEMCALTrack::AliEMCALTrack(const AliESDtrack& t)
        //
 
        // parameters are chosen according to static variable fUseOuterParams
-       Double_t alpha, x, params[5], cov[15];
+       Double_t alpha=0., x=0., params[5], cov[15];
        if (fgUseOuterParams) {
          if(t.GetOuterParam()){
            t.GetOuterExternalParameters(alpha, x, params);
@@ -113,21 +113,12 @@ AliEMCALTrack::AliEMCALTrack(const AliEMCALTrack& t)
 //
 //------------------------------------------------------------------------------
 //
-AliEMCALTrack& AliEMCALTrack::operator=(const AliEMCALTrack &t)
-{
-       //
-       // Assignment operator
-       // Works like copy constructor
-       //
-       
-       fClusterIndex = t.fClusterIndex;
-       fClusterDist = t.fClusterDist;
-       
-       fMass = t.fMass;
-       
-       fSeedIndex = t.fSeedIndex;
-       fSeedLabel = t.fSeedLabel;
-       return *this;
+AliEMCALTrack& AliEMCALTrack::operator=(const AliEMCALTrack &source)
+{ // assignment operator; use copy ctor
+  if (&source == this) return *this;
+
+  new (this) AliEMCALTrack(source);
+  return *this;
 }
 //
 //------------------------------------------------------------------------------
@@ -144,7 +135,7 @@ Int_t AliEMCALTrack::Compare(const TObject *obj) const
        
        AliEMCALTrack *that = (AliEMCALTrack*)obj;
        
-       Double_t thisP[3], thisVal, thatP[3], thatVal;
+       Double_t thisP[3], thisVal=0., thatP[3], thatVal=0.;
        
        if (fgSortByPt) {
                this->GetPxPyPz(thisP);
@@ -179,7 +170,7 @@ Bool_t AliEMCALTrack::PropagateTo(Double_t xk, Double_t d, Double_t x0)
        // the local track reference frame is adjusted accordingly.
        //
                
-       Double_t y;
+       Double_t y=0.;
        Double_t field = GetBz();
        Double_t width = TMath::Pi() / 9.0; // width of TPC/TRD/EMCAL sector (= 20 deg)
        Double_t ymax  = TMath::Abs(xk * TMath::Tan(0.5 * width)); // max allowed Y in local coords at distance xk
@@ -192,7 +183,7 @@ Bool_t AliEMCALTrack::PropagateTo(Double_t xk, Double_t d, Double_t x0)
        if (TMath::Abs(y) <= ymax) return SimplePropagation(xk, d, x0);
        
        // otherwise, try change a sector to find one where the propagation is ok
-       Int_t    i, incr, istart, nloops;
+       Int_t    i=0, incr=0, istart=0, nloops=0;
        Double_t alpha = GetAlpha();
        incr = (y > ymax) ? 1 : -1;
        if (alpha < 0.0) alpha += TMath::TwoPi();
@@ -268,16 +259,18 @@ Bool_t AliEMCALTrack::PropagateToGlobal(Double_t x, Double_t y, Double_t z, Doub
 //
 Bool_t AliEMCALTrack::SimplePropagation(Double_t xk, Double_t d, Double_t x0)
 {
-       //
-       // Recall base class method for track propagation.
-       //
-       
-       Double_t field = GetBz();
-       
-       // propagation...
-       if (!AliExternalTrackParam::PropagateTo(xk, field)) return kFALSE;
+  //
+  // Recall base class method for track propagation.
+  //
+  
+  Double_t field[3];
+
+  GetBxByBz(field);
        
-       // EL correction is computed only if requested...
-       if (!fgCorrectForEL) return kTRUE;
-       return AliExternalTrackParam::CorrectForMeanMaterial(d, x0, GetMass());
+  // propagation...
+  if (!AliExternalTrackParam::PropagateToBxByBz(xk, field)) return kFALSE;
+  
+  // EL correction is computed only if requested...
+  if (!fgCorrectForEL) return kTRUE;
+  return AliExternalTrackParam::CorrectForMeanMaterial(d, x0, GetMass());
 }