First implementation of the raw data error logger

(Christian)

diff --git a/MUON/AliMUONPayloadTracker.cxx b/MUON/AliMUONPayloadTracker.cxx
index c0b17a541041db72d17608744e9ef4c9abc191be..8ad6519155703584f1dd1132d3ee5e28f22f87c2 100644 (file)
--- a/MUON/AliMUONPayloadTracker.cxx
+++ b/MUON/AliMUONPayloadTracker.cxx
@@ -194,9 +194,10 @@ Bool_t AliMUONPayloadTracker::Decode(UInt_t* buffer, Int_t totalDDLSize)
       if (fDspHeader->GetPaddingWord() == 1) {
        if (buffer[index++] != fDspHeader->GetDefaultPaddingWord())
 
       if (fDspHeader->GetPaddingWord() == 1) {
        if (buffer[index++] != fDspHeader->GetDefaultPaddingWord())
 

-           AliError(Form("Error in padding word for iBlock %d, iDsp %d, iBus %d\n", 
+           AliWarning(Form("Error in padding word for iBlock %d, iDsp %d, iBus %d\n", 

                          iBlock, iDsp, iBusPatch));
 
                          iBlock, iDsp, iBusPatch));
 

+       fPaddingErrors++;

       }
 
       index = indexDsp + totalDspSize;
       }
 
       index = indexDsp + totalDspSize;


@@ -226,6 +227,7 @@ void AliMUONPayloadTracker::ResetDDL()
   ///
   fDDLTracker->GetBlkHeaderArray()->Delete();
   fGlitchErrors = 0;
   ///
   fDDLTracker->GetBlkHeaderArray()->Delete();
   fGlitchErrors = 0;

+  fPaddingErrors = 0;

   fParityErrBus.Reset();
 
 }
   fParityErrBus.Reset();
 
 }

diff --git a/MUON/AliMUONPayloadTracker.h b/MUON/AliMUONPayloadTracker.h
index bebfef7958916d91bc1d5379787b16bb6d0ddbdb..89da83a993b538b13f298e960e4b8dd72b24026f 100644 (file)
--- a/MUON/AliMUONPayloadTracker.h
+++ b/MUON/AliMUONPayloadTracker.h
@@ -56,6 +56,8 @@ class AliMUONPayloadTracker: public TObject {
     TArrayI GetParityErrBus() const {return fParityErrBus;} // for MOOD
     /// Get number of glitch errors
     Int_t   GetGlitchErrors() const {return fGlitchErrors;}
     TArrayI GetParityErrBus() const {return fParityErrBus;} // for MOOD
     /// Get number of glitch errors
     Int_t   GetGlitchErrors() const {return fGlitchErrors;}

+    /// Get number of padding word errors
+    Int_t   GetPaddingErrors() const {return fPaddingErrors;}

 
   private :
     /// Not implemented
 
   private :
     /// Not implemented


@@ -82,8 +84,9 @@ class AliMUONPayloadTracker: public TObject {
 
     TArrayI fParityErrBus;                    //!< list of buspatch with at least one parity errors;
     Int_t   fGlitchErrors;                    //!< number of glitch errors;
 
     TArrayI fParityErrBus;                    //!< list of buspatch with at least one parity errors;
     Int_t   fGlitchErrors;                    //!< number of glitch errors;

+    Int_t   fPaddingErrors;                   //!< number of padding word errors;

 
 

-    ClassDef(AliMUONPayloadTracker, 2)    // base class for reading MUON raw digits
+    ClassDef(AliMUONPayloadTracker, 3)    // base class for reading MUON raw digits

 };
 
 #endif
 };
 
 #endif

diff --git a/MUON/AliMUONPayloadTrigger.cxx b/MUON/AliMUONPayloadTrigger.cxx
index 5511f46e98485fd1f170ba3567e12be0188be976..9d59a980388e32290e5d48ccf3d18e4e43c69a26 100644 (file)
--- a/MUON/AliMUONPayloadTrigger.cxx
+++ b/MUON/AliMUONPayloadTrigger.cxx
@@ -97,7 +97,7 @@ Bool_t AliMUONPayloadTrigger::Decode(UInt_t *buffer)
 
   if (buffer[index++] != darcHeader->GetEndOfDarc())
 
 
   if (buffer[index++] != darcHeader->GetEndOfDarc())
 

-      AliError(Form("Wrong end of Darc word %x instead of %x\n",
+      AliWarning(Form("Wrong end of Darc word %x instead of %x\n",

                    buffer[index-1], darcHeader->GetEndOfDarc()));
 
 
                    buffer[index-1], darcHeader->GetEndOfDarc()));
 
 


@@ -113,7 +113,7 @@ Bool_t AliMUONPayloadTrigger::Decode(UInt_t *buffer)
 
   if (buffer[index++] != darcHeader->GetEndOfGlobal())
 
 
   if (buffer[index++] != darcHeader->GetEndOfGlobal())
 

-  AliError(Form("Wrong end of Global word %x instead of %x\n",
+  AliWarning(Form("Wrong end of Global word %x instead of %x\n",

                buffer[index-1], darcHeader->GetEndOfGlobal()));
 
  
                buffer[index-1], darcHeader->GetEndOfGlobal()));
 
  


@@ -132,7 +132,7 @@ Bool_t AliMUONPayloadTrigger::Decode(UInt_t *buffer)
 
     if (buffer[index++] != fRegHeader->GetEndOfReg())
 
 
     if (buffer[index++] != fRegHeader->GetEndOfReg())
 

-      AliError(Form("Wrong end of Reg word %x instead of %x\n",
+      AliWarning(Form("Wrong end of Reg word %x instead of %x\n",

                    buffer[index-1], fRegHeader->GetEndOfReg()));
 
 
                    buffer[index-1], fRegHeader->GetEndOfReg()));
 
 


@@ -153,7 +153,7 @@ Bool_t AliMUONPayloadTrigger::Decode(UInt_t *buffer)
 
       if (buffer[index++] != fLocalStruct->GetEndOfLocal())
 
 
       if (buffer[index++] != fLocalStruct->GetEndOfLocal())
 

-      AliError(Form("Wrong end of local word %x instead of %x\n",
+      AliWarning(Form("Wrong end of local word %x instead of %x\n",

                    buffer[index-1], fLocalStruct->GetEndOfLocal()));
 
       // fill only if card notified
                    buffer[index-1], fLocalStruct->GetEndOfLocal()));
 
       // fill only if card notified

diff --git a/MUON/AliMUONPayloadTrigger.h b/MUON/AliMUONPayloadTrigger.h
index a194f453542c4e44f836055b3d6e38029f5a0259..c1dfa11d17a3494d5d196e6b395126601465f897 100644 (file)
--- a/MUON/AliMUONPayloadTrigger.h
+++ b/MUON/AliMUONPayloadTrigger.h
@@ -41,6 +41,16 @@ class AliMUONPayloadTrigger: public TObject {
     /// Return pointer for DDL structure
     AliMUONDDLTrigger*      GetDDLTrigger() const {return fDDLTrigger;}
 
     /// Return pointer for DDL structure
     AliMUONDDLTrigger*      GetDDLTrigger() const {return fDDLTrigger;}
 

+    /// Get number of end of DARC word errors
+    Int_t   GetDarcEoWErrors() const {return fDarcEoWErrors;}
+    /// Get number of end of Global word errors
+    Int_t   GetGlobalEoWErrors() const {return fGlobalEoWErrors;}
+    /// Get number of end of regional word errors
+    Int_t   GetRegEoWErrors() const {return fRegEoWErrors;}
+    /// Get number of end of local word errors
+    Int_t   GetLocalEoWErrors() const {return fLocalEoWErrors;}
+
+

   private :
     /// Not implemented
     AliMUONPayloadTrigger(const AliMUONPayloadTrigger& stream);
   private :
     /// Not implemented
     AliMUONPayloadTrigger(const AliMUONPayloadTrigger& stream);


@@ -54,7 +64,12 @@ class AliMUONPayloadTrigger: public TObject {
     AliMUONRegHeader*        fRegHeader;    //!< pointer for regional structure
     AliMUONLocalStruct*      fLocalStruct;  //!< pointer to local structure
 
     AliMUONRegHeader*        fRegHeader;    //!< pointer for regional structure
     AliMUONLocalStruct*      fLocalStruct;  //!< pointer to local structure
 

-    ClassDef(AliMUONPayloadTrigger, 1)    // base class for reading MUON trigger rawdata
+    Int_t   fDarcEoWErrors;                 //!< number of end of DARC word errors;
+    Int_t   fGlobalEoWErrors;               //!< number of end of global word errors;
+    Int_t   fRegEoWErrors;                  //!< number of end of regional word errors;
+    Int_t   fLocalEoWErrors;                //!< number of end of local word errors;
+
+    ClassDef(AliMUONPayloadTrigger, 2)    // base class for reading MUON trigger rawdata

 };
 
 #endif
 };
 
 #endif

diff --git a/MUON/AliMUONRawStreamTracker.cxx b/MUON/AliMUONRawStreamTracker.cxx
index af2b9d9b640cdd06ad9d79be9148f3be4205460f..e15c27fb42a062b40cb1f5c982617f8eb359d429 100644 (file)
--- a/MUON/AliMUONRawStreamTracker.cxx
+++ b/MUON/AliMUONRawStreamTracker.cxx
@@ -209,6 +209,8 @@ AliMUONRawStreamTracker::GetNextDDL()
   
   Bool_t ok = fPayload->Decode(buffer, totalDataWord/4);
   
   
   Bool_t ok = fPayload->Decode(buffer, totalDataWord/4);
   

+  AddErrorMessage();
+

   delete[] buffer;
   
   fCurrentDDL = fPayload->GetDDLTracker();
   delete[] buffer;
   
   fCurrentDDL = fPayload->GetDDLTracker();


@@ -356,12 +358,14 @@ Bool_t AliMUONRawStreamTracker::NextDDL()
   
   if(!fRawReader->ReadNext((UChar_t*)buffer, totalDataWord))
   {
   
   if(!fRawReader->ReadNext((UChar_t*)buffer, totalDataWord))
   {

-    AliError("a memory leak is here");
+    delete[] buffer;

     return kFALSE;
   }
   
   Bool_t ok = fPayload->Decode(buffer, totalDataWord/4);
     return kFALSE;
   }
   
   Bool_t ok = fPayload->Decode(buffer, totalDataWord/4);

-  
+
+  AddErrorMessage();
+

   delete[] buffer;
   
   fDDL++;
   delete[] buffer;
   
   fDDL++;


@@ -383,3 +387,20 @@ void AliMUONRawStreamTracker::SetMaxBlock(Int_t blk)
   /// set regional card number
   fPayload->SetMaxBlock(blk);
 }
   /// set regional card number
   fPayload->SetMaxBlock(blk);
 }

+
+//______________________________________________________
+void AliMUONRawStreamTracker::AddErrorMessage()
+{
+/// add message into logger of AliRawReader per event
+
+    for (Int_t i = 0; i < fPayload->GetParityErrors(); ++i)
+       fRawReader->AddMinorErrorLog(kParityErr, Form("Parity error for buspatch %s",  
+                                                     fPayload->GetParityErrBus()[i]));
+
+    for (Int_t i = 0; i < fPayload->GetGlitchErrors(); ++i)
+       fRawReader->AddMajorErrorLog(kGlitchErr, "Glitch error occurs skip event");
+
+    for (Int_t i = 0; i < fPayload->GetPaddingErrors(); ++i)
+       fRawReader->AddMinorErrorLog(kPaddingWordErr, "Padding word error");
+
+}

diff --git a/MUON/AliMUONRawStreamTracker.h b/MUON/AliMUONRawStreamTracker.h
index c7a54f25ff5c071c7a827e3784ddd4ea9504d382..23f197364ad813adcc94bc50bc6ebfb2ff6e3311 100644 (file)
--- a/MUON/AliMUONRawStreamTracker.h
+++ b/MUON/AliMUONRawStreamTracker.h
@@ -94,6 +94,17 @@ class AliMUONRawStreamTracker: public TObject {
     Bool_t GetNextDspHeader();
     Bool_t GetNextBusStruct();
 
     Bool_t GetNextDspHeader();
     Bool_t GetNextBusStruct();
 

+    /// add error message into error logger
+    void AddErrorMessage();
+
+    /// error numbers
+    enum rawStreamTrackerError {
+      kGlitchErr      = 1, ///< glitch error 
+      kPaddingWordErr = 2, ///< padding word error
+      kParityErr      = 3  ///< parity error
+    };
+
+

  private:
     AliRawReader*    fRawReader;    ///< object for reading the raw data  
     Int_t  fDDL;          ///< number of DDL    
  private:
     AliRawReader*    fRawReader;    ///< object for reading the raw data  
     Int_t  fDDL;          ///< number of DDL    

diff --git a/MUON/AliMUONRawStreamTrigger.cxx b/MUON/AliMUONRawStreamTrigger.cxx
index 86be359ef78589b33f5c01093076d91ae596ae80..09bc37ac25b44df1ddb4a8f91156f87a77d5a16b 100644 (file)
--- a/MUON/AliMUONRawStreamTrigger.cxx
+++ b/MUON/AliMUONRawStreamTrigger.cxx
@@ -141,11 +141,13 @@ Bool_t AliMUONRawStreamTrigger::NextDDL()
   if (!fRawReader->ReadNext((UChar_t*)buffer, totalDataWord)) return kFALSE; 
   
   fPayload->Decode(buffer);
   if (!fRawReader->ReadNext((UChar_t*)buffer, totalDataWord)) return kFALSE; 
   
   fPayload->Decode(buffer);

+  AddErrorMessage();

 
   fDDL++;
 
   delete [] buffer;
 
 
   fDDL++;
 
   delete [] buffer;
 

+

   return kTRUE;
 }
 
   return kTRUE;
 }
 


@@ -171,3 +173,22 @@ void AliMUONRawStreamTrigger::SetMaxLoc(Int_t loc)
   /// set local card number
   fPayload->SetMaxLoc(loc);
 }
   /// set local card number
   fPayload->SetMaxLoc(loc);
 }

+
+//______________________________________________________
+void AliMUONRawStreamTrigger::AddErrorMessage()
+{
+/// add message into logger of AliRawReader per event
+
+    for (Int_t i = 0; i < fPayload->GetDarcEoWErrors(); ++i)
+       fRawReader->AddMajorErrorLog(kDarcEoWErr, "Wrong end of Darc word structure");
+
+   for (Int_t i = 0; i < fPayload->GetGlobalEoWErrors(); ++i)
+       fRawReader->AddMajorErrorLog(kGlobalEoWErr, "Wrong end of Global word structure");
+
+   for (Int_t i = 0; i < fPayload->GetRegEoWErrors(); ++i)
+       fRawReader->AddMajorErrorLog(kRegEoWErr, "Wrong end of Regional word structure");
+
+   for (Int_t i = 0; i < fPayload->GetLocalEoWErrors(); ++i)
+       fRawReader->AddMajorErrorLog(kLocalEoWErr, "Wrong end of Local word structure");
+
+}

diff --git a/MUON/AliMUONRawStreamTrigger.h b/MUON/AliMUONRawStreamTrigger.h
index 34adbc91151a6e4749975e8c329aaefc2f8eb960..9d54b0838a446ab1a6c17917fa15dea4f170780e 100644 (file)
--- a/MUON/AliMUONRawStreamTrigger.h
+++ b/MUON/AliMUONRawStreamTrigger.h
@@ -47,6 +47,18 @@ class AliMUONRawStreamTrigger: public TObject {
     /// Return number of DDL
     Int_t              GetDDL()        const {return fDDL - 1;}
 
     /// Return number of DDL
     Int_t              GetDDL()        const {return fDDL - 1;}
 

+    /// add error message into error logger
+    void AddErrorMessage();
+
+    /// error numbers
+    enum rawStreamTriggerError {
+      kDarcEoWErr   = 6, ///< end of Darc word error 
+      kGlobalEoWErr = 7, ///< end of Global word error
+      kRegEoWErr    = 8, ///< end of Regional word error 
+      kLocalEoWErr  = 9  ///< end of local word error
+
+    };
+

   private :
     /// Not implemented
     AliMUONRawStreamTrigger(const AliMUONRawStreamTrigger& stream);
   private :
     /// Not implemented
     AliMUONRawStreamTrigger(const AliMUONRawStreamTrigger& stream);