mixing example

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

diff --git a/MUON/AliMUONReconstructor.cxx b/MUON/AliMUONReconstructor.cxx
index 5ad4de38e18ab820a81ab1e7bc3c86113906e5dd..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,11 +99,9 @@
 #include "AliMUONPreClusterFinder.h"
 #include "AliMUONPreClusterFinderV2.h"
 #include "AliMUONPreClusterFinderV3.h"
-#include "AliMUONRecoParam.h"
 #include "AliMUONSimpleClusterServer.h"
 #include "AliMUONTracker.h"
 #include "AliMUONTriggerCircuit.h"
-#include "AliMUONTriggerCrateStore.h"
 #include "AliMUONTriggerStoreV1.h"
 #include "AliMUONVClusterFinder.h"
 #include "AliMUONVClusterServer.h"
@@ -114,7 +111,6 @@
 #include "AliMpCDB.h"
 #include "AliMpConstants.h"
 
-#include "AliRecoParam.h"
 #include "AliRawReader.h"
 #include "AliCDBManager.h"
 #include "AliCodeTimer.h"
@@ -130,12 +126,9 @@
 ClassImp(AliMUONReconstructor)
 /// \endcond 
 
-AliMUONRecoParam* AliMUONReconstructor::fgRecoParam = 0x0; // reconstruction parameters
-
 //_____________________________________________________________________________
 AliMUONReconstructor::AliMUONReconstructor() : 
 AliReconstructor(),
-fCrateManager(0x0),
 fDigitMaker(0x0),
 fTransformer(new AliMUONGeometryTransformer()),
 fDigitStore(0x0),
@@ -144,7 +137,8 @@ fCalibrationData(0x0),
 fDigitCalibrator(0x0),
 fClusterServer(0x0),
 fTriggerStore(0x0),
-fTrackStore(0x0)
+fTrackStore(0x0),
+fClusterStore(0x0)
 {
   /// normal ctor
 
@@ -165,41 +159,13 @@ AliMUONReconstructor::~AliMUONReconstructor()
   delete fDigitMaker;
   delete fDigitStore;
   delete fTransformer;
-  delete fCrateManager;
   delete fTriggerCircuit;
   delete fCalibrationData;
   delete fDigitCalibrator;
   delete fClusterServer;
   delete fTriggerStore;
   delete fTrackStore;
-}
-
-//_____________________________________________________________________________
-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;
+  delete fClusterStore;
 }
 
 //_____________________________________________________________________________
@@ -261,17 +227,6 @@ AliMUONReconstructor::ConvertDigits(AliRawReader* rawReader, TTree* digitsTree)
   }
 }
 
-//_____________________________________________________________________________
-AliMUONTriggerCrateStore*
-AliMUONReconstructor::CrateManager() const
-{
-  /// Return (and create if necessary) the trigger crate store
-  if (fCrateManager) return fCrateManager;
-  fCrateManager = new AliMUONTriggerCrateStore;
-  fCrateManager->ReadFromFile();
-  return fCrateManager;
-}
-
 //_____________________________________________________________________________
 void
 AliMUONReconstructor::CreateDigitMaker() const
@@ -333,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,
@@ -343,7 +299,8 @@ AliMUONReconstructor::CreateTracker() const
   }
   else
   {
-    tracker = new AliMUONTracker(fClusterServer,
+    tracker = new AliMUONTracker(GetRecoParam(),
+                                fClusterServer,
                                  *DigitStore(),
                                  fDigitMaker,
                                  fTransformer,
@@ -482,7 +439,7 @@ AliMUONReconstructor::CreateCalibrator() const
 
   TString calibMode = GetRecoParam()->GetCalibrationMode();
 
-  fDigitCalibrator = new AliMUONDigitCalibrator(*fCalibrationData,calibMode.Data());
+  fDigitCalibrator = new AliMUONDigitCalibrator(*fCalibrationData,GetRecoParam(),calibMode.Data());
 }
 
 //_____________________________________________________________________________
@@ -531,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
   }
@@ -545,11 +502,12 @@ AliMUONReconstructor::FillTreeR(AliMUONVTriggerStore* triggerStore,
     }
   }
 
-  AliMUONVClusterStore* clusterStore(0x0);
-  
   if ( !alone )
   {
-    clusterStore = new AliMUONClusterStoreV2;
+    if (!fClusterStore)
+    {
+      fClusterStore = new AliMUONClusterStoreV2;
+    }
     
     CreateClusterServer();
     
@@ -562,21 +520,22 @@ 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,*clusterStore,area);
+        fClusterServer->Clusterize(i,*fClusterStore,area);
       }
     }
     
-    Bool_t cok = clusterStore->Connect(clustersTree,alone);
+    Bool_t cok = fClusterStore->Connect(clustersTree,alone);
     
     if (!cok) AliError("Could not connect clusterStore to clusterTree");
     
-    AliDebug(1,Form("Number of clusters found = %d",clusterStore->GetSize()));
+    AliDebug(1,Form("Number of clusters found = %d",fClusterStore->GetSize()));
     
-    StdoutToAliDebug(1,clusterStore->Print());
+    StdoutToAliDebug(1,fClusterStore->Print());
   }
          
   if (ok) // at least one type of branches created successfully
@@ -584,7 +543,7 @@ AliMUONReconstructor::FillTreeR(AliMUONVTriggerStore* triggerStore,
     clustersTree.Fill();
   }
   
-  delete clusterStore;
+  if (fClusterStore) fClusterStore->Clear();
 }
 
 //_____________________________________________________________________________