fix variable filling AOD

[u/mrichter/AliRoot.git] / STEER / AOD / AliAODTrack.cxx

diff --git a/STEER/AOD/AliAODTrack.cxx b/STEER/AOD/AliAODTrack.cxx
index f72763ba04f6eab497e2ef6092bca3af77ee4406..1d4985d683974d766aad01ae61037d453260c484 100644 (file)
--- a/STEER/AOD/AliAODTrack.cxx
+++ b/STEER/AOD/AliAODTrack.cxx
@@ -66,8 +66,10 @@ AliAODTrack::AliAODTrack() :
   fTrackPhiOnEMCal(-999),
   fTrackEtaOnEMCal(-999),
   fTrackPtOnEMCal(-999),
+  fIsMuonGlobalTrack(kFALSE),    // AU
   fTPCsignalTuned(0),
   fTOFsignalTuned(99999),
+  fMFTClusterPattern(0),         // AU
   fAODEvent(NULL)
 {
   // default constructor
@@ -125,8 +127,10 @@ AliAODTrack::AliAODTrack(Short_t id,
   fTrackPhiOnEMCal(-999),
   fTrackEtaOnEMCal(-999),
   fTrackPtOnEMCal(-999),
+  fIsMuonGlobalTrack(kFALSE),    // AU
   fTPCsignalTuned(0),
   fTOFsignalTuned(99999),
+  fMFTClusterPattern(0),         // AU
   fAODEvent(NULL)
 {
   // constructor
@@ -188,8 +192,10 @@ AliAODTrack::AliAODTrack(Short_t id,
   fTrackPhiOnEMCal(-999),
   fTrackEtaOnEMCal(-999),
   fTrackPtOnEMCal(-999),
+  fIsMuonGlobalTrack(kFALSE),    // AU
   fTPCsignalTuned(0),
   fTOFsignalTuned(99999),
+  fMFTClusterPattern(0),         // AU
   fAODEvent(NULL)
 {
   // constructor
@@ -212,7 +218,7 @@ AliAODTrack::~AliAODTrack()
   delete fCovMatrix;
   delete fDetPid;
   delete fDetectorPID;
-  delete[] fPID;
+  if (fPID) {delete[] fPID; fPID = 0;}
 }
 
 
@@ -248,8 +254,10 @@ AliAODTrack::AliAODTrack(const AliAODTrack& trk) :
   fTrackPhiOnEMCal(trk.fTrackPhiOnEMCal),
   fTrackEtaOnEMCal(trk.fTrackEtaOnEMCal),
   fTrackPtOnEMCal(trk.fTrackPtOnEMCal),
+  fIsMuonGlobalTrack(trk.fIsMuonGlobalTrack),    // AU
   fTPCsignalTuned(trk.fTPCsignalTuned),
   fTOFsignalTuned(trk.fTOFsignalTuned),
+  fMFTClusterPattern(trk.fMFTClusterPattern),    // AU
   fAODEvent(trk.fAODEvent)
 {
   // Copy constructor
@@ -303,9 +311,11 @@ AliAODTrack& AliAODTrack::operator=(const AliAODTrack& trk)
     fTrackPhiOnEMCal   = trk.fTrackPhiOnEMCal;
     fTrackEtaOnEMCal   = trk.fTrackEtaOnEMCal;
     fTrackPtOnEMCal    = trk.fTrackPtOnEMCal;
+    fIsMuonGlobalTrack = trk.fIsMuonGlobalTrack;     // AU
     fTPCsignalTuned    = trk.fTPCsignalTuned;
     fTOFsignalTuned    = trk.fTOFsignalTuned;
-
+    fMFTClusterPattern = trk.fMFTClusterPattern;     // AU
+    
     delete fCovMatrix;
     if(trk.fCovMatrix) fCovMatrix=new AliAODRedCov<6>(*trk.fCovMatrix);
     else fCovMatrix=NULL;
@@ -807,7 +817,7 @@ Int_t AliAODTrack::GetTOFBunchCrossing(Double_t b, Bool_t) const
   if (IsOn(kTIME)) { // integrated time info is there
     int pid = (int)GetMostProbablePID();
     double ttimes[10]; 
-    GetIntegratedTimes(ttimes);
+    GetIntegratedTimes(ttimes, pid>=AliPID::kSPECIES ? AliPID::kSPECIESC : AliPID::kSPECIES);
     tdif -= ttimes[pid];
   }
   else { // assume integrated time info from TOF radius and momentum