From a90f8830fb330bfaa442f840fd5a4e54b1c63880 Mon Sep 17 00:00:00 2001 From: ivana Date: Wed, 15 Apr 2009 11:20:14 +0000 Subject: [PATCH] In trigger classes: - Fill the "global input" words read from the raw data into the reconstructed object, via a patch to AliMUONDigitMaker::ReadTriggerDDL - Type correction in AliMUONRawStreamTriggerHP.h (Bogdan, Artur) --- MUON/AliMUONDigitMaker.cxx | 1 + MUON/AliMUONGlobalTrigger.cxx | 2 +- MUON/AliMUONGlobalTrigger.h | 2 +- MUON/AliMUONRawStreamTriggerHP.h | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/MUON/AliMUONDigitMaker.cxx b/MUON/AliMUONDigitMaker.cxx index 4abf26df34a..e90a7c8dd7c 100644 --- a/MUON/AliMUONDigitMaker.cxx +++ b/MUON/AliMUONDigitMaker.cxx @@ -322,6 +322,7 @@ AliMUONDigitMaker::ReadTriggerDDL(AliRawReader* rawReader) { AliMUONGlobalTrigger globalTrigger; globalTrigger.SetFromGlobalResponse(darcHeader->GetGlobalOutput()); + globalTrigger.SetFromGlobalInput(darcHeader->GetGlobalHeader()->fInput); fTriggerStore->SetGlobal(globalTrigger); } } diff --git a/MUON/AliMUONGlobalTrigger.cxx b/MUON/AliMUONGlobalTrigger.cxx index d8b444590b3..dab6de5c1f4 100644 --- a/MUON/AliMUONGlobalTrigger.cxx +++ b/MUON/AliMUONGlobalTrigger.cxx @@ -146,7 +146,7 @@ UChar_t AliMUONGlobalTrigger::GetGlobalResponse() const } //----------------------------------------------------------- -void AliMUONGlobalTrigger::SetFromGlobalInput(UInt_t *globalInput) +void AliMUONGlobalTrigger::SetFromGlobalInput(const UInt_t *globalInput) { /// Global trigger board input /// 4 words each of 32 bits diff --git a/MUON/AliMUONGlobalTrigger.h b/MUON/AliMUONGlobalTrigger.h index 75f8ecf750b..9fdc49273ca 100644 --- a/MUON/AliMUONGlobalTrigger.h +++ b/MUON/AliMUONGlobalTrigger.h @@ -35,7 +35,7 @@ class AliMUONGlobalTrigger : public TObject { Int_t PairLikeHpt() const {return fPairLikeHpt ;} void SetFromGlobalResponse(UShort_t globalResponse); - void SetFromGlobalInput(UInt_t *globalInput); + void SetFromGlobalInput(const UInt_t *globalInput); UChar_t GetGlobalResponse() const; UInt_t *GetGlobalInput() { return fInput; } diff --git a/MUON/AliMUONRawStreamTriggerHP.h b/MUON/AliMUONRawStreamTriggerHP.h index efed023ebdb..6b0aa2088e3 100644 --- a/MUON/AliMUONRawStreamTriggerHP.h +++ b/MUON/AliMUONRawStreamTriggerHP.h @@ -138,7 +138,7 @@ public: /// Return first word UInt_t GetWord() const {return GetDarcHeader();} /// Return global input - Int_t GetGlobalInput(Int_t n) const {return fGlobalHeader->fInput[n];} + UInt_t GetGlobalInput(Int_t n) const {return fGlobalHeader->fInput[n];} /// Return global output UChar_t GetGlobalOutput() const {return AliMUONTriggerDDLDecoderEventHandler::GetGlobalOutput(fGlobalHeader);} /// Return global config -- 2.43.0