Changeset 9315 for trunk/MagicSoft/Mars

Timestamp:

02/11/09 12:08:23 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mfileio/MWriteRootFile.cc (modified) (8 diffs)
• mfilter/MFDeltaT.cc (modified) (1 diff)
• mhbase/MFillH.cc (modified) (1 diff)
• mhbase/MH.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mfileio/MWriteRootFile.cc

@@ -291 +291 @@
         // Delete the file. This'll also close the file (if open)
         //
+        *fLog << inf3 << "Closing file " << fOut->GetName() << "." << endl;
         delete fOut;
 
@@ -299 +300 @@
         // - Branches are automatically deleted by the tree destructor
         //
-        *fLog << inf << "Output File closed and object deleted." << endl;
     }
 
@@ -325 +325 @@
     *fLog << all << underline << "File: " << GetFileName() << dec << endl;
 
-    if (fTrees.GetEntries()==0)
-    {
-        *fLog << "  No contents." << endl;
-        return;
-    }
+    Bool_t cont = kFALSE;
 
     TObject *obj;
@@ -347 +343 @@
 
         *fLog << " + " << name.Strip(TString::kTrailing, '.') << ": \t" << (ULong_t)branch->GetEntries() << " entries." << endl;
+        cont = kTRUE;
     }
 
@@ -353 +350 @@
     while ((t=(TTree*)NextTree()))
         if (t->TestBit(kIsNewTree))
+        {
             *fLog << " + " << t->GetName() << ": \t" << (ULong_t)t->GetEntries() << " entries." << endl;
+            cont = kTRUE;
+        }
 
     TIter NextKey(fOut->GetList());
+    
     while ((obj=NextKey()))
     {
@@ -365 +366 @@
 
         *fLog << " - " << obj->GetName() << ": \t" << (ULong_t)((TTree*)obj)->GetEntries() << " entries." << endl;
-    }
+        cont = kTRUE;
+    }
+
+    if (!cont)
+        *fLog << "  No contents." << endl;
+
     *fLog << endl;
 }
@@ -822 +828 @@
 
     // Close/delete the old file (keys already written above)
+    *fLog << inf3 << "Closing file " << fOut->GetName() << "." << endl;
     delete fOut;
-
+ 
     // Replace current with new file
     fOut = newfile;
@@ -912 +919 @@
     *fLog << inf << out << flush;
 
-    TTree *clone=t.CloneTree();
-    clone->Write();
-    delete clone;
+    // When a new file has been opened the old clone (if existing) has
+    // been moved to the new file. We could now use CopyTree but then
+    // we would have to unpack all data and repack it. Instead
+    // we delete the moved old tree.
+    //  FIXME: In priciple we could delete a "wrong" tree with the same name.
+    //         Should we flag the clones and delete them in ChangeFile?
+    TObject *old = fOut->GetList()->Remove(fOut->GetList()->FindObject(t.GetName()));
+    delete old;
+
+    // Now we clone the tree without unpacking and repacking.
+    // When it has not been moved it will be deleted in the TFile destructor
+    /*TTree *clone =*/ t.CloneTree(-1, "fast");
+    //clone->Write();
+    //delete clone;
 
     *fLog << "done." << endl;

trunk/MagicSoft/Mars/mfilter/MFDeltaT.cc

@@ -119 +119 @@
     Int_t i=0;
 
-    if (GetNumExecutions()>0)
+    if (GetNumExecutions()>1)
     {
         if (*fTime-fLastTime>fUpperLimit)

trunk/MagicSoft/Mars/mhbase/MFillH.cc

@@ -566 +566 @@
 //        fCanvas->cd();
 
+    fH->SetNumExecutions(GetNumExecutions());
     const Int_t rc = fH->Fill(fParContainer, fWeight?fWeight->GetVal():1);
-    fH->SetNumExecutions(GetNumExecutions()+1);
 
 //    if (save && fCanvas)

trunk/MagicSoft/Mars/mhbase/MH.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MH.cc,v 1.44 2009-02-10 20:00:09 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MH.cc,v 1.45 2009-02-11 12:08:23 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -1508 +1508 @@
 void MH::PrintSkipped(UInt_t n, const char *str)
 {
-    *fLog << " " << setw(7) << n << " (";
-    *fLog << MString::Format("%5.1f", 100.*n/GetNumExecutions());
-    *fLog << "%) Evts skipped: " << str << endl;
+    *fLog << " " << setw(7) << n;
+    if (GetNumExecutions()>0)
+    {
+        *fLog << " (" << MString::Format("%5.1f", 100.*n/GetNumExecutions());
+        *fLog << "%)" << str << endl;
+    }
+    *fLog << " Evts skipped: " << str << endl;
 }