X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUONReconstructor.cxx;h=729b132d46e748b53c0c089ff2a46add4a9361b1;hb=4bf586db508d16f67bf848f3dc74c591337f9da5;hp=43e2d66c7741bcb4f3e95abd66d515773675b5ff;hpb=7d5d0cc5e751bdf612fb78ed7cfe55397a79f855;p=u%2Fmrichter%2FAliRoot.git

diff --git a/MUON/AliMUONReconstructor.cxx b/MUON/AliMUONReconstructor.cxx
index 43e2d66c774..729b132d46e 100644
--- a/MUON/AliMUONReconstructor.cxx
+++ b/MUON/AliMUONReconstructor.cxx
@@ -68,14 +68,7 @@
 ///
 /// TRIGGERDISABLE : disable the treatment of MUON trigger
 ///
-/// NOFASTTRKDECODER : makes the digit maker class use the non-high performance decoder
-///                  AliMUONPayloadTracker instead of  AliMUONTrackerDDLDecoder.
-///
-/// NOFASTTRGDECODER : makes the digit maker class use the non-high performance decoder
-///                  AliMUONPayloadTrigger instead of AliMUONTriggerDDLDecoder.
-///
-/// NOFASTDECODERS : makes the digit maker class use the non-high performance decoders
-///                  AliMUONPayloadTracker and AliMUONPayloadTrigger.
+/// ENABLEERRORLOGGING : enable error logging (this activates also warnings in RawStreamTracker)
 ///
 /// \author Laurent Aphecetche, Subatech
 //-----------------------------------------------------------------------------
@@ -173,8 +166,8 @@ AliMUONReconstructor::~AliMUONReconstructor()
   delete fDigitStore;
   delete fTransformer;
   delete fTriggerCircuit;
-  delete fCalibrationData;
   delete fDigitCalibrator;
+  delete fCalibrationData;
   delete fClusterServer;
   delete fTriggerStore;
   delete fTrackStore;
@@ -193,7 +186,7 @@ AliMUONReconstructor::Calibrate(AliMUONVDigitStore& digitStore) const
   {
     CreateCalibrator();
   }
-  AliCodeTimerAuto(Form("%s::Calibrate(AliMUONVDigitStore*)",fDigitCalibrator->ClassName()))
+  AliCodeTimerAuto(Form("%s::Calibrate(AliMUONVDigitStore*)",fDigitCalibrator->ClassName()),0)
   fDigitCalibrator->Calibrate(digitStore);  
 }
 
@@ -205,6 +198,14 @@ AliMUONReconstructor::ConvertDigits(AliRawReader* rawReader,
 {
   /// Convert raw data into digit and trigger stores
   CreateDigitMaker();
+
+  // Skip reconstruction if event is Calibration
+  if ( GetRecoParam()->GetEventSpecie() == AliRecoParam::kCalib ) {
+    digitStore->Clear(); // Remove possible digits from previous event
+    triggerStore->Clear(); // Remove possible triggers from previous event
+    AliInfo("Calibration event: do not convert digits");
+    return;
+  }
   
   AliCodeTimerStart(Form("%s::Raw2Digits(AliRawReader*,AliMUONVDigitStore*,AliMUONVTriggerStore*)",
                     fDigitMaker->ClassName()))
@@ -219,7 +220,7 @@ void
 AliMUONReconstructor::ConvertDigits(AliRawReader* rawReader, TTree* digitsTree) const
 {
    /// convert raw data into a digit tree
-  AliCodeTimerAuto("")
+  AliCodeTimerAuto("",0)
 
   Bool_t alone = ( TriggerStore() == 0 );
   
@@ -250,28 +251,18 @@ AliMUONReconstructor::CreateDigitMaker() const
   /// Create (and create if necessary) the digit maker
   if (fDigitMaker) return;
 
-  AliCodeTimerAuto("")
+  AliCodeTimerAuto("",0)
 
   TString option = GetOption();
-  Bool_t enableErrorLogging = kTRUE;
-  Bool_t useFastTrackerDecoder = kTRUE;
-  Bool_t useFastTriggerDecoder = kTRUE;
-  if (option.Contains("NOFASTTRKDECODER"))
-  {
-    useFastTrackerDecoder = kFALSE;
-  }
-  if (option.Contains("NOFASTTRGDECODER"))
-  {
-    useFastTriggerDecoder = kFALSE;
-  }
-  if (option.Contains("NOFASTDECODERS"))
+  
+  Bool_t enableErrorLogging = kFALSE;
+
+  if (option.Contains("ENABLEERRORLOGGING"))
   {
-    useFastTrackerDecoder = kFALSE;
-    useFastTriggerDecoder = kFALSE;
+    enableErrorLogging = kTRUE;
   }
-  fDigitMaker = new AliMUONDigitMaker(
-      enableErrorLogging, useFastTrackerDecoder, useFastTriggerDecoder
-    );
+
+  fDigitMaker = new AliMUONDigitMaker(enableErrorLogging);
   option.ToUpper();
   if ( option.Contains("SAVEDIGITS" ))
     {
@@ -286,7 +277,7 @@ AliMUONReconstructor::CreateTriggerCircuit() const
   /// Return (and create if necessary) the trigger circuit object
   if (fTriggerCircuit) return;
 
-  AliCodeTimerAuto("")
+  AliCodeTimerAuto("",0)
 
   fTriggerCircuit = new AliMUONTriggerCircuit(fTransformer);
 
@@ -333,7 +324,7 @@ AliMUONReconstructor::CreateClusterFinder(const char* clusterFinderType)
 {
   /// Create a given cluster finder instance
   
-  AliCodeTimerAutoGeneral("")
+  AliCodeTimerAutoGeneral("",0)
 
   AliMUONVClusterFinder* clusterFinder(0x0);
   
@@ -405,7 +396,7 @@ AliMUONReconstructor::CreateClusterServer() const
   
   if ( fClusterServer ) return;
   
-  AliCodeTimerAuto("");
+  AliCodeTimerAuto("",0);
     
   AliMUONVClusterFinder* clusterFinder = CreateClusterFinder(GetRecoParam()->GetClusteringMode());
   
@@ -422,7 +413,7 @@ AliMUONReconstructor::CreateCalibrator() const
 {
   /// Create the calibrator
   
-  AliCodeTimerAuto("")
+  AliCodeTimerAuto("",0)
   
   Int_t runNumber = AliCDBManager::Instance()->GetRun();
 
@@ -497,7 +488,7 @@ AliMUONReconstructor::FillTreeR(AliMUONVTriggerStore* triggerStore,
 {
   /// Write the trigger and cluster information into TreeR
   
-  AliCodeTimerAuto("")
+  AliCodeTimerAuto("",0)
 
   AliDebug(1,"");
   
@@ -528,7 +519,7 @@ AliMUONReconstructor::FillTreeR(AliMUONVTriggerStore* triggerStore,
     CreateClusterServer();
     
     TIter next(DigitStore()->CreateIterator());
-    fClusterServer->UseDigits(next);
+    fClusterServer->UseDigits(next,DigitStore());
 
     AliMpArea area;
     
@@ -606,7 +597,7 @@ AliMUONReconstructor::Reconstruct(TTree* digitsTree, TTree* clustersTree) const
   /// This method is called by AliReconstruction if HasLocalReconstruction()==kTRUE
   /// AND HasDigitConversion()==kTRUE
   
-  AliCodeTimerAuto("")
+  AliCodeTimerAuto("",0)
   
   AliDebug(1,"");