- if (fLastEventSerialNr+1 >= fEvents) {
- if (!OpenNextFile()) return kFALSE;
- }
-
- fLastEventSerialNr++;
-// in some cases the serial number does not start from 0, find the
-// number of the next event
- char name[20];
- sprintf(name, "TreeS%d", ++fLastEventNr);
- while (!fCurrentFile->Get(name) && fLastEventNr < fEvents)
- sprintf(name, "TreeS%d", ++fLastEventNr);
- serialNr = fLastEventNr;
+ AliRunLoader* currentloader = AliRunLoader::GetRunLoader(fEventFolderName);
+ if (currentloader == 0x0)
+ {
+ AliDebug(1, Form(
+ "Can not get RL from folder named %s. Attempting to open next file",
+ fEventFolderName.Data()));
+ Int_t res = OpenNextFile();
+ if ( res == 0) return kFALSE;
+ currentloader = AliRunLoader::GetRunLoader(fEventFolderName);
+ }