#include "AliMUONVTriggerStore.h"
#include "AliMpCDB.h"
-#include "AliMpIntPair.h"
+#include "AliMpEncodePair.h"
#include "AliMpDEManager.h"
#include "AliMpConstants.h"
#include "AliMpCDB.h"
#include "AliRunLoader.h"
#include "AliHeader.h"
#include "AliCDBManager.h"
+#include "AliLog.h"
#include <Riostream.h>
#include <TFile.h>
{
/// dtor
ResetStores();
- if ( fLoader != 0x0 )
- {
- delete fLoader->GetRunLoader();
- }
--fgInstanceCounter;
}
{
AliError(Form("Cannot open file %s",filename));
fIsValid = kFALSE;
+ return;
}
runLoader->LoadHeader();
}
else {
Int_t runNumber = runLoader->GetHeader()->GetRun();
- AliCDBManager::Instance()->SetRun(runNumber);
+ AliCDBManager::Instance()->SetRun(runNumber>=0 ? runNumber : 1);
}
runLoader->UnloadHeader();
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;