In AliMUONTrackerQADataMakerRec:

[u/mrichter/AliRoot.git] / MUON / TestRecPoints.C

diff --git a/MUON/TestRecPoints.C b/MUON/TestRecPoints.C
index 3aec6e66c73a4770ab2f806140e2f25fba4c6632..c9dedc8358d0fc12b1222584b073b0a358b74188 100644 (file)
--- a/MUON/TestRecPoints.C
+++ b/MUON/TestRecPoints.C
@@ -38,16 +38,11 @@
 #include "AliRunLoader.h"
 #include "AliLoader.h"
 #include "AliCDBManager.h"
-#include "AliCDBEntry.h"
-#include "AliCDBPath.h"
 
 // tracker
 #include "AliGeomManager.h"
 
 // MUON
-#include "AliMpCDB.h"
-#include "AliMpDDL.h"
-#include "AliMpDDLStore.h"
 #include "AliMpConstants.h"
 
 // trigger
@@ -66,6 +61,7 @@
 #include "AliMUONDigitStoreV2R.h"
 #include "AliMUONVCluster.h"
 #include "AliMUONRecoParam.h"
+#include "AliMUONCDB.h"
 
 #endif
 
@@ -80,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;
@@ -174,11 +170,10 @@ 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;
   
@@ -207,17 +202,8 @@ void TestRecPoints(TString baseDir=".", TString outDir=".", Float_t adcCut = 10.
     // Load geometry data
     transformer->LoadGeometryData();
     // Load reconstruction parameters
-    AliCDBPath path("MUON","Calib","RecoParam");
-    AliCDBEntry *entry=AliCDBManager::Instance()->Get(path.GetPath());
-    if(entry) {
-      recoParam = dynamic_cast<AliMUONRecoParam*>(entry->GetObject());
-      entry->SetOwner(0);
-      AliCDBManager::Instance()->UnloadFromCache(path.GetPath());
-    }
-    if (!recoParam) {
-      printf("Couldn't find RecoParam object in OCDB: create default one");
-      recoParam = AliMUONRecoParam::GetLowFluxParam();
-    }
+    recoParam = AliMUONCDB::LoadRecoParam();
+    if (!recoParam) return;
     recoParam->Print("FULL");
     clusterFinder = new AliMUONClusterFinderMLEM(kFALSE,new AliMUONPreClusterFinder);
     clusterServer = new AliMUONSimpleClusterServer(clusterFinder,*transformer);
@@ -311,7 +297,7 @@ void TestRecPoints(TString baseDir=".", TString outDir=".", Float_t adcCut = 10.
       } // loop on digits
       
       TIter nextDigitTrackCut(digitStoreTrackCut.CreateIterator());
-      clusterServer->UseDigits(nextDigitTrackCut);
+      clusterServer->UseDigits(nextDigitTrackCut,&digitStoreTrackCut);
       
       for (Int_t ch = firstChamber; ch <= lastChamber; ++ch ){
         clusterServer->Clusterize(ch, clusterStore, AliMpArea(),recoParam);