Trigger scalers added to ESD header.

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

diff --git a/MUON/AliMUONTrackerOCDBDataMaker.cxx b/MUON/AliMUONTrackerOCDBDataMaker.cxx
index 6d9b7b7a10fe323ffbaebe9945eddba3107f281d..ae4dab6a20716249858d35f96e1f495e44331d20 100644 (file)
--- a/MUON/AliMUONTrackerOCDBDataMaker.cxx
+++ b/MUON/AliMUONTrackerOCDBDataMaker.cxx
@@ -30,7 +30,7 @@
 #include "AliMpDDLStore.h"
 #include "AliMpDetElement.h"
 #include "AliMpDEManager.h"
-#include "AliMpHVNamer.h"
+#include "AliMpDCSNamer.h"
 #include <TClass.h>
 #include <TMap.h>
 #include <TObjArray.h>
@@ -73,6 +73,17 @@ AliMUONTrackerOCDBDataMaker::AliMUONTrackerOCDBDataMaker(const char* ocdbPath,
                store = AliMUONCalibrationData::CreatePedestals(runNumber,&startOfValidity);
                fData = CreateDataPedestals(startOfValidity);
        }
+       else if ( stype == "OCCUPANCY" )
+       {
+               store = AliMUONCalibrationData::CreateOccupancyMap(runNumber,&startOfValidity);
+    
+    if (store)
+    {
+      fData = new AliMUONTrackerData(Form("OCC%d",runNumber),"OccupancyMap",*store);
+      fData->SetDimensionName(0,"One");
+      fData->SetDimensionName(1,"Zero");
+    }
+       }
        else if ( stype == "GAINS" ) 
        {
                AliMUONVStore* gains = AliMUONCalibrationData::CreateGains(runNumber,&startOfValidity);
@@ -105,8 +116,11 @@ AliMUONTrackerOCDBDataMaker::AliMUONTrackerOCDBDataMaker(const char* ocdbPath,
                return;
        }
        
-       fData->Add(*store);
-       
+  if ( stype != "OCCUPANCY" )
+  {
+    fData->Add(*store);
+       }
+  
        delete store;
 }
 
@@ -167,7 +181,7 @@ AliMUONTrackerOCDBDataMaker::CreateHVStore(TMap& m)
   
   TIter next(&m);
   TObjString* s;
-  AliMpHVNamer hvNamer;
+  AliMpDCSNamer hvNamer("TRACKER");
   
   while ( ( s = static_cast<TObjString*>(next()) ) )
   {
@@ -183,7 +197,7 @@ AliMUONTrackerOCDBDataMaker::CreateHVStore(TMap& m)
     }
     
     Int_t nindex = 1;
-    Int_t hvIndex = hvNamer.HVIndexFromDCSAlias(name.Data());
+    Int_t hvIndex = hvNamer.DCSIndexFromDCSAlias(name.Data());
     
     if ( hvIndex > 0 && detElemId >= 500 ) 
     {
@@ -217,7 +231,7 @@ AliMUONTrackerOCDBDataMaker::CreateHVStore(TMap& m)
       }
       if ( n ) hvValue /= n;
       
-      Int_t N(AliMpConstants::ManuNofChannels());
+      Int_t nofChannels(AliMpConstants::ManuNofChannels());
       
       for ( Int_t k = 0 ; k < manus->GetSize(); ++k )
       {
@@ -225,10 +239,10 @@ AliMUONTrackerOCDBDataMaker::CreateHVStore(TMap& m)
         AliMUONVCalibParam* param = static_cast<AliMUONVCalibParam*>(store->FindObject(detElemId,manuId));
         if ( ! param ) 
         {
-          param = new AliMUONCalibParamND(1,N,detElemId,manuId,0);
+          param = new AliMUONCalibParamND(1,nofChannels,detElemId,manuId,0);
           store->Add(param);
         }
-        for ( Int_t j = 0 ; j < N; ++j )
+        for ( Int_t j = 0 ; j < nofChannels; ++j )
         {
           param->SetValueAsDouble(j,0,hvValue);
         }