From 3b0abc02a22635f09d0a828264abbddc72d65fa3 Mon Sep 17 00:00:00 2001
From: auras <auras@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Wed, 12 Sep 2012 14:42:24 +0000
Subject: [PATCH] analysis code updated

---
 MFT/AliMFTCluster.h                 | 2 +-
 MFT/AliMuonForwardTrack.cxx         | 3 ++-
 MFT/AliMuonForwardTrackAnalysis.cxx | 5 +++--
 MFT/AliMuonForwardTrackPair.h       | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/MFT/AliMFTCluster.h b/MFT/AliMFTCluster.h
index f3fc2c10b80..7b47ad8a784 100644
--- a/MFT/AliMFTCluster.h
+++ b/MFT/AliMFTCluster.h
@@ -30,7 +30,7 @@ public:
   AliMFTCluster& operator=(const AliMFTCluster&);
   virtual ~AliMFTCluster() { fDigitsInCluster->Delete(); delete fDigitsInCluster; }
 
-  virtual void Clear(const Option_t* /*opt*/) { delete fDigitsInCluster; fDigitsInCluster = 0x0; }
+  virtual void Clear(const Option_t* /*opt*/) { fDigitsInCluster->Delete(); delete fDigitsInCluster; fDigitsInCluster = 0x0; }
   
   void SetXYZ(Double_t x, Double_t y, Double_t z) { fX=x; fY=y; fZ=z; }
 
diff --git a/MFT/AliMuonForwardTrack.cxx b/MFT/AliMuonForwardTrack.cxx
index 03927c9e788..16c3e9bf04e 100644
--- a/MFT/AliMuonForwardTrack.cxx
+++ b/MFT/AliMuonForwardTrack.cxx
@@ -141,9 +141,10 @@ AliMuonForwardTrack& AliMuonForwardTrack::operator=(const AliMuonForwardTrack& t
 void AliMuonForwardTrack::Clear(const Option_t* /*opt*/) {
 
   // Clear arrays
+  fMFTClusters -> Delete(); 
+  delete fMFTClusters; fMFTClusters = 0x0;
   delete fMUONTrack;   fMUONTrack   = 0x0;
   delete fMCTrackRef;  fMCTrackRef  = 0x0;
-  delete fMFTClusters; fMFTClusters = 0x0;
   
 }
 
diff --git a/MFT/AliMuonForwardTrackAnalysis.cxx b/MFT/AliMuonForwardTrackAnalysis.cxx
index 65c9bd8cf26..bd9068baf2b 100644
--- a/MFT/AliMuonForwardTrackAnalysis.cxx
+++ b/MFT/AliMuonForwardTrackAnalysis.cxx
@@ -134,7 +134,8 @@ Bool_t AliMuonForwardTrackAnalysis::Init(Char_t *inputFileName) {
     return kFALSE;
   }
 
-  if (fFirstEvent<0 || fLastEvent<0 || fFirstEvent>fLastEvent || fFirstEvent>=fInputTreeWithBranson->GetEntriesFast()) {
+  if (fFirstEvent>=fInputTreeWithBranson->GetEntriesFast()) return kFALSE;
+  else if (fFirstEvent<0 || fLastEvent<0 || fFirstEvent>fLastEvent || fFirstEvent>=fInputTreeWithBranson->GetEntriesFast()) {
     fFirstEvent = 0;
     fLastEvent  = fInputTreeWithBranson->GetEntriesFast()-1;
   }
@@ -327,7 +328,7 @@ Bool_t AliMuonForwardTrackAnalysis::AnalyzeMuonPair() {
       fHistDimuonVtxResolutionYVsPt->Fill(pca[1]*1.e4, fMFTTrackPair->GetPt());
       fHistDimuonVtxResolutionZVsPt->Fill(pca[2]*1.e4, fMFTTrackPair->GetPt());
     }
-    fHistRapidityPtMuonPairs -> Fill(fMFTTrackPair->GetRapidityMC(), fMFTTrackPair->GetPt());
+    fHistRapidityPtMuonPairs -> Fill(fMFTTrackPair->GetRapidity(), fMFTTrackPair->GetPt());
   } 
   else if (fMFTTrackPair->GetCharge() == -2) {
     fHistMassMuonPairsVsPtLSm           -> Fill(fMFTTrackPair->GetMass(), fMFTTrackPair->GetPt());
diff --git a/MFT/AliMuonForwardTrackPair.h b/MFT/AliMuonForwardTrackPair.h
index 55944ef5b8f..c5659a22279 100644
--- a/MFT/AliMuonForwardTrackPair.h
+++ b/MFT/AliMuonForwardTrackPair.h
@@ -32,7 +32,7 @@ public:
 
   AliMuonForwardTrackPair(const AliMuonForwardTrackPair&);
   AliMuonForwardTrackPair &operator=(const AliMuonForwardTrackPair&);
-  virtual void  Clear(const Option_t* /*opt*/) { delete fMuonForwardTracks; fMuonForwardTracks = 0x0; }
+  virtual void  Clear(const Option_t* /*opt*/) { fMuonForwardTracks->Delete(); delete fMuonForwardTracks; fMuonForwardTracks = 0x0; }
 
   virtual ~AliMuonForwardTrackPair() { fMuonForwardTracks->Delete(); delete fMuonForwardTracks; }
 
-- 
2.39.3