TTree and TNtuple are loaded from OCDB file before closing the file.

diff --git a/STEER/AliCDBGrid.cxx b/STEER/AliCDBGrid.cxx
index 3725967ccf875ccba2a1924cb1cbe35c40ad138c..1fcd7719e9a8d1be1d938bf273e576c86b411d3f 100644 (file)
--- a/STEER/AliCDBGrid.cxx
+++ b/STEER/AliCDBGrid.cxx
@@ -542,7 +542,7 @@ Bool_t AliCDBGrid::PutEntry(AliCDBEntry* entry) {
 
        file->cd();
 
-       SetTreeToFile(entry, file);
+       //SetTreeToFile(entry, file);
 
        entry->SetVersion(id.GetVersion());
 

diff --git a/STEER/AliCDBLocal.cxx b/STEER/AliCDBLocal.cxx
index 5a489b0e363c76b2fda5fd147fa9771ab1c93bf0..f79da4af04c87f5973e0dba04a730bf5559786dc 100644 (file)
--- a/STEER/AliCDBLocal.cxx
+++ b/STEER/AliCDBLocal.cxx
@@ -404,7 +404,7 @@ AliCDBEntry* AliCDBLocal::GetEntry(const AliCDBId& queryId) {
        }
 
        AliCDBId entryId = anEntry->GetId();
- 
+
        // The object's Id are not reset during storage
        // If object's Id runRange or version do not match with filename,
        // it means that someone renamed file by hand. In this case a warning msg is issued.
@@ -550,7 +550,7 @@ Bool_t AliCDBLocal::PutEntry(AliCDBEntry* entry) {
                return kFALSE;
        }
        
-       SetTreeToFile(entry, &file);
+       //SetTreeToFile(entry, &file);
 
        entry->SetVersion(id.GetVersion());
        entry->SetSubVersion(id.GetSubVersion());

diff --git a/STEER/AliCDBStorage.cxx b/STEER/AliCDBStorage.cxx
index 7fcebf01e4b07419052bf775f1f2aee6b1233936..a69e7e5d6de670d7ff79af69339ba002da191727 100644 (file)
--- a/STEER/AliCDBStorage.cxx
+++ b/STEER/AliCDBStorage.cxx
@@ -16,6 +16,7 @@
 #include <TKey.h>
 #include <TH1.h>
 #include <TTree.h>
+#include <TNtuple.h>
 #include <TFile.h>
 #include "AliCDBStorage.h"
 #include "AliCDBGrid.h"
@@ -447,37 +448,50 @@ AliCDBManager::DataType AliCDBStorage::GetDataType() const {
 void AliCDBStorage::LoadTreeFromFile(AliCDBEntry *entry) const {
 // Checks whether entry contains a TTree and in case loads it into memory
 
-       AliCDBMetaData *md = dynamic_cast<AliCDBMetaData*> (entry->GetMetaData());
-       if(!md) return;
-       TString objStr = md->GetObjectClassName();
-       if(objStr != "TTree") return;
-       AliWarning("Entry contains a TTree! Loading baskets...");
+       TObject *obj = (TObject*) entry->GetObject();
 
-       TTree* tree = dynamic_cast<TTree*> (entry->GetObject());
+       if (!strcmp(obj->ClassName(),TTree::Class_Name())) {
 
-       if(!tree) return;
+               AliWarning("Entry contains a TTree! Loading baskets...");
 
-       tree->LoadBaskets();
-       tree->SetDirectory(0);
+               TTree* tree = dynamic_cast<TTree*> (obj);
 
-       return;
-}
+               if(!tree) return;
 
-//_____________________________________________________________________________
-void AliCDBStorage::SetTreeToFile(AliCDBEntry *entry, TFile* file) const {
-// Checks whether entry contains a TTree and in case assigns it to memory
+               tree->LoadBaskets();
+               tree->SetDirectory(0);
+       }
+       else if (!strcmp(obj->ClassName(),TNtuple::Class_Name())){
 
-       AliCDBMetaData *md = dynamic_cast<AliCDBMetaData*> (entry->GetMetaData());
-       if(!md) return;
-       TString objStr = md->GetObjectClassName();
-       if(objStr != "TTree") return;
-       AliWarning("Entry contains a TTree! Setting file...");
+               AliWarning("Entry contains a TNtuple! Loading baskets...");
 
-       TTree* tree = dynamic_cast<TTree*> (entry->GetObject());
+               TNtuple* ntu = dynamic_cast<TNtuple*> (obj);
 
-       if(!tree) return;
+               if(!ntu) return;
 
-       tree->SetDirectory(file);
+               ntu->LoadBaskets();
+               ntu->SetDirectory(0);
+       }
 
        return;
 }
+
+// //_____________________________________________________________________________
+// void AliCDBStorage::SetTreeToFile(AliCDBEntry *entry, TFile* file) const {
+// // Checks whether entry contains a TTree and in case assigns it to memory
+// 
+//     AliCDBMetaData *md = dynamic_cast<AliCDBMetaData*> (entry->GetMetaData());
+//     if(!md) return;
+//     TString objStr = md->GetObjectClassName();
+//     if(objStr != "TTree") return;
+//     AliWarning("Entry contains a TTree! Setting file...");
+// 
+//     TTree* tree = dynamic_cast<TTree*> (entry->GetObject());
+// 
+//     if(!tree) return;
+// 
+// //  tree->SetDirectory(file);
+//     tree->SetDirectory(0);
+// 
+//     return;
+// }

diff --git a/STEER/AliCDBStorage.h b/STEER/AliCDBStorage.h
index 7a7f3fb216acd7b06ad79441eb8a9a06049d70d7..312a5f709244d407b03f8218cc65faa3ab1f27a7 100644 (file)
--- a/STEER/AliCDBStorage.h
+++ b/STEER/AliCDBStorage.h
@@ -105,7 +105,7 @@ protected:
        virtual TList *GetIdListFromFile(const char* fileName)=0;
        virtual void   QueryValidFiles() = 0;
        void    LoadTreeFromFile(AliCDBEntry* entry) const;
-       void    SetTreeToFile(AliCDBEntry* entry, TFile* file) const;
+       //void  SetTreeToFile(AliCDBEntry* entry, TFile* file) const;
 
        TObjArray fValidFileIds;        // list of Id's of the files valid for a given run (cached as fRun)
        Int_t fRun;             // run number, used to manage list of valid files