Changeset 9041 for trunk/MagicSoft

Timestamp:

07/25/08 15:17:20 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mbase/MStatusDisplay.cc (modified) (1 diff)
• mfileio/MReadFiles.cc (modified) (1 diff)
• mfileio/MReadScanFile.cc (modified) (3 diffs)
• mfileio/MReadScanFile.h (modified) (1 diff)
• mfileio/MReadTree.cc (modified) (7 diffs)
• mhbase/MH3.cc (modified) (1 diff)
• mtools/MTFillMatrix.cc (modified) (4 diffs)
• mtools/MTFillMatrix.h (modified) (5 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2008/07/25 Thomas Bretz
+
+   * mbase/MStatusDisplay.cc:
+     - expand path name for csv files
+
+   * mfileio/MReadFiles.cc:
+     - print a warning if no file was added
+
+   * mfileio/MReadTree.cc:
+     - updated warning if no file was added
+     
+   * mfileio/MReadScanFile.[h,cc]:
+     - for safety add a postprocessing removing the contents
+       from the list
+     - also removing the contents from the list before filling
+
+   * mhbase/MH3.cc:
+     - fixed an output
+
+   * mtools/MTFillMatrix.[h,cc]:
+     - added a maximum number the eventloop is running over
+
+
+
  2008/07/23 Thomas Bretz
 
@@ -51 +75 @@
      - added a second InsertUpdate
      - added ExistRow
+
+   * datacenter/scripts/runcallisto:
+     - adapted to all other changes
+     - removed merpping of caco-files
 
 

trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc

@@ -2950 +2950 @@
         return kFALSE;
 
+    gSystem->ExpandPathName(name);
+
     ofstream fout(name);
     if (!fout)

trunk/MagicSoft/Mars/mfileio/MReadFiles.cc

@@ -260 +260 @@
         *fLog << inf2 << num << " files added to list." << endl;
 
+    if (num==0)
+        *fLog << warn << "WARNING - No files found at " << txt << endl;
+
     return num;
 }

trunk/MagicSoft/Mars/mfileio/MReadScanFile.cc

@@ -177 +177 @@
 Bool_t MReadScanFile::AnalyzeHeader(MParList &plist)
 {
+    fList.Clear("nodelete");
+
     fLength = -1;
     if (!ReadDelimiter())
@@ -191 +193 @@
     }
  */
+ 
     TObjArray *arr = line.Tokenize('*');
 
@@ -215 +218 @@
 }
 
+Int_t MReadScanFile::PostProcess()
+{
+    fList.Clear("nodelete");
+    return kTRUE;
+}
+
 UInt_t MReadScanFile::GetEntries()
 {

trunk/MagicSoft/Mars/mfileio/MReadScanFile.h

@@ -21 +21 @@
     Bool_t ReadHeader();
     Int_t  ReadEvent();
+    Int_t  PostProcess();
 
 public:

trunk/MagicSoft/Mars/mfileio/MReadTree.cc

@@ -295 +295 @@
 Bool_t MReadTree::Notify()
 {
+    cout << "--notify1--" << endl;
+
     //
     // Do a consistency check for all branches
@@ -300 +302 @@
     if (!CheckBranchSize())
         return kFALSE;
+
+    cout << "--notify2--" << endl;
 
     *fLog << inf << GetDescriptor() << ": Next file #" << GetFileIndex();
@@ -342 +346 @@
         }
 
+    cout << "--done--" << endl;
+
     return kTRUE;
 }
@@ -390 +396 @@
     }
     else
-        *fLog << warn << "WARNING: '" << newname << "' not added to " << GetDescriptor() << endl;
+        *fLog << warn << GetDescriptor() << ": WARNING - No files found at " << newname << endl;
 
     return numfiles;
@@ -994 +1000 @@
 
     if (fChain)
+    {
+//        cout << "LE: " << (int)fChain->GetLastError() << endl;
+
         switch (fChain->GetLastError())
         {
         case MChain::kFatalError:
             *fLog << err << GetDescriptor() << " - ERROR: Notify() failed." << endl;
-            return kERROR;
+            return kTRUE;
         case MChain::kCannotAccessFile:
             *fLog << err << GetDescriptor() << " - ERROR: TChain::LoadTree is unable to access requested file." << endl;
@@ -1010 +1019 @@
             return kTRUE;
         }
+    }
 
     return rc;
@@ -1180 +1190 @@
 // --------------------------------------------------------------------------
 //
-//  This schedules a TObject which Notify(9 function is called in case
+//  This schedules a TObject which Notify() function is called in case
 //  of MReadTree (TChain) switches from one file in the chain to another
 //  one.

trunk/MagicSoft/Mars/mhbase/MH3.cc

@@ -580 +580 @@
                 if (!binsx)
                 {
-                    *fLog << err << dbginf << "Neither '" << bx << "' nor '" << binsx << fName << "' found... aborting." << endl;
+                    *fLog << err << dbginf << "Neither '" << bx << "' nor '" << fName << "' found... aborting." << endl;
                     return kFALSE;
                 }

trunk/MagicSoft/Mars/mtools/MTFillMatrix.cc

@@ -76 +76 @@
 // fill.WriteMatrices("myfile.root");
 //
+//
+// Task List execution
+// ----------------------------------------------
+//
+// The tasklist is excuted in the follwowing order:
+//   - fReader      set by SetReader
+//   - fPreTasks    in the order as set with the SetPreTask functions
+//   - fPreCuts     in the order as set with the SetPreCut  functions
+//   - Selection    the event selection
+//   - fPostTasks   in the order as set with the SetPostTask functions
+//   - Fill Matrix
+//   - Write output
+//
 /////////////////////////////////////////////////////////////////////////////
 #include "MTFillMatrix.h"
@@ -163 +176 @@
 MTFillMatrix::MTFillMatrix(const char *name, const char *title)
 : fReference(0), fReader(0), fDestMatrix1(0), fDestMatrix2(0),
-  fNumDestEvents1(0), fNumDestEvents2(0), fWriteFile1(0), fWriteFile2(0)
+  fNumDestEvents1(0), fNumDestEvents2(0), fNumMaxEvents(0),
+  fWriteFile1(0), fWriteFile2(0)
 {
     Init(name, title);
@@ -180 +194 @@
 MTFillMatrix::MTFillMatrix(const MH3 *ref, const char *name, const char *title)
 : fReference(0), fReader(0), fDestMatrix1(0), fDestMatrix2(0),
-  fNumDestEvents1(0), fNumDestEvents2(0), fWriteFile1(0), fWriteFile2(0)
+  fNumDestEvents1(0), fNumDestEvents2(0), fNumMaxEvents(0),
+  fWriteFile1(0), fWriteFile2(0)
 {
     Init(name, title);
@@ -413 +428 @@
     evtloop.SetLogStream(fLog);
 
-    const Bool_t rc = evtloop.Eventloop();
+    const Bool_t rc = evtloop.Eventloop(fNumMaxEvents);
 
     if (selector)

trunk/MagicSoft/Mars/mtools/MTFillMatrix.h

@@ -27 +27 @@
     Int_t     fNumDestEvents2;
 
+    Int_t     fNumMaxEvents;
+
     MTask    *fWriteFile1;
     MTask    *fWriteFile2;
@@ -52 +54 @@
         fDestMatrix1 = matrix;
         if (num>0)
-            fNumDestEvents1 = num;
+            SetNumDestEvents1(num);
     }
     void SetWriteFile1(MTask *write, UInt_t num=0)
@@ -58 +60 @@
         fWriteFile1 = write;
         if (num>0)
-            fNumDestEvents1 = num;
-    }
-    void SetNumDestEvents1(UInt_t num)
-    {
-        fNumDestEvents1 = num;
+            SetNumDestEvents1(num);
     }
     void SetDestMatrix2(MHMatrix *matrix, UInt_t num=0)
@@ -68 +66 @@
         fDestMatrix2 = matrix;
         if (num>0)
-            fNumDestEvents2 = num;
+            SetNumDestEvents2(num);
     }
     void SetWriteFile2(MTask *write, UInt_t num=0)
@@ -74 +72 @@
         fWriteFile2 = write;
         if (num>0)
-            fNumDestEvents2 = num;
+            SetNumDestEvents2(num);
     }
-    void SetNumDestEvents2(UInt_t num)
-    {
-        fNumDestEvents2 = num;
-    }
+    void SetNumDestEvents1(UInt_t num) { fNumDestEvents1 = num; }
+    void SetNumDestEvents2(UInt_t num) { fNumDestEvents2 = num; }
+    void SetMaxEvents(UInt_t num)      { fNumMaxEvents = num; }
 
     void SetReader(MRead *task) { fReader = task; }