[SPLIT?] Prepare hist and directory for ROOT without implicit ownership.

Author: hageboeck

roottest/root/hist/misc/runownership.C

@@ -28,7 +28,9 @@ void write(const char *filename = "histo.root")
 {
    TFile * f = TFile::Open(filename,"RECREATE");
    TH1F *histo = new TH1F_inst("h1","h1",10,0,10); histo->Fill(3);
+   histo->SetDirectory(f);
    histo = new TH1F_inst("h2","h2",10,0,10); histo->Fill(3);
+   histo->SetDirectory(f);
    TCanvas *c1 = new TCanvas("c1");
    histo->SetBit(kCanDelete);
    histo->Draw();

roottest/root/io/directory/testFindObjectAny.C

@@ -2,12 +2,12 @@ void doit()
 {
    TFile* base = new TFile("f.db","recreate");
    TDirectory* a = base->mkdir("a","First Level Dir");
-   a->cd();
    TH1D* ha = new TH1D("ha","ha",10,0,1);
+   a->Append(ha, true);
    TDirectory* aa = a->mkdir("aa","Second Level Dira");
-   aa->cd();
    TH1D* haa = new TH1D("haa","haa",10,0,1);
-   
+   aa->Append(haa, true);
+
    a->ls();
 
    printf(" a: created@ %p  found@ %p\n", a,base->FindObjectAny("a"));
@@ -92,13 +92,13 @@ void testing(TObject *orig, TObject *found)
    }
 }
 
-int testFindObjectAny() 
-{ 
-   TDirectory* db = gROOT->mkdir("db","db"); 
-   TDirectory* a = db->mkdir("a","a"); 
-   TDirectory* aa = a->mkdir("aa","aa"); 
-   aa->cd(); 
-   TH1D* haa_new = new TH1D("haa","haa",10,0,1); 
+int testFindObjectAny()
+{
+   TDirectory* db = gROOT->mkdir("db","db");
+   TDirectory* a = db->mkdir("a","a");
+   TDirectory* aa = a->mkdir("aa","aa");
+   TH1D* haa_new = new TH1D("haa","haa",10,0,1);
+   aa->Append(haa_new, true);
    TH1D* haa_find = (TH1D*)db->FindObjectAny("haa");
 #ifdef ClingWorkAroundMissingDynamicScope
    TH1D* haa = haa_find;
@@ -108,15 +108,15 @@ int testFindObjectAny()
    } else if (haa_new != haa_find) {
       cout << "haa not found correctly!\n";
    }
-   
+
    TFile* base = new TFile("fdb.root","recreate");
 #ifdef ClingReinstateRedeclarationAllowed
    TDirectory* a = base->mkdir("a","First Level Dir");
 #else
    a = base->mkdir("a","First Level Dir");
 #endif
-   a->cd();
    TH1D* ha = new TH1D("ha","ha",10,0,1);
+   a->Append(ha, true);
 #ifdef ClingReinstateRedeclarationAllowed
    TDirectory* aa = a->mkdir("aa","Second Level Dira");
 #else
@@ -128,7 +128,8 @@ int testFindObjectAny()
 #else
    TH1D* haa = new TH1D("haa","haa",10,0,1);
 #endif
-   
+   aa->Append(haa, true);
+
    testing(   a, base->FindObjectAny("a"));
    testing(  ha, base->FindObjectAny("ha"));
    testing(  ha,    a->FindObjectAny("ha"));