From feb1e780cf9508d4451d69ad8a40cec8f7f6743d Mon Sep 17 00:00:00 2001 From: hristov Date: Tue, 23 Mar 2004 08:47:27 +0000 Subject: [PATCH] Additional protection, removing obsolete data member --- MUON/AliMUON.cxx | 20 +++++++++++--------- MUON/AliMUON.h | 3 +-- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/MUON/AliMUON.cxx b/MUON/AliMUON.cxx index d6a4a2e350f..f406e09d42e 100644 --- a/MUON/AliMUON.cxx +++ b/MUON/AliMUON.cxx @@ -111,7 +111,6 @@ AliMUON::AliMUON() fAccMax = 0.; fAccCut = kFALSE; fMerger = 0; - fFileName = 0; fMUONData = 0; fSplitLevel = 0; } @@ -870,8 +869,8 @@ void AliMUON::Reconstruct() const void AliMUON::FillESD(AliESD* event) const { - TClonesArray* recTracksArray; - TClonesArray* recTrigTracksArray; + TClonesArray* recTracksArray = 0; + TClonesArray* recTrigTracksArray = 0; //YS AliLoader* loader = GetLoader(); AliRunLoader* runLoader = fLoader->GetRunLoader(); @@ -891,9 +890,9 @@ void AliMUON::FillESD(AliESD* event) const //YS Int_t nEvents = runLoader->GetNumberOfEvents(); // setting pointer for tracks, triggertracks& trackparam at vertex - AliMUONTrack* recTrack; - AliMUONTrackParam* trackParam; - AliMUONTriggerTrack* recTriggerTrack; + AliMUONTrack* recTrack = 0; + AliMUONTrackParam* trackParam = 0; + AliMUONTriggerTrack* recTriggerTrack = 0; iEvent = runLoader->GetEventNumber() ; //YS, seems not to be implemented yet (Ch. F) runLoader->GetEvent(iEvent); @@ -908,8 +907,9 @@ void AliMUON::FillESD(AliESD* event) const recTrigTracksArray = fMUONData->RecTriggerTracks(); // ready global trigger pattern from first track - recTriggerTrack = (AliMUONTriggerTrack*) recTrigTracksArray->First(); - trigPat = recTriggerTrack->GetGTPattern(); + if (recTrigTracksArray) + recTriggerTrack = (AliMUONTriggerTrack*) recTrigTracksArray->First(); + if (recTriggerTrack) trigPat = recTriggerTrack->GetGTPattern(); //printf(">>> Event %d Number of Recconstructed tracks %d \n",iEvent, nrectracks); @@ -918,7 +918,9 @@ void AliMUON::FillESD(AliESD* event) const fMUONData->GetRecTracks(); recTracksArray = fMUONData->RecTracks(); - Int_t nRecTracks = (Int_t) recTracksArray->GetEntriesFast(); // + Int_t nRecTracks = 0; + if (recTracksArray) + nRecTracks = (Int_t) recTracksArray->GetEntriesFast(); // // loop over tracks for (Int_t iRecTracks = 0; iRecTracks < nRecTracks; iRecTracks++) { diff --git a/MUON/AliMUON.h b/MUON/AliMUON.h index a8d54167e85..08d0b9a1612 100644 --- a/MUON/AliMUON.h +++ b/MUON/AliMUON.h @@ -152,10 +152,9 @@ class AliMUON : public AliDetector { Int_t fMaxIterPad; // Maximum pad index Int_t fCurIterPad; // Current pad index // Background eent for event mixing - Text_t *fFileName; // ! File with background hits AliMUONMerger *fMerger; // ! pointer to merger - ClassDef(AliMUON,3) // MUON Detector base class + ClassDef(AliMUON,4) // MUON Detector base class }; #endif -- 2.43.0