Added protections

[u/mrichter/AliRoot.git] / MUON / AliMUONReconstructor.cxx

diff --git a/MUON/AliMUONReconstructor.cxx b/MUON/AliMUONReconstructor.cxx
index 935c2f9e6fe0051a690672c9bae3623fbea38045..ad85be65841851d567ba68e11b2a115aa8afbfdf 100644 (file)
--- a/MUON/AliMUONReconstructor.cxx
+++ b/MUON/AliMUONReconstructor.cxx
@@ -19,10 +19,9 @@
 ///
 /// Implementation of AliReconstructor for MUON subsystem.
 ///
-/// The clustering mode and the associated parameters can be changed by using
-/// AliMUONRecoParam *muonRecoParam = AliMUONRecoParam::GetLow(High)FluxParam();
-/// muonRecoParam->Set...(); // see methods in AliMUONRecoParam.h for details
-/// AliRecoParam::Instance()->RegisterRecoParam(muonRecoParam);
+/// The clustering mode and the associated parameters can be changed through the
+/// AliMUONRecoParam object set in the reconstruction macro or read from the CDB
+/// (see methods in AliMUONRecoParam.h file for details)
 ///
 /// Valid modes are :
 ///
@@ -69,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
 //-----------------------------------------------------------------------------
@@ -111,6 +103,8 @@
 #include "AliMpArea.h"
 #include "AliMpCDB.h"
 #include "AliMpConstants.h"
+#include "AliMpDDLStore.h"
+#include "AliMpSegmentation.h"
 
 #include "AliRawReader.h"
 #include "AliCDBManager.h"
@@ -143,6 +137,14 @@ fClusterStore(0x0)
 {
   /// normal ctor
 
+  AliDebug(1,"");
+
+  // Unload and delete old mapping
+  AliCDBManager::Instance()->UnloadFromCache("MUON/Calib/Mapping");
+  AliCDBManager::Instance()->UnloadFromCache("MUON/Calib/DDLStore");
+  delete AliMpDDLStore::Instance();
+  delete AliMpSegmentation::Instance();
+
   // Load mapping
   if ( ! AliMpCDB::LoadDDLStore() ) {
     AliFatal("Could not access mapping from OCDB !");
@@ -157,6 +159,9 @@ fClusterStore(0x0)
 AliMUONReconstructor::~AliMUONReconstructor()
 {
   /// dtor
+
+  AliDebug(1,"");
+
   delete fDigitMaker;
   delete fDigitStore;
   delete fTransformer;
@@ -167,6 +172,9 @@ AliMUONReconstructor::~AliMUONReconstructor()
   delete fTriggerStore;
   delete fTrackStore;
   delete fClusterStore;
+
+  delete AliMpSegmentation::Instance(false);
+  delete AliMpDDLStore::Instance(false);
 }
 
 //_____________________________________________________________________________
@@ -238,25 +246,15 @@ AliMUONReconstructor::CreateDigitMaker() const
   AliCodeTimerAuto("")
 
   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" ))
     {
@@ -513,7 +511,7 @@ AliMUONReconstructor::FillTreeR(AliMUONVTriggerStore* triggerStore,
     CreateClusterServer();
     
     TIter next(DigitStore()->CreateIterator());
-    fClusterServer->UseDigits(next);
+    fClusterServer->UseDigits(next,DigitStore());
 
     AliMpArea area;
     
@@ -526,7 +524,7 @@ AliMUONReconstructor::FillTreeR(AliMUONVTriggerStore* triggerStore,
         if ( ( i == 6 || i == 7 )  && GetRecoParam()->BypassSt4() ) continue;
         if ( ( i == 8 || i == 9 )  && GetRecoParam()->BypassSt5() ) continue;
         
-        fClusterServer->Clusterize(i,*fClusterStore,area);
+        fClusterServer->Clusterize(i,*fClusterStore,area,GetRecoParam());
       }
     }