Changeset 3336 for trunk/MagicSoft

Timestamp:

02/26/04 17:22:46 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (3 diffs)
• macros/dohtml.C (modified) (2 diffs)
• macros/rootlogon.C (modified) (2 diffs)
• merpp.cc (modified) (2 diffs)
• mfileio/MWriteAsciiFile.cc (modified) (2 diffs)
• mfileio/MWriteAsciiFile.h (modified) (1 diff)
• mfileio/MWriteFile.cc (modified) (4 diffs)
• mfileio/MWriteFile.h (modified) (1 diff)
• mfileio/MWriteRootFile.cc (modified) (4 diffs)
• mfileio/MWriteRootFile.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -9 +9 @@
    * macros/dohtml.C
      - included the path msignals/
+
 
 
@@ -25 +26 @@
 
 
+
  2004/02/26: Thomas Bretz
 
@@ -84 +86 @@
    * mfbase/Makefile, mfbase/FBaseLinkDef.h, mfbase/FBaseIncl.h:
      - added
+
+   * merpp.cc:
+     - implemented control of gDebug (root debugging)
+
+   * mfileio/MWriteAsciiFile.[h,cc], mfileio/MWriteFile.[h,cc],
+     mfileio/MWriteRootFile.[h,cc]:
+     - implemented CheckAndWrite return value
+
+   * mfileio/MWriteRootFile.cc:
+     - fixed updating already existing branches (eg concatenating report
+       files)
 
 

trunk/MagicSoft/Mars/macros/dohtml.C

@@ -42 +42 @@
     TString sourcedir;
     sourcedir += "manalysis:";
+    sourcedir += "mastro:";
     sourcedir += "mbase:";
     sourcedir += "mcamera:";
     sourcedir += "mcalib:";
     sourcedir += "mdata:";
+    sourcedir += "mfbase:";
     sourcedir += "mfileio:";
     sourcedir += "mfilter:";
@@ -99 +101 @@
     html.Convert("pedphotcalc.C",   "MARS - Example to use MPedPhotCalc");
 }
-
-
-

trunk/MagicSoft/Mars/macros/rootlogon.C

@@ -99 +99 @@
     gInterpreter->AddIncludePath(dir+"macros");
     gInterpreter->AddIncludePath(dir+"manalysis");
-    gInterpreter->AddIncludePath(dir+"msignal");
+    gInterpreter->AddIncludePath(dir+"mastro");
     gInterpreter->AddIncludePath(dir+"mbase");
     gInterpreter->AddIncludePath(dir+"mcamera");
     gInterpreter->AddIncludePath(dir+"mcalib");
     gInterpreter->AddIncludePath(dir+"mdata");
+    gInterpreter->AddIncludePath(dir+"mfbase");
     gInterpreter->AddIncludePath(dir+"mfileio");
     gInterpreter->AddIncludePath(dir+"mfilter");
@@ -120 +121 @@
     gInterpreter->AddIncludePath(dir+"mreflector");
     gInterpreter->AddIncludePath(dir+"mreport");
+    gInterpreter->AddIncludePath(dir+"msignal");
     gInterpreter->AddIncludePath(dir+"mtools");
 

trunk/MagicSoft/Mars/merpp.cc

@@ -67 +67 @@
     gLog << "     inputfile.txt:  Magic DC currents file." << endl;
     gLog << "     ouputfile.root: Merpped root file." << endl;
-    gLog << "     -c#:                             Compression level #=1..9 [default=2]" << endl;
-    gLog << "     -v#:                             Verbosity level # [default=2]" << endl;
-    gLog << "     -u, --update:                    Update file" << endl;
-    gLog << "     -a, --no-colors:                 Do not use Ansii color codes" << endl;
+    gLog << "     -c#                              Compression level #=1..9 [default=2]" << endl;
+    gLog << "     -v#                              Verbosity level # [default=2]" << endl;
+    gLog << "     -u, --update                     Update file" << endl;
+    gLog << "     -a, --no-colors                  Do not use Ansii color codes" << endl;
     gLog << "     --sql=mysql://user:password@url  Insert run into database <raw data only>" << endl;
-    gLog << "     --start=yyyy-mm-dd/hh:mm:ss.mmm: Start event time for merpping report files" << endl;
-    gLog << "     --stop=yyyy-mm-dd/hh:mm:ss.mmm:  Stop  event time for merpping report files" << endl;
-    gLog << "     --run=#:                         Only data corresponding to this run number" << endl;
-    gLog << "     -?, -h, --help:                  This help" << endl << endl;
+    gLog << "     --start=yyyy-mm-dd/hh:mm:ss.mmm  Start event time for merpping report files" << endl;
+    gLog << "     --stop=yyyy-mm-dd/hh:mm:ss.mmm   Stop  event time for merpping report files" << endl;
+    gLog << "     --run=#                          Only data corresponding to this run number" << endl;
+    gLog << "     --debug[=n]                      Enable root debugging (Default: gDebug=1)" << endl;
+    gLog << "     -?, -h, --help                   This help" << endl << endl;
     gLog << "   REMARK: At the moment you can process a .raw _or_ a .rep file, only!" << endl << endl;
 }
@@ -114 +115 @@
 
     gLog.SetDebugLevel(arg.HasOption("-v") ? arg.GetIntAndRemove("-v") : 2);
+
+    gDebug = arg.HasOption("--debug=") ? arg.GetIntAndRemove("--debug=") : 0;
+    if (gDebug==0 && arg.HasOnlyAndRemove("--debug"))
+        gDebug=1;
 
     MTime kTimeStart(AnalyseTime(arg.GetStringAndRemove("--start=")));

trunk/MagicSoft/Mars/mfileio/MWriteAsciiFile.cc

@@ -188 +188 @@
 // a warning message is print.
 //
-void MWriteAsciiFile::CheckAndWrite() const
+Bool_t MWriteAsciiFile::CheckAndWrite() const
 {
     Bool_t written = kFALSE;
@@ -219 +219 @@
     }
 
-    if (!written)
-        return;
-
-    *fOut << endl;
-
-    if (num!=0)
-        *fLog << warn << "Warning - given number of objects doesn't fit number of written objects." << endl;
+    if (written)
+    {
+        *fOut << endl;
+
+        if (num!=0)
+            *fLog << warn << "Warning - given number of objects doesn't fit number of written objects." << endl;
+    }
+    return kTRUE;
 }
 

trunk/MagicSoft/Mars/mfileio/MWriteAsciiFile.h

@@ -21 +21 @@
     TObjArray fAutoDel; //! List of object to be deleted in the destructor
 
-    virtual void   CheckAndWrite() const;
+    virtual Bool_t CheckAndWrite() const;
     virtual Bool_t IsFileOpen() const;
     virtual Bool_t GetContainer(MParList *pList);

trunk/MagicSoft/Mars/mfileio/MWriteFile.cc

@@ -78 +78 @@
     // write the container if it is already in changed state
     //
-    CheckAndWrite();
-
-    return kTRUE;
+    return CheckAndWrite();
 }
 
@@ -90 +88 @@
 Bool_t MWriteFile::ReInit(MParList *pList)
 {
-    CheckAndWrite();
-    return kTRUE;
+    return CheckAndWrite();
 }
 
@@ -101 +98 @@
 Int_t MWriteFile::Process()
 {
-    CheckAndWrite();
-    return kTRUE;
+    return CheckAndWrite();
 }
 
@@ -115 +111 @@
     // check if the container changed state is set
     //
-    CheckAndWrite();
-    return kTRUE;
+    return CheckAndWrite();
 }

trunk/MagicSoft/Mars/mfileio/MWriteFile.h

@@ -15 +15 @@
 
     virtual Bool_t      IsFileOpen() const = 0;
-    virtual void        CheckAndWrite() const = 0;
+    virtual Bool_t      CheckAndWrite() const = 0;
     virtual Bool_t      GetContainer(MParList *pList) = 0;
     virtual const char *GetFileName() const = 0;

trunk/MagicSoft/Mars/mfileio/MWriteRootFile.cc

@@ -338 +338 @@
         entry->SetTree(tree);
 
+        TString branchname(cname);
+        branchname.Append(".");
+
         //
         // Try to get the branch from the file. 
         // If the branch already exists the user specified one branch twice.
         //
-        TBranch *branch = tree->GetBranch(cname);
+        TBranch *branch = tree->GetBranch(branchname);
         if (branch)
         {
-            *fLog << err << "Branch '" << cname << "' already existing." << endl;
-            return kFALSE;
-        }
-
-        //
-        // Create a new branch in the actual tree. The branch has the name
-        // container name. The type of the container is given by the
-        // ClassName entry in the container. The Address is the address of a
-        // pointer to the container (gotten from the branch entry). As
-        // Basket size we specify a (more or less) common default value.
-        // The containers should be written in Splitlevel=1
-        //
-        *fLog << inf << "Creating Branch " << cname << " of " << cont->ClassName() << "... " << flush;
-
-        TString branchname(cname);
-        branchname.Append(".");
-        branch = tree->Branch(branchname, cont->ClassName(), entry->GetAddress());
-
-        //
-        // If the branch couldn't be created we have a problem.
-        //
-        if (!branch)
-        {
-            *fLog << endl;
-            *fLog << err << "Unable to create branch '" << cname << "'." << endl;
-            return kFALSE;
-        }
-
-        *fLog << "done." << endl;
+            *fLog << inf << "Branch '" << cname << "' already existing... updating." << endl;
+            branch->SetAddress(entry->GetAddress());
+        }
+        else
+        {
+            //
+            // Create a new branch in the actual tree. The branch has the name
+            // container name. The type of the container is given by the
+            // ClassName entry in the container. The Address is the address of a
+            // pointer to the container (gotten from the branch entry). As
+            // Basket size we specify a (more or less) common default value.
+            // The containers should be written in Splitlevel=1
+            //
+            *fLog << inf << "Creating Branch " << cname << " of " << cont->ClassName();
+            *fLog << " in tree " << tree->GetName() << "... " << flush;
+
+            branch = tree->Branch(branchname, cont->ClassName(), entry->GetAddress());
+            //
+            // If the branch couldn't be created we have a problem.
+            //
+            if (!branch)
+            {
+                *fLog << endl;
+                *fLog << err << "Unable to create branch '" << cname << "'." << endl;
+                return kFALSE;
+            }
+
+            *fLog << "done." << endl;
+        }
 
         //
@@ -398 +401 @@
 // has the write flag, all containers in this tree are filled!
 //
-void MWriteRootFile::CheckAndWrite() const
+Bool_t MWriteRootFile::CheckAndWrite() const
 {
     TObject *obj;
@@ -423 +426 @@
             b->GetTree()->SetBit(kFillTree);
         else
-            b->GetBranch()->Fill();
+        {
+            if (!b->GetBranch()->Fill())
+            {
+                *fLog << err << "ERROR - Zero bytes written to branch '" << b->GetBranch()->GetName() << "'... abort." << endl;
+                return kFALSE;
+            }
+        }
     }
 
@@ -445 +454 @@
         // of written/filled entries.
         //
-        t->Fill();
         t->ResetBit(kFillTree);
-    }
+        if (!t->Fill())
+        {
+            *fLog << err << "ERROR - Zero bytes written to tree '" << t->GetName() << "'... abort." << endl;
+            return kFALSE;
+        }
+    }
+    return kTRUE;
 }
 

trunk/MagicSoft/Mars/mfileio/MWriteRootFile.h

@@ -75 +75 @@
     //UInt_t fNumEvents; //! Number of events written in a run
 
-    void        CheckAndWrite() const;
+    Bool_t      CheckAndWrite() const;
     Bool_t      IsFileOpen() const;
     Bool_t      GetContainer(MParList *pList);