Additional protection for the raw-data reading. Getter to the raw-data payload (Chris...

diff --git a/MUON/AliMUONRawStreamTracker.cxx b/MUON/AliMUONRawStreamTracker.cxx
index 98b6dfa43afa4c80f5694a679df4e0627724e1db..eb89e755e6e629e45a4dd172ca6d5ca651fdfa91 100644 (file)
--- 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->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];
 
 
   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);
 
 
   fPayload->Decode(buffer, totalDataWord/4);
 

diff --git a/MUON/AliMUONRawStreamTracker.h b/MUON/AliMUONRawStreamTracker.h
index 20f16a3caa3951f8cb0f7466ae59d558ac0f72d5..84f190da7313e15a0c16657199a4aa1cc36dad74 100644 (file)
--- 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;}
 
     /// 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
     /// Return number of DDL

-    Int_t                   GetDDL()          const {return fDDL - 1;}
+    Int_t                   GetDDL()        const {return fDDL - 1;}

 
   private :
     /// Not implemented
 
   private :
     /// Not implemented