X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FTestRecPoints.C;h=c9dedc8358d0fc12b1222584b073b0a358b74188;hb=570b79d296043d4fd392b7c0126e0db7d7fa0494;hp=bc35c1a51fa954b8d2a88aa81d9b99139e9c424e;hpb=6f6a3f3b0f898020ae701b1f925e4e26b2382c62;p=u%2Fmrichter%2FAliRoot.git

diff --git a/MUON/TestRecPoints.C b/MUON/TestRecPoints.C
index bc35c1a51fa..c9dedc8358d 100644
--- a/MUON/TestRecPoints.C
+++ b/MUON/TestRecPoints.C
@@ -43,9 +43,6 @@
 #include "AliGeomManager.h"
 
 // MUON
-#include "AliMpCDB.h"
-#include "AliMpDDL.h"
-#include "AliMpDDLStore.h"
 #include "AliMpConstants.h"
 
 // trigger
@@ -63,6 +60,8 @@
 #include "AliMUONVDigitStore.h"
 #include "AliMUONDigitStoreV2R.h"
 #include "AliMUONVCluster.h"
+#include "AliMUONRecoParam.h"
+#include "AliMUONCDB.h"
 
 #endif
 
@@ -77,7 +76,7 @@ Int_t GetPlane(Int_t ch, Int_t cath){return kNcathodes * ch + cath;}
 void ClusterSize(TList&, AliMUONVDigit*, Int_t&, Int_t);
 
 // Main Method
-void TestRecPoints(TString baseDir=".", TString outDir=".", Float_t adcCut = 10., Int_t whatToTest=kTrackTrig, Int_t runNumber=0, TString cdbStorage="local://$ALICE_ROOT")
+void TestRecPoints(TString baseDir=".", TString outDir=".", Float_t adcCut = 10., Int_t whatToTest=kTrackTrig, Int_t runNumber=0, TString cdbStorage="local://$ALICE_ROOT/OCDB")
 {
   const Int_t kNplanes = kNtrigChambers * kNcathodes;
   const Int_t kNslats = 18;
@@ -171,14 +170,14 @@ void TestRecPoints(TString baseDir=".", TString outDir=".", Float_t adcCut = 10.
   AliMUONDigitStoreV2R digitStoreTrackCut;
   AliMUONVCluster* cluster = 0x0;
   
-  // Load segmentation
+  // Load mapping
   AliCDBManager::Instance()->SetDefaultStorage(cdbStorage.Data());
   AliCDBManager::Instance()->SetRun(runNumber);
-  
-  AliMpCDB::LoadDDLStore();
+  if (!AliMUONCDB::LoadMapping()) return;
   
   AliMUONGeometryTransformer* transformer = 0x0;
   
+  AliMUONRecoParam* recoParam = 0x0;
   
   AliMUONClusterStoreV2 clusterStore;
   AliMUONVClusterFinder* clusterFinder = 0x0;
@@ -202,8 +201,12 @@ void TestRecPoints(TString baseDir=".", TString outDir=".", Float_t adcCut = 10.
     transformer = new AliMUONGeometryTransformer();
     // Load geometry data
     transformer->LoadGeometryData();
+    // Load reconstruction parameters
+    recoParam = AliMUONCDB::LoadRecoParam();
+    if (!recoParam) return;
+    recoParam->Print("FULL");
     clusterFinder = new AliMUONClusterFinderMLEM(kFALSE,new AliMUONPreClusterFinder);
-    clusterServer = new AliMUONSimpleClusterServer(*clusterFinder,*transformer);
+    clusterServer = new AliMUONSimpleClusterServer(clusterFinder,*transformer);
   }
   
   AliMUONDigitStoreV1 digitStore;
@@ -293,10 +296,11 @@ void TestRecPoints(TString baseDir=".", TString outDir=".", Float_t adcCut = 10.
         digitStoreTrackCut.Add(*mDigit, AliMUONVDigitStore::kDeny);
       } // loop on digits
       
-      clusterServer->UseDigitStore(digitStoreTrackCut);
+      TIter nextDigitTrackCut(digitStoreTrackCut.CreateIterator());
+      clusterServer->UseDigits(nextDigitTrackCut,&digitStoreTrackCut);
       
       for (Int_t ch = firstChamber; ch <= lastChamber; ++ch ){
-        clusterServer->Clusterize(ch, clusterStore, AliMpArea());
+        clusterServer->Clusterize(ch, clusterStore, AliMpArea(),recoParam);
       }
       
       TIter next(clusterStore.CreateIterator());