1. Correct inheritance of GetEntryList in AliXMLCollection + bug fix. 2. Extension...

diff --git a/ANALYSIS/AliXMLCollection.cxx b/ANALYSIS/AliXMLCollection.cxx
index 6b8a02cab85e27393e2951c680ebcbf6c3a0b3c1..6552806e004f544c6dcca0b840e840176b81fe97 100644 (file)
--- a/ANALYSIS/AliXMLCollection.cxx
+++ b/ANALYSIS/AliXMLCollection.cxx
@@ -343,8 +343,9 @@ void AliXMLCollection::ParseXML() {
        TObjString *olfn  = new TObjString(xml.GetAttr(xfile,"lfn"));
        TObjString *oguid = new TObjString(xml.GetAttr(xfile,"guid"));
        TObjString *oevlist = new TObjString(xml.GetAttr(xfile, "evlist"));
-       printf("Collection: %s - The Eventlist is %s\n",fXmlFile.Data(),oevlist->GetName());
-       if (oevlist->GetName() != "") {
+       Info("ParseXML","Collection: %s - turl: %s eventlist: %s",
+            fXmlFile.Data(),oturl->GetName(),oevlist->GetName());
+       if (strcmp(oevlist->GetName(),"") != 0) {
          TEntryList *xmlevlist = new TEntryList(oturl->GetName(), oguid->GetName());
          TString stringevlist = oevlist->GetName();
          TObjArray *evlist = stringevlist.Tokenize(",");

diff --git a/ANALYSIS/AliXMLCollection.h b/ANALYSIS/AliXMLCollection.h
index 8e1c303ef57cdcf68bd065ad856c2c8743cf23f1..f9a49e190847379a5f808dede383c41157b7f01b 100644 (file)
--- a/ANALYSIS/AliXMLCollection.h
+++ b/ANALYSIS/AliXMLCollection.h
@@ -50,6 +50,7 @@ class AliXMLCollection : public TGridCollection {
   const char *GetLFN(const char *name);
   const char *GetGUID(const char *name);
   TEntryList *GetEventList(const char *filename) const;
+  TEntryList *GetEntryList(const char *filename) { return GetEventList(filename); }
   Bool_t      OverlapCollection(TGridCollection * comparator);
 
   static AliXMLCollection *Open(const char *localcollectionfile);

diff --git a/RAW/AliRawReaderChain.cxx b/RAW/AliRawReaderChain.cxx
index 0739551e8f036d1d239688be350b0bf158a9ce72..17e59f54b0e521213ee467fca3fe1e637d5e4109 100644 (file)
--- a/RAW/AliRawReaderChain.cxx
+++ b/RAW/AliRawReaderChain.cxx
@@ -26,6 +26,13 @@
 
 #include <TChain.h>
 #include <TFileCollection.h>
+#include <TEntryList.h>
+#include "TGridCollection.h"
+#include <TPluginManager.h>
+#include <TROOT.h>
+#include <TSystem.h>
+#include <TFile.h>
+#include <TKey.h>
 
 #include "AliRawReaderChain.h"
 #include "AliRawEvent.h"
@@ -39,22 +46,102 @@ AliRawReaderChain::AliRawReaderChain() :
   // default constructor
 }
 
-AliRawReaderChain::AliRawReaderChain(const char* listFileName) :
+AliRawReaderChain::AliRawReaderChain(const char* fileName) :
   AliRawReaderRoot(),
   fChain(NULL)
 {
 // create raw-reader objects which takes as an input a root chain
-// from the file list found in 'listFileName'
-
-  TFileCollection collection("RAW",
-                            "Collection with raw-data files",
-                            listFileName);
+// either from the file list found in 'fileName' (IsCollection = true)
+// or from entry list found in 'filename' (IsCollection = false)
+// The entry-list syntax follows root convetion: filename.root/listname
 
   fChain = new TChain("RAW");
-  if (!fChain->AddFileInfoList((TCollection*)(collection.GetList()))) {
-    Error("AliRawReaderChain","Bad file list in collection, the chain is empty");
-    fIsValid = kFALSE;
-    return;
+
+  TString fileNameStr = fileName;
+  if (fileNameStr.EndsWith(".xml")) {
+
+    TGridCollection *collection = NULL;
+    TPluginManager* pluginManager = gROOT->GetPluginManager();
+    TPluginHandler* pluginHandler = pluginManager->FindHandler("TGridCollection", "alice");
+    if (!pluginHandler) {
+      pluginManager->AddHandler("TGridCollection", "alice", 
+                               "AliXMLCollection", "ANALYSISalice", "AliXMLCollection(const char*)");
+      pluginHandler = pluginManager->FindHandler("TGridCollection", "alice");
+    }
+    gSystem->Load("libANALYSIS");
+    if (pluginHandler && (pluginHandler->LoadPlugin() == 0)) {
+      collection = (TGridCollection*)pluginHandler->ExecPlugin(1,fileNameStr.Data());
+    }
+    else {
+      fIsValid = kFALSE;
+      return;
+    }
+    collection->Reset();
+    Bool_t elistsExist = kFALSE;
+    TEntryList *elist = new TEntryList();
+    while (collection->Next()) {
+      fChain->Add(collection->GetTURL(""));
+      TEntryList *list = (TEntryList *)collection->GetEntryList("");
+      if (list) {
+       list->SetTreeName("RAW");
+       list->SetFileName(collection->GetTURL(""));
+       elist->Add(list);
+       elistsExist = kTRUE;
+      }
+    }
+    if (elistsExist) {
+      fChain->SetEntryList(elist,"ne");
+    }
+    else {
+      Info("AliRawReaderChain", "no entry lists found in %s. Using all entries", fileNameStr.Data());
+      delete elist;
+    }
+  }
+  else if (fileNameStr.EndsWith(".root")) {
+
+    TDirectory* dir = gDirectory;
+    TFile *listFile = TFile::Open(fileNameStr.Data());
+    dir->cd();
+    if (!listFile || !listFile->IsOpen()) {
+      Error("AliRawReaderChain", "could not open file %s", fileNameStr.Data());
+      fIsValid = kFALSE;
+      return;
+    }
+
+    TEntryList *elist = NULL;
+    TKey *key = NULL;
+    TIter nextkey(listFile->GetListOfKeys());
+    while ((key=(TKey*)nextkey())){
+      if (strcmp("TEntryList", key->GetClassName())==0){
+        elist = (TEntryList*)key->ReadObj();
+      }
+    }
+    if (!elist) {
+      Error("AliRawReaderChain", "no TEntryList found in %s", fileNameStr.Data());
+      fIsValid = kFALSE;
+      return;
+    }
+
+    TEntryList *templist = NULL;
+    TList *elists = elist->GetLists();
+    TIter next(elists);
+    while((templist = (TEntryList*)next())){
+      Info("AliRawReaderChain", "%s added to the chain", templist->GetFileName());
+      fChain->Add(templist->GetFileName());
+    }
+    fChain->SetEntryList(elist,"ne");
+  }
+  else {
+
+    TFileCollection collection("RAW",
+                              "Collection with raw-data files",
+                              fileNameStr.Data());
+
+    if (!fChain->AddFileInfoList((TCollection*)(collection.GetList()))) {
+      Error("AliRawReaderChain","Bad file list in collection, the chain is empty");
+      fIsValid = kFALSE;
+      return;
+    }
   }
 
   fChain->SetBranchStatus("*",1);
@@ -92,6 +179,29 @@ AliRawReaderChain::AliRawReaderChain(TChain *chain) :
   fChain->SetBranchAddress("rawevent",&fEvent,&fBranch);
 }
 
+AliRawReaderChain::AliRawReaderChain(TEntryList *elist) :
+  AliRawReaderRoot(),
+  fChain(NULL)
+{
+// create raw-reader objects which takes as an input a root chain
+// from a root file collection
+
+  if (!elist) fIsValid = kFALSE;
+
+  fChain = new TChain("RAW");
+
+  TEntryList *templist = NULL;
+  TList *elists = elist->GetLists();
+  TIter next(elists);
+  while((templist = (TEntryList*)next())){
+    fChain->Add(templist->GetFileName());
+  }
+  fChain->SetEntryList(elist,"ne");
+
+  fChain->SetBranchStatus("*",1);
+  fChain->SetBranchAddress("rawevent",&fEvent,&fBranch);
+}
+
 AliRawReaderChain::AliRawReaderChain(const AliRawReaderChain& rawReader) :
   AliRawReaderRoot(rawReader),
   fChain(rawReader.fChain)

diff --git a/RAW/AliRawReaderChain.h b/RAW/AliRawReaderChain.h
index 4c6b754dd1a2f3ff924aa73db163ba234f30aedf..f3a17cf266798542e1eb2dc9662d1b1b03476fae 100644 (file)
--- a/RAW/AliRawReaderChain.h
+++ b/RAW/AliRawReaderChain.h
@@ -13,13 +13,15 @@
 
 class TChain;
 class TFileCollection;
+class TEntryList;
 
 class AliRawReaderChain: public AliRawReaderRoot {
   public :
     AliRawReaderChain();
-    AliRawReaderChain(const char* listFileName);
+    AliRawReaderChain(const char* fileName);
     AliRawReaderChain(TFileCollection *collection);
     AliRawReaderChain(TChain *chain);
+    AliRawReaderChain(TEntryList *elist);
     AliRawReaderChain(const AliRawReaderChain& rawReader);
     AliRawReaderChain& operator = (const AliRawReaderChain& rawReader);
     virtual ~AliRawReaderChain();