Changeset 6245 for trunk

Timestamp:

02/03/05 17:01:39 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mfileio/MWriteRootFile.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -32 +32 @@
    * mhflux/MHAlpha.[h,cc]:
      - made time bins settable by user
+
+   * mfileio/MWriteRootFile.cc:
+     - fixed ReInit and a warning output when writing to memory
 
 
@@ -53 +56 @@
    * mcalib/MCalibrationTestCam.cc
      - initialize a missing array in InitAverageAreas
+
+
 
  2005/02/02 Markus Gaug

trunk/MagicSoft/Mars/mfileio/MWriteRootFile.cc

@@ -146 +146 @@
 // TFile.
 //
+// To create a memory based TTree use
+//   fname  = name of TTree
+//   option = "memory"
+// Make sure you do not read from a tree with the same name!
+//
 MWriteRootFile::MWriteRootFile(const char *fname,
                                const Option_t *option,
@@ -161 +166 @@
     // Check if we are writing to memory
     //
-    if (opt.Contains("memory"))
+    if (opt.Contains("memory", TString::kIgnoreCase))
     {
         fSplitRule = fname;
@@ -493 +498 @@
             branch->SetAddress(entry->GetAddress());
 
-            if (!fSplitRule.IsNull())
+            if (!fSplitRule.IsNull() && fOut)
             {
                 *fLog << warn << endl;
@@ -782 +787 @@
         while (1)
         {
-            TString sub = fname(idx+dest.Length());
+            //TString sub = fname(idx+dest.Length());
+            cout << "--------->" << fname << "<-----------" << endl;
             idx = regexp.Index(fname, &len);
             if (idx<0)
@@ -816 +822 @@
 Bool_t MWriteRootFile::ReInit(MParList *pList)
 {
-    if (fSplitRule.IsNull())
+    if (fSplitRule.IsNull() || !fOut)
         return MWriteFile::ReInit(pList);