Changeset 9410 for trunk

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• mbase/MStatusDisplay.cc (modified) (1 diff)
• mfileio/MWriteRootFile.cc (modified) (2 diffs)
• mfileio/MWriteRootFile.h (modified) (2 diffs)
• mhbase/MH.cc (modified) (2 diffs)
• mjobs/MJCalibrateSignal.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -22 +22 @@
    * resources/starguider01000534.txt:
      - added
+
+   * mbase/MStatusDisplay.cc:
+     - if no MStatusArray is found now all object are drawn
+
+   * mfileio/MWriteRootFile.[h,cc]:
+     - trees to be copied can now be made optional
+
+   * mhbase/MH.cc:
+     - included TProfile2D for newer root versions
 
 

trunk/MagicSoft/Mars/NEWS

@@ -2 +2 @@
 
 == <cvs> ==
+
+ ;showplot:
+
+   * If a file without a MStatusArray is opened all object (not just
+     canvases) found in the file are drawn. Note that this may result
+     in empty tabs.
 
  ;ganymed:

trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc

@@ -2322 +2322 @@
             gFile->GetObject(key->GetName(), c);
             if (!c)
-                break;
+            {
+                AddTab(key->GetName(), key->GetTitle());
+                TObject *obj = gFile->Get(key->GetName());
+                obj->SetBit(kCanDelete);
+                obj->Draw();
+                continue;
+            }
 
             if (list.GetEntries()==0)

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)

trunk/MagicSoft/Mars/mhbase/MH.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MH.cc,v 1.47 2009-03-01 21:48:14 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MH.cc,v 1.48 2009-03-23 13:13:42 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -70 +70 @@
 #include <THLimitsFinder.h>
 #endif
+#include <TProfile2D.h>  // root > 5.18
 
 #include "MLog.h"

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -760 +760 @@
     writemc.AddContainer("MMcEvtBasic", "OriginalMC", kFALSE);
     if (fSequence.IsMonteCarlo())
-        writemc.AddCopySource("OriginalMC");
+        writemc.AddCopySource("OriginalMC", kFALSE);
 
     // Write the special calib tree