Changeset 6456 for trunk/MagicSoft/Mars

Timestamp:

02/14/05 12:13:58 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mraw/MRawFileRead.cc (modified) (4 diffs)
• mraw/MRawFileRead.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -43 +43 @@
        too much by the start of data taking
      - fixed setting of mean time corresponding to rate-interval
+
+   * mraw/MRawFileRead.[h,cc]:
+     - calculate total number of events from all files in PreProcess
 
 

trunk/MagicSoft/Mars/mraw/MRawFileRead.cc

@@ -165 +165 @@
 // This opens the next file in the list and deletes its name from the list.
 //
-Int_t MRawFileRead::OpenNextFile()
+Int_t MRawFileRead::OpenNextFile(Bool_t print)
 {
     //
@@ -217 +217 @@
     }
 
+    if (!print)
+        return kTRUE;
+
     //
     // Print Run Header
@@ -271 +274 @@
     fNumEvents=0;
     return OpenNextFile()==kTRUE;
+}
+
+Bool_t MRawFileRead::CalcNumTotalEvents()
+{
+    fNumTotalEvents = 0;
+
+    Bool_t rc = kTRUE;
+
+    while (1)
+    {
+        switch (OpenNextFile(kFALSE))
+        {
+        case kFALSE:
+            break;
+        case kERROR:
+            rc = kFALSE;
+            break;
+        case kTRUE:
+            fNumTotalEvents += fRawRunHeader->GetNumEvents();
+            continue;
+        }
+        break;
+    }
+
+    if (fIn)
+        delete fIn;
+    fIn = NULL;
+
+    return rc;
 }
 
@@ -301 +333 @@
         return kFALSE;
 
-    //
-    // Now open next (first) file
-    //
-//      if (!Rewind())
-//          return kFALSE;
-
+    *fLog << inf << "Calculating number of total events..." << flush;
+    if (!CalcNumTotalEvents())
+        return kFALSE;
+    *fLog << inf << " " << fNumTotalEvents << " found." << endl;
 
     fNumFile=0;
-    fNumEvents=0; 
+    fNumEvents=0;
 
     return kTRUE;

trunk/MagicSoft/Mars/mraw/MRawFileRead.h

@@ -12 +12 @@
 {
 private:
-    TList     *fFileNames; // list of file names
-    UInt_t     fNumFile;   //! number of next file
-    UInt_t     fNumEvents; //! input stream (file to read from)
+    TList     *fFileNames;      // list of file names
+    UInt_t     fNumFile;        //! number of next file
+    UInt_t     fNumEvents;      //! input stream (file to read from)
+    UInt_t     fNumTotalEvents; //! total number of events in all files
 
-    ifstream  *fIn;        //! input stream (file to read from)
+    ifstream  *fIn;             //! input stream (file to read from)
 
-    MParList  *fParList;   //! tasklist to call ReInit from
+    MParList  *fParList;        //! tasklist to call ReInit from
 
     UInt_t     fInterleave;
 
-    Int_t OpenNextFile();
+    Int_t  OpenNextFile(Bool_t print=kTRUE);
+    Bool_t CalcNumTotalEvents();
 
     Int_t PreProcess(MParList *pList);
@@ -40 +42 @@
     Int_t  AddFile(const char *fname, Int_t entries=-1);
     Bool_t Rewind();
+    UInt_t GetEntries() { return fNumTotalEvents/fInterleave; }
 
     ClassDef(MRawFileRead, 0)   // Task to read the raw data binary file