X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUONRawWriter.cxx;h=7e9ca052c3084a274865df85b3c3426d7d039ce7;hb=be2c381644cd43ea3235a9e426c9b77c27339cac;hp=9bf130db9d57a16f4555420e10d7da1eae62efe5;hpb=b672bf31cac6ce9f66201ebad38c197129a2124c;p=u%2Fmrichter%2FAliRoot.git

diff --git a/MUON/AliMUONRawWriter.cxx b/MUON/AliMUONRawWriter.cxx
index 9bf130db9d5..7e9ca052c30 100644
--- a/MUON/AliMUONRawWriter.cxx
+++ b/MUON/AliMUONRawWriter.cxx
@@ -15,6 +15,7 @@
 
 /* $Id$ */
 
+//-----------------------------------------------------------------------------
 /// \class AliMUONRawWriter
 /// MUON Raw Data generaton in ALICE-MUON
 /// Raw data structure could be found in Alice-note.
@@ -40,6 +41,7 @@
 /// Using AliMpDDLStore::GetBusPatchId.
 ///
 /// \author Ch. Finck, Feb. 07.
+//-----------------------------------------------------------------------------
 
 
 #include "AliMUONRawWriter.h"
@@ -59,8 +61,7 @@
 #include "AliMUONRegHeader.h"
 
 #include "AliMUONVTriggerStore.h"
-#include "AliMUONStopwatchGroup.h"
-#include "AliMUONStopwatchGroupElement.h"
+#include "AliCodeTimer.h"
 
 #include "AliMpDDLStore.h"
 #include "AliMpDDL.h"
@@ -99,7 +100,6 @@ AliMUONRawWriter::AliMUONRawWriter()
     fDDLStore(AliMpDDLStore::Instance()),
     fScalerEvent(kFALSE),
     fHeader(),
-    fTimers(new AliMUONStopwatchGroup),
     fBufferSize((((43*AliMpConstants::ManuNofChannels() + 4)*5 + 10)*5 + 8)*2),
     fBuffer(new Int_t [fBufferSize])
 {
@@ -125,9 +125,6 @@ AliMUONRawWriter::~AliMUONRawWriter(void)
   delete fDarcHeader;
   delete fRegHeader;
   delete fLocalStruct;
-  AliInfo("Timers:");
-  fTimers->Print();
-  delete fTimers;
   delete[] fBuffer;
 }
 
@@ -154,7 +151,7 @@ Int_t AliMUONRawWriter::Digits2Raw(AliMUONVDigitStore* digitStore,
 {
   /// convert digits of the current event to raw data
 
-  AliMUONStopwatchGroupElement timer(fTimers,"MUON","AliMUONRawWriter::Digits2Raw");
+  AliCodeTimerAuto("")
   
   Int_t idDDL;
   Char_t name[255];
@@ -163,7 +160,7 @@ Int_t AliMUONRawWriter::Digits2Raw(AliMUONVDigitStore* digitStore,
   
   if ( digitStore ) 
   {
-    AliMUONStopwatchGroupElement timer(fTimers,"MUON","AliMUONRawWriter::Digits2Raw for Tracker");
+    AliCodeTimerAuto("for Tracker")
 
     AliMpExMap busPatchMap(true);
 
@@ -190,7 +187,7 @@ Int_t AliMUONRawWriter::Digits2Raw(AliMUONVDigitStore* digitStore,
  
   if ( triggerStore )
   {
-    AliMUONStopwatchGroupElement timer(fTimers,"MUON","AliMUONRawWriter::Digits2Raw for Trigger");
+    AliCodeTimerAuto("for Trigger")
 
     // trigger chambers
     
@@ -224,7 +221,7 @@ AliMUONRawWriter::Digits2BusPatchMap(const AliMUONVDigitStore& digitStore,
 {
   /// Create bus patch structures corresponding to digits in the store
   
-  AliMUONStopwatchGroupElement timer(fTimers,"MUON","AliMUONRawWriter::Digits2BusPatchMap");
+  AliCodeTimerAuto("")
   
   static const Int_t kMAXADC = (1<<12)-1; // We code the charge on a 12 bits ADC.
     
@@ -248,8 +245,8 @@ AliMUONRawWriter::Digits2BusPatchMap(const AliMUONVDigitStore& digitStore,
     {
       // This is most probably an error in the digitizer (which should insure
       // the adc is below kMAXADC), so make it a (non-fatal) error indeed.
-      AliError(Form("adc value %d above %x for DE %d . Setting to %x. Digit is:",
-                    digit->DetElemId(),charge,kMAXADC,kMAXADC));
+      AliError(Form("adc value %d above 0x%x for DE %d . Setting to 0x%x. Digit is:",
+                    charge,kMAXADC,digit->DetElemId(),kMAXADC));
       StdoutToAliError(digit->Print());
       charge = kMAXADC;
     }
@@ -310,7 +307,7 @@ AliMUONRawWriter::WriteTrackerDDL(AliMpExMap& busPatchMap, Int_t iDDL)
   // (((43 manus max per bus patch *64 channels + 4 bus patch words) * 5 bus patch 
   //   + 10 dsp words)*5 dsps + 8 block words)*2 blocks 
  
-  AliMUONStopwatchGroupElement timer(fTimers,"MUON","AliMUONRawWriter::WriteTrackerDDL");
+  AliCodeTimerAuto("")
 
   memset(fBuffer,0,fBufferSize*sizeof(Int_t));
   
@@ -433,7 +430,7 @@ Int_t AliMUONRawWriter::WriteTriggerDDL(const AliMUONVTriggerStore& triggerStore
 {
   /// Write trigger DDL
   
-  AliMUONStopwatchGroupElement timer(fTimers,"MUON","AliMUONRawWriter::WriteTriggerDDL");
+  AliCodeTimerAuto("")
 
  // DDL event one per half chamber