Try to fix Delete problem in trigger code

diff --git a/TRD/AliTRDgtuTrack.cxx b/TRD/AliTRDgtuTrack.cxx
index aeb575a0e38b682ab1e2e3b59c7fdf2b448e4fec..19db696d22319197418e838944f49ba0b9098b76 100644 (file)
--- a/TRD/AliTRDgtuTrack.cxx
+++ b/TRD/AliTRDgtuTrack.cxx
@@ -128,6 +128,7 @@ AliTRDgtuTrack::~AliTRDgtuTrack()
   if (fTracklets) {
     fTracklets->Delete();
     delete fTracklets;
+    fTracklets = 0;
   }
 
 }
@@ -169,10 +170,14 @@ Int_t AliTRDgtuTrack::Compare(const TObject * o) const
   // Compare function for sorting the tracks
   //
 
-  AliTRDgtuTrack *gtutrack = (AliTRDgtuTrack*)o;
+  AliTRDgtuTrack *gtutrack = (AliTRDgtuTrack *) o;
 
-  if (fYproj <  gtutrack->GetYproj()) return -1;
-  if (fYproj == gtutrack->GetYproj()) return  0;
+  if (fYproj <  gtutrack->GetYproj()) {
+    return -1;
+  }
+  if (fYproj == gtutrack->GetYproj()) {
+    return  0;
+  }
 
   return +1;
 
@@ -369,18 +374,23 @@ void AliTRDgtuTrack::MakePID()
 
   Int_t i = 0;
 
-  AliTRDcalibDB* calibration = AliTRDcalibDB::Instance();
-  if (!calibration)
-  {
+  AliTRDcalibDB *calibration = AliTRDcalibDB::Instance();
+  if (!calibration) {
     AliError("No instance of AliTRDcalibDB.");
     return;  
   }
   const AliTRDCalPIDLQ *pd = calibration->GetPIDLQObject();
   
   AliTRDltuTracklet *trk;
-  Int_t nTracklets = GetNtracklets();
-  Int_t det, pla;
-  Float_t sl, th, q, probPio = 1.0, probEle = 1.0;
+  Int_t   nTracklets = GetNtracklets();
+  Int_t   det;
+  Int_t   pla;
+  Float_t sl;
+  Float_t th;
+  Float_t q;
+  Float_t probPio = 1.0;
+  Float_t probEle = 1.0;
+
   for (i = 0; i < nTracklets; i++) {
 
     trk = GetTracklet(i);
@@ -486,12 +496,15 @@ void AliTRDgtuTrack::CookLabel()
   }
 
   Bool_t counted;
-  Int_t label, nTracks = 0;
+  Int_t  label;
+  Int_t  nTracks = 0;
   for (Int_t itrk = 0; itrk < fNtracklets; itrk++) {
 
     trk = GetTracklet(itrk);
 
-    if (trk->GetLabel() == -1) continue;
+    if (trk->GetLabel() == -1) {
+      continue;
+    }
 
     label = trk->GetLabel();
 
@@ -516,9 +529,9 @@ void AliTRDgtuTrack::CookLabel()
     
   }
 
-  Float_t frac = 4.0/5.0;
+  Float_t frac = 4.0 / 5.0;
   for (Int_t it = 0; it < kMaxTracks; it++) {
-    if (trackCount[it] >= (Int_t)(frac*fNtracklets)) {
+    if (trackCount[it] >= (Int_t) (frac*fNtracklets)) {
       fLabel = trackLabel[it];
       break;
     }
@@ -540,7 +553,7 @@ void AliTRDgtuTrack::ResetTracklets()
 }
 
 //_____________________________________________________________________________
-TObjArray* AliTRDgtuTrack::Tracklets() 
+TObjArray *AliTRDgtuTrack::Tracklets() 
 { 
   //
   // Returns the list of tracklets

diff --git a/TRD/AliTRDltuTracklet.cxx b/TRD/AliTRDltuTracklet.cxx
index 58a46bcaffa521a3891761b6d7b9ca9b3f14aef8..47bfe6263e02ce3f4657a6471fdd9ca306048b9b 100644 (file)
--- a/TRD/AliTRDltuTracklet.cxx
+++ b/TRD/AliTRDltuTracklet.cxx
@@ -45,6 +45,7 @@ AliTRDltuTracklet::AliTRDltuTracklet()
   //
   // AliTRDltuTracklet default constructor
   //
+
 }
 
 //_____________________________________________________________________________
@@ -72,7 +73,7 @@ AliTRDltuTracklet::AliTRDltuTracklet(Int_t det, Int_t row, Float_t rowz
 AliTRDltuTracklet::~AliTRDltuTracklet()
 {
   //
-  // destructor
+  // Destructor
   //
 
 }
@@ -88,10 +89,10 @@ Float_t AliTRDltuTracklet::GetPt(Float_t field) const
   // Consistent with AliTRDmcmTracklet::GetPt(...)
   //
 
-  Float_t infSlope = TMath::ATan(fY/fX)/TMath::Pi()*180.0;    
+  Float_t infSlope = TMath::ATan(fY/fX) / TMath::Pi()*180.0;    
   Float_t alpha    = fSlope - infSlope;
   Float_t r        = TMath::Sqrt(fX*fX + fY*fY)
-                   / (2.0*TMath::Sin(alpha/180.0*TMath::Pi()));
+                   / (2.0 * TMath::Sin(alpha/180.0*TMath::Pi()));
   
   Float_t pt       = 0.3 * field * 0.01 * r;
  
@@ -100,19 +101,27 @@ Float_t AliTRDltuTracklet::GetPt(Float_t field) const
 }
 
 //_____________________________________________________________________________
-Int_t AliTRDltuTracklet::Compare(const TObject * o) const
+Int_t AliTRDltuTracklet::Compare(const TObject *o) const
 {
   //
   // compare two LTU tracklets according to the intercept point Y1
   //
 
-  AliTRDltuTracklet *ltutrk = (AliTRDltuTracklet*)o;
-
-  if (fRow      != ltutrk->fRow)      return +1;
-  if (fDetector != ltutrk->fDetector) return +1;
-
-  if (fY <  ltutrk->fY) return -1;
-  if (fY == ltutrk->fY) return  0;
+  AliTRDltuTracklet *ltutrk = (AliTRDltuTracklet *) o;
+
+  if (fRow      != ltutrk->fRow) {
+    return +1;
+  }
+  if (fDetector != ltutrk->fDetector) {
+    return +1;
+  }
+
+  if (fY <  ltutrk->fY) {
+    return -1;
+  }
+  if (fY == ltutrk->fY) {
+    return  0;
+  }
 
   return 1;