Changeset 860 for trunk/MagicSoft/Mars/mraw

Timestamp:

07/09/01 16:13:19 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mraw

Files:

• MRawFileRead.cc (modified) (2 diffs)
• MRawFileRead.h (modified) (1 diff)
• MRawFileWrite.cc (modified) (4 diffs)
• MRawFileWrite.h (modified) (1 diff)

trunk/MagicSoft/Mars/mraw/MRawFileRead.cc

@@ -97 +97 @@
     // open the input stream
     //
+    fFileName = fname;
     fIn = new ifstream(fname);
-
-    if (!(*fIn))
-        *fLog << "Error: Trying to open file '" << fname << "'" << endl;
 }
 
@@ -131 +129 @@
 {
     //
-    // remember the pointer to the parameter list fur further usage
-    //
+    // first of all check if opening the file in the constructor was
+    // successfull
+    //
+    if (!(*fIn))
+    {
+        *fLog << "Error: Cannot open file '" << fFileName << "'" << endl;
+        return kFALSE;
+    }
 
     //

trunk/MagicSoft/Mars/mraw/MRawFileRead.h

@@ -24 +24 @@
     MTime          *fRawEvtTime;    // raw evt time information container to fill from file
 
+    TString         fFileName;
     ifstream       *fIn;            //! buffered input stream (file to read from)
 

trunk/MagicSoft/Mars/mraw/MRawFileWrite.cc

@@ -77 +77 @@
 {
     //
-    // delete instance, this laso does a fOut->Close()
-    //
+    // delete instance, this also does a fOut->Close()
+    //
+    if (fOut->IsOpen())
+        fOut->Write();
+
     delete fOut;
 }
@@ -104 +107 @@
     if (!fOut->IsOpen())
     {
-        *fLog << dbginf << "Cannot open file '" << fOut->GetName() << "'" << endl;
+        *fLog << dbginf << "Error: Cannot open file '" << fOut->GetName() << "'" << endl;
         return kFALSE;
     }
@@ -200 +203 @@
     //
     const UShort_t type = fRawEvtHeader->GetTrigType();
-
+    cout << "W" << flush;
     //
     // writa data to the tree. the tree is choosen by the type of the event
@@ -225 +228 @@
 }
 
-
-// --------------------------------------------------------------------------
-//
-// Close the TFile object and delete it.
-//
-Bool_t MRawFileWrite::PostProcess()
-{
-    //
-    // empty data stream
-    //
-    fOut->Write();
-
-    return kTRUE;
-}
-

trunk/MagicSoft/Mars/mraw/MRawFileWrite.h

@@ -43 +43 @@
     Bool_t PreProcess(MParList *pList);
     Bool_t Process();
-    Bool_t PostProcess();
 
     ClassDef(MRawFileWrite, 0)  // Task to write the raw data containers to a root file