Fixing compiler warnings

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

diff --git a/MUON/AliMUONPreprocessor.cxx b/MUON/AliMUONPreprocessor.cxx
index 6fc433fd2857b79cb38310b41216037befcb53e1..2488db2a5e9ec2e37dc905777c13b4afa5cfda38 100644 (file)
--- a/MUON/AliMUONPreprocessor.cxx
+++ b/MUON/AliMUONPreprocessor.cxx
@@ -17,14 +17,16 @@
 
 #include "AliMUONPreprocessor.h"
 
-#include "AliMUONPedestalSubprocessor.h"
-#include "AliMUONHVSubprocessor.h"
+#include "AliCDBEntry.h"
+#include "AliLog.h"
 #include "AliMUONGMSSubprocessor.h"
-
-#include "AliMpSegmentation.h"
+#include "AliMUONHVSubprocessor.h"
+#include "AliMUONPedestalSubprocessor.h"
+#include "AliMpCDB.h"
 #include "AliMpDDLStore.h"
-
-#include "AliLog.h"
+#include "AliMpDataMap.h"
+#include "AliMpDataStreams.h"
+#include "AliMpSegmentation.h"
 #include "AliShuttleInterface.h"
 #include "Riostream.h"
 #include "TObjArray.h"
@@ -89,25 +91,35 @@ AliMUONPreprocessor::Initialize(Int_t run, UInt_t startTime, UInt_t endTime)
   /// Load mapping and initialize subtasks  
 
   // Delete previous mapping
-  delete AliMpSegmentation::Instance(false);
-  delete AliMpDDLStore::Instance(false);
+  AliMpCDB::UnloadAll();
   
-  // Load mapping from CDB for this run
+  if ( ! IsApplicable() ) {
+    Log(Form("WARNING-RunType=%s is not one I should handle.",GetRunType()));
+    return;
+  }   
   
-  AliCDBEntry* cdbEntry = GetFromOCDB("Calib", "Mapping");
+  // Load mapping from CDB for this run
+  AliCDBEntry* cdbEntry = GetFromOCDB("Calib", "MappingData");
   if (!cdbEntry)
   {
-    Log("Could not get Mapping from OCDB !");
+    Log("Could not get MappingData from OCDB !");
     fIsValid = kFALSE;
   }
-  
-  cdbEntry = GetFromOCDB("Calib", "DDLStore");
-  if (!cdbEntry)
+  else
   {
-    Log("Could not get DDLStore from OCDB");
-    fIsValid = kFALSE;
+    AliMpDataMap* dataMap = dynamic_cast<AliMpDataMap*>(cdbEntry->GetObject());
+    if (!dataMap)
+    {
+      Log("DataMap is not of the expected type. That is bad...");
+      fIsValid = kFALSE;
+    }
+    else
+    {
+      AliMpDataStreams dataStreams(dataMap);
+      AliMpDDLStore::ReadData(dataStreams);
+    }
   }
-
+  
   if (IsValid())
   {
     // loop over subtasks and initialize them
@@ -116,10 +128,6 @@ AliMUONPreprocessor::Initialize(Int_t run, UInt_t startTime, UInt_t endTime)
       Subprocessor(i)->Initialize(run,startTime,endTime);
     }
   }
-
-  if (! IsApplicable() ) 
-    Log(Form("WARNING-RunType=%s is not one I should handle.",GetRunType()));
-
   Log(Form("Initialize was %s",( IsValid() ? "fine" : "NOT OK")));
 }