From 8df9496c44768e5d49660a8be23175553d4a4409 Mon Sep 17 00:00:00 2001 From: cblume Date: Wed, 2 Mar 2011 21:59:05 +0000 Subject: [PATCH] Patch for AMORE --- TRD/AliTRDrawStream.cxx | 8 ++++++++ TRD/AliTRDrawStream.h | 29 ++++++++++++++++------------- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/TRD/AliTRDrawStream.cxx b/TRD/AliTRDrawStream.cxx index c12d8d9b572..9d9382ea2e0 100644 --- a/TRD/AliTRDrawStream.cxx +++ b/TRD/AliTRDrawStream.cxx @@ -254,6 +254,10 @@ Bool_t AliTRDrawStream::ReadEvent(TTree *trackletTree) continue; } + if (fMarkers) + new ((*fMarkers)[fMarkers->GetEntriesFast()]) + AliTRDrawStreamError(-kSecactive, fCurrEquipmentId - 1024); + // setting the pointer to data and current reading position fPayloadCurr = fPayloadStart = (UInt_t*) (buffer); fPayloadSize = fRawReader->GetDataSize() / sizeof(UInt_t); @@ -324,6 +328,10 @@ Bool_t AliTRDrawStream::NextDDL() continue; } + if (fMarkers) + new ((*fMarkers)[fMarkers->GetEntriesFast()]) + AliTRDrawStreamError(-kSecactive, fCurrEquipmentId - 1024); + // setting the pointer to data and current reading position fPayloadCurr = fPayloadStart = (UInt_t*) (buffer); fPayloadSize = fRawReader->GetDataSize() / sizeof(UInt_t); diff --git a/TRD/AliTRDrawStream.h b/TRD/AliTRDrawStream.h index 4b50242b09a..f5b9402cc67 100644 --- a/TRD/AliTRDrawStream.h +++ b/TRD/AliTRDrawStream.h @@ -96,12 +96,26 @@ class AliTRDrawStream : public TObject }; enum MarkerCode_t { - kHCactive = 1 + kHCactive = 1, + kSecactive = 2 }; TTree* GetErrorTree() const { return fErrors; } static const char* GetErrorMessage(ErrorCode_t errCode); + class AliTRDrawStreamError : public TObject { + public: + AliTRDrawStreamError(Int_t error = 0, Int_t sector = -1, Int_t stack = -1, Int_t link = -1, Int_t rob = -1, Int_t mcm = -1); + virtual ~AliTRDrawStreamError() {} + Int_t fError; // error code + Int_t fSector; // sector + Int_t fStack; // stack + Int_t fLink; // link + Int_t fRob; // ROB no + Int_t fMcm; // MCM no + ClassDef(AliTRDrawStreamError, 1); + }; + // event statistics class AliTRDrawStats : public TObject { public: @@ -209,18 +223,7 @@ class AliTRDrawStream : public TObject AliTRDdigitsParam *fDigitsParam; // pointer to the parameters belonging to the digits TTree *fErrors; // tree containing the occured error codes - class AliTRDrawStreamError : public TObject { - public: - AliTRDrawStreamError(Int_t error = 0, Int_t sector = -1, Int_t stack = -1, Int_t link = -1, Int_t rob = -1, Int_t mcm = -1); - virtual ~AliTRDrawStreamError() {} - Int_t fError; // error code - Int_t fSector; // sector - Int_t fStack; // stack - Int_t fLink; // link - Int_t fRob; // ROB no - Int_t fMcm; // MCM no - ClassDef(AliTRDrawStreamError, 1); - } fLastError; // last error which occured + AliTRDrawStreamError fLastError; // last error which occured UInt_t fErrorFlags; // error flags used to steer subsequent reading char fErrorBuffer[100]; // buffer for error message -- 2.39.3