Fixes to calls for MeanMaterialBudget (now in AliTracker) (From Jouri Belikov)

diff --git a/EMCAL/AliEMCALTrack.cxx b/EMCAL/AliEMCALTrack.cxx
index 5902791f2fe122ea115a68ca10cfa15b2f7888e5..7c56b37522979f8d223962c6076fc1cacbfd9e6c 100755 (executable)
--- a/EMCAL/AliEMCALTrack.cxx
+++ b/EMCAL/AliEMCALTrack.cxx
@@ -294,5 +294,5 @@ Bool_t AliEMCALTrack::SimplePropagation(Double_t xk, Double_t d, Double_t x0)
        
        // EL correction is computed only if requested...
        if (!fgCorrectForEL) return kTRUE;
-       return AliExternalTrackParam::CorrectForMaterial(d, x0, GetMass());
+       return AliExternalTrackParam::CorrectForMeanMaterial(d, x0, GetMass());
 }

diff --git a/EMCAL/AliEMCALTracker.cxx b/EMCAL/AliEMCALTracker.cxx
index 1b3ca8d00479d6e8663ca0ffadc4e2a5acf2a10a..2a4d8648976eb6be3a9c16e4fb7d9f75e0ef4543 100644 (file)
--- a/EMCAL/AliEMCALTracker.cxx
+++ b/EMCAL/AliEMCALTracker.cxx
@@ -44,7 +44,6 @@
 #include "AliESDEvent.h"
 #include "AliESDtrack.h"
 #include "AliESDCaloCluster.h"
-#include "AliKalmanTrack.h"
 #include "AliEMCALRecPoint.h"
 #include "AliRunLoader.h"
 #include "AliEMCALTrack.h"
@@ -562,8 +561,8 @@ Double_t AliEMCALTracker::CheckPair
                pos2[0] = cl->X();
                pos2[1] = cl->Y();
                pos2[2] = cl->Z();
-               AliKalmanTrack::MeanMaterialBudget(pos1, pos2, param);
-               rho = param[0];
+               MeanMaterialBudget(pos1, pos2, param);
+               rho = param[0]*param[4];
                x0 = param[1];
        }
        else if (fTrackCorrMode == kTrackCorrFixed) {
@@ -691,8 +690,8 @@ Double_t AliEMCALTracker::CheckPairV2
                pos2[0] = cl->X();
                pos2[1] = cl->Y();
                pos2[2] = cl->Z();
-               AliKalmanTrack::MeanMaterialBudget(pos1, pos2, param);
-               rho = param[0];
+               MeanMaterialBudget(pos1, pos2, param);
+               rho = param[0]*param[4];
                x0 = param[1];
        }
        else if (fTrackCorrMode == kTrackCorrFixed) {
@@ -849,11 +848,10 @@ Bool_t AliEMCALTracker::PropagateToEMCAL(AliEMCALTrack *tr)
                tr->GetXYZ(x1);
                bz = tr->GetBz();
                if (!tr->GetXYZAt(xtemp, bz, x2)) return kFALSE;
-               AliKalmanTrack::MeanMaterialBudget(x1, x2, param);
-               d = param[4];
-               rho = param[0];
+               MeanMaterialBudget(x1, x2, param);
+               rho = param[0]*param[4];
                x0 = param[1];
-               if (!tr->PropagateTo(xtemp, d*rho/x0, x0)) return kFALSE;
+               if (!tr->PropagateTo(xtemp, rho, x0)) return kFALSE;
        }
        
        return kTRUE;