From: martinez Date: Fri, 28 Nov 2003 10:10:35 +0000 (+0000) Subject: Testing null pointers in AliMUONData X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=1eccde2033e5bb83a095a112fdb2a3642d5e82a9;ds=sidebyside Testing null pointers in AliMUONData --- diff --git a/MUON/AliMUONData.cxx b/MUON/AliMUONData.cxx index 4b855a436dc..0640d1c8a63 100644 --- a/MUON/AliMUONData.cxx +++ b/MUON/AliMUONData.cxx @@ -191,6 +191,14 @@ void AliMUONData::AddRecTrack(const AliMUONTrack& track) new(lrectracks[fNrectracks++]) AliMUONTrack(track); } //____________________________________________________________________________ +TClonesArray* AliMUONData::Digits(Int_t DetectionPlane) +{ + if (fDigits) + return ( (TClonesArray*) fDigits->At(DetectionPlane) ); + else + return NULL; +} +//____________________________________________________________________________ Bool_t AliMUONData::IsRawClusterBranchesInTree() { if (TreeR()==0x0) { @@ -430,7 +438,14 @@ void AliMUONData::MakeBranch(Option_t* option) Info("MakeBranch","Making Branch for TreeP is not yet ready. \n"); } } - +//____________________________________________________________________________ +TClonesArray* AliMUONData::RawClusters(Int_t DetectionPlane) +{ + if (fRawClusters) + return ( (TClonesArray*) fRawClusters->At(DetectionPlane) ); + else + return NULL; +} //____________________________________________________________________________ void AliMUONData::ResetDigits() { diff --git a/MUON/AliMUONData.h b/MUON/AliMUONData.h index e3d9c007294..56a0f39b671 100644 --- a/MUON/AliMUONData.h +++ b/MUON/AliMUONData.h @@ -55,12 +55,10 @@ class AliMUONData : public TNamed { virtual void AddRecTrack(const AliMUONTrack& track); TClonesArray* Hits() {return fHits;} - TClonesArray* Digits(Int_t DetectionPlane) - {return ( (TClonesArray*) fDigits->At(DetectionPlane) );} + TClonesArray* Digits(Int_t DetectionPlane); TClonesArray* LocalTrigger() {return fLocalTrigger;} TClonesArray* GlobalTrigger() {return fGlobalTrigger;} - TClonesArray* RawClusters(Int_t DetectionPlane) - {return ( (TClonesArray*) fRawClusters->At(DetectionPlane) );} + TClonesArray* RawClusters(Int_t DetectionPlane); TClonesArray* RecTracks() {return fRecTracks;} void GetTrack(Int_t it) {fLoader->TreeH()->GetEvent(it);} diff --git a/MUON/README b/MUON/README index fc7d66a2c62..bcc784e3c08 100644 --- a/MUON/README +++ b/MUON/README @@ -129,7 +129,7 @@ G3GUI() ============================================================ How to run MUONdisplay ============================================================ -Frist you need to perfomr a full simulation: +First you need to perform a full simulation: generation, digitalisation and clusterisation .L $ALICE_ROOT/MUON/MUONdisplay.C MUONdisplay(0,"galice.root")