From: cvetan Date: Thu, 5 Apr 2007 12:26:29 +0000 (+0000) Subject: Additional protection for the raw-data reading. Getter to the raw-data payload (Chris... X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=54e01c1c7762a8b4294d63f6a486a799c0d531ef;p=u%2Fmrichter%2FAliRoot.git Additional protection for the raw-data reading. Getter to the raw-data payload (Christian) --- diff --git a/MUON/AliMUONRawStreamTracker.cxx b/MUON/AliMUONRawStreamTracker.cxx index 98b6dfa43af..eb89e755e6e 100644 --- a/MUON/AliMUONRawStreamTracker.cxx +++ b/MUON/AliMUONRawStreamTracker.cxx @@ -179,13 +179,13 @@ Bool_t AliMUONRawStreamTracker::NextDDL() fRawReader->Reset(); fRawReader->Select("MUONTRK", fDDL, fDDL); //Select the DDL file to be read - fRawReader->ReadHeader(); + if(!fRawReader->ReadHeader()) return kFALSE; Int_t totalDataWord = fRawReader->GetDataSize(); // in bytes UInt_t *buffer = new UInt_t[totalDataWord/4]; - fRawReader->ReadNext((UChar_t*)buffer, totalDataWord); + if(!fRawReader->ReadNext((UChar_t*)buffer, totalDataWord)) return kFALSE; fPayload->Decode(buffer, totalDataWord/4); diff --git a/MUON/AliMUONRawStreamTracker.h b/MUON/AliMUONRawStreamTracker.h index 20f16a3caa3..84f190da731 100644 --- a/MUON/AliMUONRawStreamTracker.h +++ b/MUON/AliMUONRawStreamTracker.h @@ -50,10 +50,14 @@ class AliMUONRawStreamTracker: public TObject { /// Set object for reading the raw data void SetReader(AliRawReader* rawReader) {fRawReader = rawReader;} - /// Return pointer for buspatch structure - AliMUONDDLTracker* GetDDLTracker() const {return fPayload->GetDDLTracker();} + /// Return pointer for DDL + AliMUONDDLTracker* GetDDLTracker() const {return fPayload->GetDDLTracker();} + + /// Return pointer for payload + AliMUONPayloadTracker* GetPayLoad() const {return fPayload;} + /// Return number of DDL - Int_t GetDDL() const {return fDDL - 1;} + Int_t GetDDL() const {return fDDL - 1;} private : /// Not implemented