From bf22797aee107f5f60729cd63c596f945d37810c Mon Sep 17 00:00:00 2001 From: cvetan Date: Fri, 13 Jan 2006 13:27:41 +0000 Subject: [PATCH] Method ReadNext moved to public (C.Cheshkov) --- RAW/AliRawReader.h | 3 +-- RAW/AliRawReaderDate.h | 3 +-- RAW/AliRawReaderDateV3.h | 3 +-- RAW/AliRawReaderFile.h | 3 +-- RAW/AliRawReaderMemory.h | 3 +-- RAW/AliRawReaderRoot.h | 3 +-- 6 files changed, 6 insertions(+), 12 deletions(-) diff --git a/RAW/AliRawReader.h b/RAW/AliRawReader.h index f3a6f00ac56..d07e9101c5d 100644 --- a/RAW/AliRawReader.h +++ b/RAW/AliRawReader.h @@ -85,6 +85,7 @@ class AliRawReader: public TObject { virtual Bool_t ReadNextInt(UInt_t& data); virtual Bool_t ReadNextShort(UShort_t& data); virtual Bool_t ReadNextChar(UChar_t& data); + virtual Bool_t ReadNext(UChar_t* data, Int_t size) = 0; virtual Bool_t Reset() = 0; @@ -102,8 +103,6 @@ class AliRawReader: public TObject { Bool_t IsSelected() const; Bool_t IsEventSelected() const; - virtual Bool_t ReadNext(UChar_t* data, Int_t size) = 0; - Bool_t fRequireHeader; // if false, data without header is accepted AliRawDataHeader* fHeader; // current data header diff --git a/RAW/AliRawReaderDate.h b/RAW/AliRawReaderDate.h index d0a43158d2d..232d311a1e5 100644 --- a/RAW/AliRawReaderDate.h +++ b/RAW/AliRawReaderDate.h @@ -41,6 +41,7 @@ class AliRawReaderDate: public AliRawReader { virtual Bool_t ReadHeader(); virtual Bool_t ReadNextData(UChar_t*& data); + virtual Bool_t ReadNext(UChar_t* data, Int_t size); virtual Bool_t Reset(); @@ -50,8 +51,6 @@ class AliRawReaderDate: public AliRawReader { virtual Int_t CheckData() const; protected : - virtual Bool_t ReadNext(UChar_t* data, Int_t size); - FILE* fFile; // DATE file eventHeaderStruct* fEvent; // raw data super event eventHeaderStruct* fSubEvent; // raw data sub event diff --git a/RAW/AliRawReaderDateV3.h b/RAW/AliRawReaderDateV3.h index a1320762bab..3cec6e1fd69 100644 --- a/RAW/AliRawReaderDateV3.h +++ b/RAW/AliRawReaderDateV3.h @@ -40,6 +40,7 @@ class AliRawReaderDateV3: public AliRawReader { virtual Bool_t ReadHeader(); virtual Bool_t ReadNextData(UChar_t*& data); + virtual Bool_t ReadNext(UChar_t* data, Int_t size); virtual Bool_t Reset(); @@ -49,8 +50,6 @@ class AliRawReaderDateV3: public AliRawReader { virtual Int_t CheckData() const; protected : - virtual Bool_t ReadNext(UChar_t* data, Int_t size); - FILE* fFile; // DATE file eventHeaderStruct* fEvent; // raw data super event eventHeaderStruct* fSubEvent; // raw data sub event diff --git a/RAW/AliRawReaderFile.h b/RAW/AliRawReaderFile.h index e696aa6c6c5..33ebbc1ac09 100644 --- a/RAW/AliRawReaderFile.h +++ b/RAW/AliRawReaderFile.h @@ -46,6 +46,7 @@ class AliRawReaderFile: public AliRawReader { virtual Bool_t ReadHeader(); virtual Bool_t ReadNextData(UChar_t*& data); + virtual Bool_t ReadNext(UChar_t* data, Int_t size); virtual Bool_t Reset(); @@ -57,8 +58,6 @@ class AliRawReaderFile: public AliRawReader { void* OpenDirectory(); Bool_t OpenNextFile(); - virtual Bool_t ReadNext(UChar_t* data, Int_t size); - Int_t fEventIndex; // index of the event TString fDirName; // name of the input directory void* fDirectory; // pointer to the input directory diff --git a/RAW/AliRawReaderMemory.h b/RAW/AliRawReaderMemory.h index fb1373d1b08..6b5c3940df5 100644 --- a/RAW/AliRawReaderMemory.h +++ b/RAW/AliRawReaderMemory.h @@ -46,6 +46,7 @@ class AliRawReaderMemory: public AliRawReader { virtual Bool_t ReadHeader(); virtual Bool_t ReadNextData(UChar_t*& data); + virtual Bool_t ReadNext(UChar_t* data, Int_t size); virtual Bool_t Reset(); @@ -60,8 +61,6 @@ class AliRawReaderMemory: public AliRawReader { UInt_t fBufferSize; // size of fBuffer in bytes UInt_t fPosition; // Current position in memory - virtual Bool_t ReadNext(UChar_t* data, Int_t size); - ClassDef(AliRawReaderMemory, 0) // class for reading raw digits from a memory block private: diff --git a/RAW/AliRawReaderRoot.h b/RAW/AliRawReaderRoot.h index a1aa3e72ff2..1a9ed006700 100644 --- a/RAW/AliRawReaderRoot.h +++ b/RAW/AliRawReaderRoot.h @@ -46,6 +46,7 @@ class AliRawReaderRoot: public AliRawReader { virtual Bool_t ReadHeader(); virtual Bool_t ReadNextData(UChar_t*& data); + virtual Bool_t ReadNext(UChar_t* data, Int_t size); virtual Bool_t Reset(); @@ -55,8 +56,6 @@ class AliRawReaderRoot: public AliRawReader { virtual Int_t CheckData() const; protected : - virtual Bool_t ReadNext(UChar_t* data, Int_t size); - TFile* fFile; // raw data root file TBranch* fBranch; // branch of raw events Int_t fEventIndex; // index of the event in the tree -- 2.31.1