From e473e8b0b92fc1c189fbc4b6c206de76ae1e6b73 Mon Sep 17 00:00:00 2001 From: morsch Date: Tue, 11 Oct 2011 10:42:47 +0000 Subject: [PATCH] MCEventHandler derives from InputEventHandler M. Vala --- MUON/AliMUONRecoCheck.cxx | 4 ++-- STEER/STEERBase/AliMCEventHandler.cxx | 8 ++++---- STEER/STEERBase/AliMCEventHandler.h | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/MUON/AliMUONRecoCheck.cxx b/MUON/AliMUONRecoCheck.cxx index 9b22224356c..68e51e18298 100644 --- a/MUON/AliMUONRecoCheck.cxx +++ b/MUON/AliMUONRecoCheck.cxx @@ -293,7 +293,7 @@ AliMUONVTrackStore* AliMUONRecoCheck::TrackRefs(Int_t event) if (fTrackRefStore != 0x0) return fTrackRefStore; else { - if (!fMCEventHandler->GetEvent(event)) { + if (!fMCEventHandler->LoadEvent(event)) { AliError(Form("fails to read MC objects for event %d", event)); return 0x0; } @@ -320,7 +320,7 @@ AliMUONVTriggerTrackStore* AliMUONRecoCheck::TriggerableTracks(Int_t event) if (fRecoTriggerRefStore != 0x0) return fRecoTriggerRefStore; else { - if (!fMCEventHandler->GetEvent(event)) { + if (!fMCEventHandler->LoadEvent(event)) { AliError(Form("fails to read MC objects for event %d", event)); return 0x0; } diff --git a/STEER/STEERBase/AliMCEventHandler.cxx b/STEER/STEERBase/AliMCEventHandler.cxx index 1af064cfc6d..2b9f9de0039 100644 --- a/STEER/STEERBase/AliMCEventHandler.cxx +++ b/STEER/STEERBase/AliMCEventHandler.cxx @@ -45,7 +45,7 @@ ClassImp(AliMCEventHandler) AliMCEventHandler::AliMCEventHandler() : - AliVEventHandler(), + AliInputEventHandler(), fMCEvent(new AliMCEvent()), fFileE(0), fFileK(0), @@ -77,7 +77,7 @@ AliMCEventHandler::AliMCEventHandler() : } AliMCEventHandler::AliMCEventHandler(const char* name, const char* title) : - AliVEventHandler(name, title), + AliInputEventHandler(name, title), fMCEvent(new AliMCEvent()), fFileE(0), fFileK(0), @@ -176,7 +176,7 @@ Bool_t AliMCEventHandler::Init(Option_t* opt) return kTRUE; } -Bool_t AliMCEventHandler::GetEvent(Int_t iev) +Bool_t AliMCEventHandler::LoadEvent(Int_t iev) { // Load the event number iev // @@ -289,7 +289,7 @@ Bool_t AliMCEventHandler::BeginEvent(Long64_t entry) return kFALSE; } - Bool_t result = GetEvent(entry); + Bool_t result = LoadEvent(entry); if (fSubsidiaryHandlers) { TIter next(fSubsidiaryHandlers); diff --git a/STEER/STEERBase/AliMCEventHandler.h b/STEER/STEERBase/AliMCEventHandler.h index 0b6a10cd25c..b6e37a4f65c 100644 --- a/STEER/STEERBase/AliMCEventHandler.h +++ b/STEER/STEERBase/AliMCEventHandler.h @@ -1,4 +1,4 @@ -// -*- mode: C++ -*- + // -*- mode: C++ -*- #ifndef ALIMCEVENTHANDLER_H #define ALIMCEVENTHANDLER_H /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * @@ -15,7 +15,7 @@ // // Origin: Andreas Morsch, CERN, andreas.morsch@cern.ch //------------------------------------------------------------------------- -#include "AliVEventHandler.h" +#include "AliInputEventHandler.h" #include "AliHeader.h" #include @@ -32,7 +32,7 @@ class AliMCEvent; -class AliMCEventHandler : public AliVEventHandler +class AliMCEventHandler : public AliInputEventHandler { public: @@ -57,13 +57,13 @@ public: virtual Bool_t Terminate(); virtual Bool_t TerminateIO(); virtual void ResetIO(); - virtual Bool_t GetEvent(Int_t iev); + virtual Bool_t LoadEvent(Int_t iev); virtual void SetReadTR(Bool_t flag) { fReadTR = flag; } virtual void AddSubsidiaryHandler(AliMCEventHandler* handler); virtual void SetNumberOfEventsInContainer(Int_t nev) {fEventsInContainer = nev;} virtual void SetPreReadMode(PreReadMode_t mode) {fPreReadMode = mode;} // - AliMCEvent* MCEvent() const {return fMCEvent;} + AliMCEvent* MCEvent() const {return fMCEvent;} TTree* TreeTR() const {return fTreeTR;} TTree* TreeK() const {return fTreeK;} virtual TTree* GetTree() const {return fTreeE;} -- 2.43.0