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)

diff --git a/MUON/AliMUONDigitMaker.cxx b/MUON/AliMUONDigitMaker.cxx
index 4abf26df34a3322f2ea4c237cc8ded0986b32d56..e90a7c8dd7c9ffb6c2be9163561056e40dd819b7 100644 (file)
--- 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 d8b444590b3c067b63f7ed97338cd07e3ab1ecfa..dab6de5c1f487d25902883722da84cf0406f56bf 100644 (file)
--- 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 75f8ecf750bfe513f348cb9d4e29175e2a73ba21..9fdc49273ca8522b3759d9ac09f0a815712ea1b6 100644 (file)
--- 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 efed023ebdb87e365b7dea55700bc832c5d9bce9..6b0aa2088e33c174775d9a53784a2c93fc7d74a6 100644 (file)
--- 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