X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUONRegHeader.cxx;h=3a6be0e01dd8fb2fd0039c5224f5c9d82cf335ef;hb=e146cc53be967240d7c046b1f9504d4efe323531;hp=cd9a022feee9664b5943d56f01f794dec7edc83c;hpb=00f561619c634abc25995e4cbe476ca4bc846f09;p=u%2Fmrichter%2FAliRoot.git

diff --git a/MUON/AliMUONRegHeader.cxx b/MUON/AliMUONRegHeader.cxx
index cd9a022feee..3a6be0e01dd 100644
--- a/MUON/AliMUONRegHeader.cxx
+++ b/MUON/AliMUONRegHeader.cxx
@@ -15,68 +15,91 @@
 
 /* $Id$ */
 
+#include <TClonesArray.h>
+
 #include "AliMUONRegHeader.h"
 #include "AliMUONLocalStruct.h"
 
-/// 
+//-----------------------------------------------------------------------------
+/// \class AliMUONRegHeader
 /// Regional structure for trigger raw data.
 /// Each Reg structure contains 16 (at most) local card structure.
 /// The structure includes the information of the Reg. boards and
 /// regional inputs
 /// 
+/// \author Christian Finck
+//-----------------------------------------------------------------------------
 
 /// \cond CLASSIMP
 ClassImp(AliMUONRegHeader)
 /// \endcond
  
- const Int_t  AliMUONRegHeader::fgkHeaderLength = 4;
- const Int_t  AliMUONRegHeader::fgkScalerLength = 8;
+ const Int_t  AliMUONRegHeader::fgkHeaderLength = 5;
+ const Int_t  AliMUONRegHeader::fgkScalerLength = 10;
  const UInt_t AliMUONRegHeader::fgkEndOfReg     = 0xBEEFFACE;
+ const UInt_t AliMUONRegHeader::fgkErrorWord    = 0xCAFEDEAD;
+
+//___________________________________________
+AliMUONRegHeader::AliMUONRegHeader(TRootIOCtor* /*dummy*/)
+:  TObject(),
+fDarcWord(0),
+fWord(0),
+fMask(0),
+fL0(0),
+fClk(0),
+fHold(0),
+fLocalArray(0x0)
+{
+  /// ctor
+  fInput[0] = fInput[1] = 0;
+  
+  for (Int_t i = 0; i < 8; i++)
+    fScaler[i] = 0;  
+}
 
 //___________________________________________
 AliMUONRegHeader::AliMUONRegHeader()
   :  TObject(),
      fDarcWord(0),
      fWord(0),
-     fL0(0), 
+     fMask(0),
+     fL0(0),
      fClk(0),
-     fHold(0)
-
+     fHold(0),
+     fLocalArray(new TClonesArray("AliMUONLocalStruct",16))
 {
-  //
-  // ctor
-  //
+  /// ctor
+ 
   fInput[0] = fInput[1] = 0;
 
   for (Int_t i = 0; i < 8; i++)
     fScaler[i] = 0;
 
-  fLocalArray  = new TClonesArray("AliMUONLocalStruct",16);
-
 }
 
 //___________________________________________
 AliMUONRegHeader::~AliMUONRegHeader()
 {
-  // 
-  // dtor
-  //
+  /// dtor
+ 
   fLocalArray->Delete();
   delete fLocalArray;
 }
 
 //___________________________________________
 AliMUONRegHeader::AliMUONRegHeader(const AliMUONRegHeader& event)
-  :  TObject(event)
+  :  TObject(event),
+     fDarcWord(event.fDarcWord),
+     fWord(event.fWord),
+     fMask(event.fMask),
+     fL0(event.fL0),
+     fClk(event.fClk),
+     fHold(event.fHold),
+     fLocalArray(new TClonesArray("AliMUONLocalStruct", 16))
 {
-  //
-  // copy ctor
-  //
-  fDarcWord = event.fDarcWord;
-  fWord     = event.fWord;
-  fL0       = event.fL0;
-  fClk      = event.fClk;
-  fHold     = event.fHold;
+  ///
+  /// copy ctor
+  ///
 
   fInput[0] = event.fInput[0];
   fInput[1] = event.fInput[1];
@@ -84,7 +107,6 @@ AliMUONRegHeader::AliMUONRegHeader(const AliMUONRegHeader& event)
   for (Int_t i = 0; i < 8; i++)
     fScaler[i] = event.fScaler[i];
 
-  fLocalArray = new TClonesArray("AliMUONLocalStruct", 16);
   for (Int_t index = 0; index < (event.fLocalArray)->GetEntriesFast(); index++) {
     {new ((*fLocalArray)[fLocalArray->GetEntriesFast()]) 
         AliMUONLocalStruct(*(AliMUONLocalStruct*)(event.fLocalArray)->At(index));}
@@ -94,17 +116,18 @@ AliMUONRegHeader::AliMUONRegHeader(const AliMUONRegHeader& event)
 //___________________________________________
 AliMUONRegHeader& AliMUONRegHeader::operator=(const AliMUONRegHeader& event)
 {
-  // 
-  // assignment operator
-  //
+  /// 
+  /// assignment operator
+  ///
 
   if (this == &event) return *this;
 
   fDarcWord = event.fDarcWord;
   fWord     = event.fWord;
-  fL0       = event.fL0;
   fClk      = event.fClk;
   fHold     = event.fHold;
+  fL0       = event.fL0;
+  fMask     = event.fMask;
 
   fInput[0] = event.fInput[0];
   fInput[1] = event.fInput[1];
@@ -124,11 +147,10 @@ AliMUONRegHeader& AliMUONRegHeader::operator=(const AliMUONRegHeader& event)
 //___________________________________________
 void AliMUONRegHeader::SetScalersNumbers()
 {
-  // set numbers for scaler events for Regional header
-  // since this is provided by the experiment
-  // put dummy numbers to check the monitoring
+  /// set numbers for scaler events for Regional header
+  /// since this is provided by the experiment
+  /// put dummy numbers to check the monitoring
   
-  fL0   = 1000;
   fClk  = 10000;
   fHold = 100; 
   
@@ -139,9 +161,9 @@ void AliMUONRegHeader::SetScalersNumbers()
 //___________________________________________
 void AliMUONRegHeader::Clear(Option_t* )
 {
-  // Clear TClones arrays
-  // instead of deleting
-  //
+  /// Clear TClones arrays
+  /// instead of deleting
+  ///
   fLocalArray->Clear("C");
  
 }