Changeset 8133 for trunk

Timestamp:

10/19/06 15:28:24 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mfileio/MReadTree.cc (modified) (2 diffs)
• mfileio/MWriteRootFile.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -46 +46 @@
    * msignal/MArrivalTimeCam.[h,cc]:
      - removed unused data members
+
+   * mfileio/MReadTree.cc:
+     - changed some output text
+
+   * mfileio/MWriteRootFile.cc:
+     - added a fix to allow paths containing a tilde
 
 

trunk/MagicSoft/Mars/mfileio/MReadTree.cc

@@ -341 +341 @@
     {
         *fLog << err << "MReadTree::AddFile - ERROR: You cannot add a file, because MReadTree" << endl;
-        *fLog <<        "                            handles a memory based tree or its default" << endl;
-        *fLog <<        "                            constructor was called." << endl;
+        *fLog <<        "  is supposed to read its tree from memory or its default or its" << endl;
+        *fLog <<        "  default constructor was called (no tree name was given)." << endl;
         return 0;
     }
@@ -703 +703 @@
     if (!fTaskList)
         *fLog << warn << "WARNING - Standard tasklist MTaskList not found... ignoring Stream-ID." << endl;
+
+    if (!fTree || !fChain)
+    {
+        *fLog << err << "ERROR - Something went terribly wrong!" << endl;
+        *fLog <<        "        Maybe you called the default constructor?" << endl;
+        *fLog <<        "        Did you forget to give a tree name in the constructor?" << endl;
+        return kFALSE;
+    }
 
     //

trunk/MagicSoft/Mars/mfileio/MWriteRootFile.cc

@@ -114 +114 @@
 {
     TFile *file = dynamic_cast<TFile*>(gROOT->GetListOfFiles()->FindObject(name));
+
+    // If the file was not found with its name try its expanded name
+    if (!file)
+    {
+        TString fqp(name);
+        gSystem->ExpandPathName(fqp);
+        file = dynamic_cast<TFile*>(gROOT->GetListOfFiles()->FindObject(fqp));
+    }
+
     if (!file)
     {
@@ -725 +734 @@
 // --------------------------------------------------------------------------
 //
-// Open a new file with the ame fname. Move all trees and branches from the
+// Open a new file with the name fname. Move all trees and branches from the
 // old file to the new file.
 //
@@ -741 +750 @@
         return kTRUE;
     }
-
     if (!newfile)
     {
         *fLog << err << "ERROR - Cannot open new file " << fname << endl;
          return kFALSE;
+    }
+
+    if (!fOut)
+    {
+        *fLog << err << "ERROR - MWriteRootFile::ChangeFile... something went terribly wrong!" << endl;
+        *fLog <<        "        Please start debugging!" << endl;
+        return kFALSE;
     }