Changeset 9410 for trunk/MagicSoft/Mars/mfileio

Timestamp:

03/23/09 13:14:46 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mfileio

Files:

• MWriteRootFile.cc (modified) (2 diffs)
• MWriteRootFile.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mfileio/MWriteRootFile.cc

@@ -458 +458 @@
 // completely from one file to another one you can use this
 //
-void MWriteRootFile::AddCopySource(const char *tname, const char *bname)
-{
-    fCopies.Add(new TNamed(tname, bname?bname:"*"));
+void MWriteRootFile::AddCopySource(const char *tname, const char *bname, Bool_t force)
+{
+    TObject *obj = new TNamed(tname, bname?bname:"*");
+    if (force)
+        obj->SetBit(kForced);
+
+    fCopies.Add(obj);
     fCopies.Sort();
 }
@@ -980 +984 @@
         if (!gettree)
         {
-            *fLog << err << "ERROR - MakeCopies: Tree " << o->GetName() << " not found in file " << fname << "... abort." << endl;
-            return kFALSE;
+            const Bool_t force = o->TestBit(kForced);
+            if (force)
+                *fLog << err << "ERROR - ";
+            else
+                *fLog << inf3;
+
+            *fLog << "MakeCopies: Tree " << o->GetName() << " not found in file " << fname << ".";
+            if (force)
+                *fLog << ".. abort.";
+            *fLog << endl;
+
+            if (force)
+                return kFALSE;
+
+            continue;
         }
 

trunk/MagicSoft/Mars/mfileio/MWriteRootFile.h

@@ -85 +85 @@
         kIsNotOwner = BIT(14), // MWriteRootFile is not owner of fOut
         kFillTree   = BIT(14),
+        kForced     = BIT(14), // Used for flag in fCopies
         // Be carefull these bits are already in use!
         // TBranch::kAutoDelete = BIT(15)
@@ -130 +131 @@
     void AddContainer(const char *cname,   const char *tname=NULL, Bool_t must=kTRUE);
     void AddContainer(MParContainer *cont, const char *tname=NULL, Bool_t must=kTRUE);
-    void AddCopySource(const char *tname, const char *bname=NULL);
+    void AddCopySource(const char *tname, const char *bname=NULL, Bool_t force=kTRUE);
+    void AddCopySource(const char *tname, Bool_t force)
+    {
+        AddCopySource(tname, NULL, force);
+    }
 
     void AddTree(const char *name, Bool_t force=kTRUE)