Changeset 6373 for trunk

Timestamp:

02/11/05 10:36:02 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (3 diffs)
• mfileio/MReadReports.cc (modified) (1 diff)
• mfileio/MWriteRootFile.cc (modified) (10 diffs)
• mfileio/MWriteRootFile.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -22 +22 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2005/02/11 Thomas Bretz
+
+  * mfileio/MWriteRootFile.[h,cc]:
+    - added the possibility to write to an already existing file.
+      This doesn't affect the old behaviour, but using this new feature
+      might still have problems.
+
+  * mfileio/MReadReports.cc: 
+    - fixed column-level in PrintStatistics
+
+
+
  2005/02/10 Abelardo Moralejo 
 
@@ -29 +41 @@
    * macros/starmc2.C
      - Added comment about value of cleaning levels
+
 
 
@@ -52 +65 @@
      - make sure that all variables are set correctly independent on 
        the order of their initialization by the user
+
 
 

trunk/MagicSoft/Mars/mfileio/MReadReports.cc

@@ -425 +425 @@
 {
     MRead::PrintStatistics(lvl, title, time);
-    fTrees->PrintStatistics(lvl, title, GetCpuTime());
-}
+    fTrees->PrintStatistics(lvl+1, title, GetCpuTime());
+}

trunk/MagicSoft/Mars/mfileio/MWriteRootFile.cc

@@ -97 +97 @@
     //
     //fTrees.SetOwner();
+
+    gROOT->GetListOfCleanups()->Add(this); // To remove fDisplay
+    SetBit(kMustCleanup);
 }
 
@@ -188 +191 @@
     // Open the rootfile
     //
-    fOut = new TFile(str, opt, ftitle, comp);
+    TObject *find = gROOT->FindObject(str);
+    if (find && find->InheritsFrom(TFile::Class()))
+    {
+        fOut = (TFile*)find;
+        fOut->SetBit(kMustCleanup);
+        SetBit(kIsNotOwner);
+
+        *fLog << inf << "File '" << fname << "' already open... using." << endl;
+        *fLog << "Make sure that you do NOT write to trees which are" << endl;
+        *fLog << "scheduled already by a different MWriteRootFile..." << endl;
+    }
+    else
+        fOut = new TFile(str, opt, ftitle, comp);
 }
 
@@ -203 +218 @@
     Print();
 
-    if (fOut)
+    if (fOut && !TestBit(kIsNotOwner))
     {
         //
@@ -216 +231 @@
         //
         delete fOut;
-        fOut = 0;
-    }
-
-    //
-    // Remark:
-    // - Trees are automatically deleted by the the file
-    //   (unless file.SetDirectory(0) was called)
-    // - Branches are automatically deleted by the tree destructor
-    //
-
-    *fLog << inf << "Output File closed and object deleted." << endl;
+
+        //
+        // Remark:
+        // - Trees are automatically deleted by the the file
+        //   (unless file.SetDirectory(0) was called)
+        // - Branches are automatically deleted by the tree destructor
+        //
+        *fLog << inf << "Output File closed and object deleted." << endl;
+    }
+
+    fOut = 0;
 }
 
@@ -244 +259 @@
 void MWriteRootFile::Print(Option_t *) const
 {
+    if (!fOut)
+        return;
+
     *fLog << all << underline << "File: " << GetFileName() << endl;
 
@@ -267 +285 @@
         name += branch->GetName();
 
-        *fLog << " " << name.Strip(TString::kTrailing, '.') << ": \t" << (ULong_t)branch->GetEntries() << " entries." << endl;
+        *fLog << " + " << name.Strip(TString::kTrailing, '.') << ": \t" << (ULong_t)branch->GetEntries() << " entries." << endl;
     }
 
@@ -274 +292 @@
     while ((t=(TTree*)NextTree()))
         if (t->TestBit(kIsNewTree))
-            *fLog << " " << t->GetName() << ": \t" << (ULong_t)t->GetEntries() << " entries." << endl;
+            *fLog << " + " << t->GetName() << ": \t" << (ULong_t)t->GetEntries() << " entries." << endl;
+
+    TIter NextKey(fOut->GetListOfKeys());
+    while ((obj=NextKey()))
+    {
+        if (!obj->InheritsFrom(TTree::Class()))
+            continue;
+
+        if (fTrees.FindObject(obj) && obj->TestBit(kIsNewTree))
+            continue;
+
+        *fLog << " - " << obj->GetName() << ": \t" << (ULong_t)((TTree*)t)->GetEntries() << " entries." << endl;
+    }
     *fLog << endl;
+
 }
 
@@ -662 +693 @@
 Bool_t MWriteRootFile::ChangeFile(const char *fname)
 {
+    if (!fOut)
+    {
+        TObject *find = gROOT->FindObject(fname);
+        if (find && find->InheritsFrom(TFile::Class()))
+        {
+            fOut = (TFile*)find;
+            SetBit(kIsNotOwner);
+            return kTRUE;
+        }
+
+        *fLog << err << "MWriteRootFile::ChangeFile: Expecting file '" << fname;
+        *fLog << "' in gROOT->FindObject... not found." << endl;
+        return kFALSE;
+    }
+
     //
     // The following code is more or less a copy of TTree::ChangeFile
@@ -879 +925 @@
 }
 
+void MWriteRootFile::RecursiveRemove(TObject *obj)
+{
+    if (obj==fOut && TestBit(kIsNotOwner))
+    {
+        ResetBit(kIsNotOwner);
+        fOut=0;
+    }
+}
+
 // --------------------------------------------------------------------------
 //
@@ -925 +980 @@
     }
 }
+

trunk/MagicSoft/Mars/mfileio/MWriteRootFile.h

@@ -82 +82 @@
 
     enum {
-        kFillTree  = BIT(14),
+        kIsNotOwner = BIT(14), // MWriteRootFile is not owner of fOut
+        kFillTree   = BIT(14),
         // Be carefull these bits are already in use!
         // TBranch::kAutoDelete = BIT(15)
         // TBranchElement::kDeleteObject = BIT(16)
-        kIsNewTree = BIT(17)
+        kIsNewTree  = BIT(17)
     };
 
@@ -130 +131 @@
     Bool_t cd(const char *path=0);
 
+    void RecursiveRemove(TObject *obj);
+
     ClassDef(MWriteRootFile, 1) // Task to write data into a root file
 };