mixing example

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

diff --git a/MUON/AliMUONReconstructor.cxx b/MUON/AliMUONReconstructor.cxx
index d34ad4969a28eb2329d62aa5165256b721b2873d..bbb4e15c8012f1e5105c51d8d43d2bdd723e5f98 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 :
 ///
@@ -100,7 +99,6 @@
 #include "AliMUONPreClusterFinder.h"
 #include "AliMUONPreClusterFinderV2.h"
 #include "AliMUONPreClusterFinderV3.h"
-#include "AliMUONRecoParam.h"
 #include "AliMUONSimpleClusterServer.h"
 #include "AliMUONTracker.h"
 #include "AliMUONTriggerCircuit.h"
@@ -113,7 +111,6 @@
 #include "AliMpCDB.h"
 #include "AliMpConstants.h"
 
-#include "AliRecoParam.h"
 #include "AliRawReader.h"
 #include "AliCDBManager.h"
 #include "AliCodeTimer.h"
@@ -129,8 +126,6 @@
 ClassImp(AliMUONReconstructor)
 /// \endcond 
 
-AliMUONRecoParam* AliMUONReconstructor::fgRecoParam = 0x0; // reconstruction parameters
-
 //_____________________________________________________________________________
 AliMUONReconstructor::AliMUONReconstructor() : 
 AliReconstructor(),
@@ -173,34 +168,6 @@ AliMUONReconstructor::~AliMUONReconstructor()
   delete fClusterStore;
 }
 
-//_____________________________________________________________________________
-const AliMUONRecoParam* AliMUONReconstructor::GetRecoParam()
-{
-  /// get reconstruction parameters
-  
-  if (!fgRecoParam) {
-    
-    // get reconstruction parameters from AliRecoParam if any
-    TObjArray *recoParams = AliRecoParam::Instance()->GetRecoParam("MUON");
-    
-    if (recoParams) {
-      
-      fgRecoParam = (AliMUONRecoParam*) recoParams->Last();
-      
-    } else {
-      
-      // initialize reconstruction parameters if not already done
-      cout<<"W-AliMUONReconstructor::GetRecoParam: Reconstruction parameters not initialized - Use default one"<<endl;
-      fgRecoParam = AliMUONRecoParam::GetLowFluxParam();
-      AliRecoParam::Instance()->RegisterRecoParam(fgRecoParam);
-      
-    }
-    
-  }
-  
-  return fgRecoParam;
-}
-
 //_____________________________________________________________________________
 void
 AliMUONReconstructor::Calibrate(AliMUONVDigitStore& digitStore) const
@@ -321,9 +288,10 @@ AliMUONReconstructor::CreateTracker() const
 
   AliMUONTracker* tracker(0x0);
   
-  if ( ! AliMUONReconstructor::GetRecoParam()->CombineClusterTrackReco() )
+  if ( ! GetRecoParam()->CombineClusterTrackReco() )
   {
-    tracker = new AliMUONTracker(0x0,
+    tracker = new AliMUONTracker(GetRecoParam(),
+                                0x0,
                                  *DigitStore(),
                                  fDigitMaker,
                                  fTransformer,
@@ -331,7 +299,8 @@ AliMUONReconstructor::CreateTracker() const
   }
   else
   {
-    tracker = new AliMUONTracker(fClusterServer,
+    tracker = new AliMUONTracker(GetRecoParam(),
+                                fClusterServer,
                                  *DigitStore(),
                                  fDigitMaker,
                                  fTransformer,
@@ -470,7 +439,7 @@ AliMUONReconstructor::CreateCalibrator() const
 
   TString calibMode = GetRecoParam()->GetCalibrationMode();
 
-  fDigitCalibrator = new AliMUONDigitCalibrator(*fCalibrationData,calibMode.Data());
+  fDigitCalibrator = new AliMUONDigitCalibrator(*fCalibrationData,GetRecoParam(),calibMode.Data());
 }
 
 //_____________________________________________________________________________
@@ -519,7 +488,7 @@ AliMUONReconstructor::FillTreeR(AliMUONVTriggerStore* triggerStore,
   Bool_t ok(kFALSE);
   Bool_t alone(kTRUE); // is trigger the only info in TreeR ?
   
-  if ( ! AliMUONReconstructor::GetRecoParam()->CombineClusterTrackReco() )
+  if ( ! GetRecoParam()->CombineClusterTrackReco() )
   {
     alone = kFALSE; // we'll get both tracker and trigger information in TreeR
   }
@@ -551,9 +520,10 @@ AliMUONReconstructor::FillTreeR(AliMUONVTriggerStore* triggerStore,
     
     for ( Int_t i = 0; i < AliMpConstants::NofTrackingChambers(); ++i ) 
     {
-      if (AliMUONReconstructor::GetRecoParam()->UseChamber(i))
+      if (GetRecoParam()->UseChamber(i))
       {
-        if ( i >= 6 && AliMUONReconstructor::GetRecoParam()->BypassSt45() ) continue;
+        if ( ( i == 6 || i == 7 )  && GetRecoParam()->BypassSt4() ) continue;
+        if ( ( i == 8 || i == 9 )  && GetRecoParam()->BypassSt5() ) continue;
         
         fClusterServer->Clusterize(i,*fClusterStore,area);
       }