In case of AOD analysis where cell time is not available, assign to the cell the...

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

diff --git a/MUON/MUONOfflineShift.C b/MUON/MUONOfflineShift.C
index 995ba753c33126059f7d03ddc112c35af62d629d..ac52aeed74c549306cccc9cefd26363e1a8abed0 100644 (file)
--- a/MUON/MUONOfflineShift.C
+++ b/MUON/MUONOfflineShift.C
@@ -46,10 +46,10 @@
 
 #if !defined(__CINT__) || defined(__MAKECINT__)
 
-#include "AliCDBEntry.h"
 #include "AliCDBManager.h"
 #include "AliCodeTimer.h"
-#include "AliMUONPainterRegistry.h"
+#include "AliMUONCDB.h"
+#include "AliMUONPainterDataRegistry.h"
 #include "AliMUONRecoParam.h"
 #include "AliMUONTrackerDataMaker.h"
 #include "AliMUONVTrackerData.h"
@@ -89,10 +89,8 @@ Int_t DataMakerReading(const char* input,
   
   AliMUONVTrackerDataMaker* dm(0x0);
   
-  AliCDBEntry* entry = AliCDBManager::Instance()->Get("MUON/Calib/RecoParam");
-  AliMUONRecoParam* recoParam(0x0);
-  
-  if ( entry ) recoParam = static_cast<AliMUONRecoParam*>(entry->GetObject());
+  AliMUONRecoParam* recoParam = AliMUONCDB::LoadRecoParam();
+  if (!recoParam) return 0;
   
   if ( strlen(cdbPath) > 0 ) 
   {
@@ -103,7 +101,7 @@ Int_t DataMakerReading(const char* input,
     dm = new AliMUONTrackerDataMaker(rawReader,histogram);
   }
   
-  AliMUONPainterRegistry::Instance()->Register(dm);
+  AliMUONPainterDataRegistry::Instance()->Register(dm);
 
   timer.Start(kTRUE);
   Int_t n(0);
@@ -146,7 +144,7 @@ void Occupancy(ostream& outfile)
   
   const Int_t occIndex = 2;
   
-  AliMUONPainterRegistry* reg = AliMUONPainterRegistry::Instance();
+  AliMUONPainterDataRegistry* reg = AliMUONPainterDataRegistry::Instance();
 
   Int_t nofDataSources = reg->NumberOfDataSources();
 
@@ -230,13 +228,13 @@ void MUONOfflineShift(const char* input="alien:///alice/data/2009/LHC09a/0000674
   AliCDBManager::Instance()->SetDefaultStorage(ocdbPath);
   AliCDBManager::Instance()->SetRun(runNumber);
 
-  AliMpCDB::LoadDDLStore();
-  AliMpCDB::LoadManuStore();
+  if (!AliMUONCDB::LoadMapping()) return;
   
   TStopwatch timer1;
   TStopwatch timer2;
   TStopwatch timer3;
   TStopwatch timer4;
+  TStopwatch timer5;
   
   Int_t n1 = DataMakerReading(input,timer1,"","",kTRUE,0,0);
 
@@ -246,12 +244,15 @@ void MUONOfflineShift(const char* input="alien:///alice/data/2009/LHC09a/0000674
 
   Int_t n4 = DataMakerReading(input,timer4,ocdbPath,"GAIN");
 
+  Int_t n5 = DataMakerReading(input,timer5,ocdbPath,"INJECTIONGAIN");
+
   Print("DataMakerReading(HRAW)",timer1,n1);  
   Print("DataMakerReading(HCALZ)",timer2,n2);
   Print("DataMakerReading(HCALG)",timer3,n3);
   Print("DataMakerReading(HCALC)",timer4,n4);
+  Print("DataMakerReading(HCALE)",timer5,n5);
   
-  AliMUONPainterRegistry* reg = AliMUONPainterRegistry::Instance();
+  AliMUONPainterDataRegistry* reg = AliMUONPainterDataRegistry::Instance();
   
   TFile f(gSystem->ExpandPathName(Form("%s.root",outputBase)),"RECREATE");
   ofstream out(gSystem->ExpandPathName(Form("%s.log",outputBase)));