Moving required CMake version from 2.8.4 to 2.8.8

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

diff --git a/MUON/AliMUONDataInterface.cxx b/MUON/AliMUONDataInterface.cxx
index 7aa2ccbaaa76c3cf9835db3c4f02176f3a67b2be..8ee174b1228267b4e11e7669a953a49045bf9954 100644 (file)
--- a/MUON/AliMUONDataInterface.cxx
+++ b/MUON/AliMUONDataInterface.cxx
@@ -28,19 +28,17 @@
 #include "AliMUONVTriggerStore.h"
 #include "AliMpCDB.h"
 
-#include "AliMpIntPair.h"
+#include "AliMpEncodePair.h"
 #include "AliMpDEManager.h"
 #include "AliMpConstants.h"
 #include "AliMpCDB.h"
 
 #include "AliLoader.h"
-#include "AliLog.h"
 #include "AliRunLoader.h"
 #include "AliHeader.h"
 #include "AliCDBManager.h"
+#include "AliLog.h"
 
-#include <TError.h>
-#include <TParticle.h>
 #include <Riostream.h>
 #include <TFile.h>
 #include <TList.h>
@@ -112,10 +110,6 @@ AliMUONDataInterface::~AliMUONDataInterface()
 {
   /// dtor
   ResetStores();
-  if ( fLoader != 0x0 ) 
-  {
-    delete fLoader->GetRunLoader();
-  }
   --fgInstanceCounter;  
 }
 
@@ -567,6 +561,7 @@ AliMUONDataInterface::Open(const char* filename)
   {
     AliError(Form("Cannot open file %s",filename));    
     fIsValid = kFALSE;
+    return;
   }
 
   runLoader->LoadHeader();
@@ -576,7 +571,7 @@ AliMUONDataInterface::Open(const char* filename)
   }
   else {
     Int_t runNumber = runLoader->GetHeader()->GetRun();
-    AliCDBManager::Instance()->SetRun(runNumber);
+    AliCDBManager::Instance()->SetRun(runNumber>=0 ? runNumber : 1);
   }  
   runLoader->UnloadHeader(); 
 
@@ -810,8 +805,8 @@ TIterator* AliMUONDataInterface::GetIterator(IteratorType type, Int_t x, Int_t y
       
       AliMUONVDigitStore* store = DigitStore(fCurrentEvent);
       if (store == 0x0) return 0x0;
-      AliMpIntPair pair = AliMpDEManager::GetDetElemIdRange(chamber);
-      fIterator = store->CreateIterator(pair.GetFirst(), pair.GetSecond(), cathode);
+      MpPair_t pair = AliMpDEManager::GetDetElemIdRange(chamber);
+      fIterator = store->CreateIterator(AliMp::PairFirst(pair), AliMp::PairSecond(pair), cathode);
       if (fIterator == 0x0) return 0x0;
       fCurrentIteratorType = kDigitIteratorByChamberAndCathode;
       fDataX = chamber;