Changeset 852 for trunk/MagicSoft/Mars/mraw

Timestamp:

06/20/01 10:41:23 (24 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mraw

Files:

• MRawFileWrite.cc (modified) (9 diffs)
• MRawFileWrite.h (modified) (1 diff)

trunk/MagicSoft/Mars/mraw/MRawFileWrite.cc

@@ -53 +53 @@
 // Default constructor. It opens the output file (root-file)
 //
-MRawFileWrite::MRawFileWrite(const char *fname, Option_t *opt,
-                             const char *ftitle, Int_t comp,
+MRawFileWrite::MRawFileWrite(const char *fname,
+                             const Option_t *opt,
+                             const char *ftitle,
+                             const Int_t comp,
                              const char *name, const char *title)
 {
@@ -60 +62 @@
     *fTitle = title ? title : "Write task to write DAQ root files";
 
-    // FIXME: move file open to preproc!
-
     //
     // Open a rootfile
     //
     fOut = new TFile(fname, opt, ftitle, comp);
-
-    //
-    // test whether file is now open or not
-    //
-    if (!fOut->IsOpen())
-    {
-        *fLog << "MRawFileWrite::MRawFileWrite: ERROR: Cannot open file '";
-        *fLog << fname << "'" << endl;
-    }
-}
+}
+
+MRawFileWrite::~MRawFileWrite()
+{
+    //
+    // delete instance, this laso does a fOut->Close()
+    //
+    delete fOut;
+}
+
 
 // --------------------------------------------------------------------------
@@ -94 +94 @@
 {
     //
+    // test whether file is now open or not
+    //
+    if (!fOut->IsOpen())
+    {
+        *fLog << dbginf << "Cannot open file '" << fOut->GetName() << "'" << endl;
+        return kFALSE;
+    }
+
+    //
     // remember the pointer to the parameter list fur further usage
     //
@@ -105 +114 @@
     if (!fRawEvtHeader)
     {
-        *fLog << "MRawFileWrite::PreProcess - ERROR: MRawEvtHeader not found... aborting." << endl;
+        *fLog << dbginf << "MRawEvtHeader not found... aborting." << endl;
         return kFALSE;
     }
@@ -112 +121 @@
     if (!fRawEvtData)
     {
-        *fLog << "MRawFileWrite::PreProcess - ERROR: MRawEvtData not found... aborting." << endl;
+        *fLog << dbginf << "MRawEvtData not found... aborting." << endl;
         return kFALSE;
     }
@@ -119 +128 @@
     if (!fRawCrateArray)
     {
-        *fLog << "MRawFileWrite::PreProcess - ERROR: MRawCrateArray not found... aborting." << endl;
+        *fLog << dbginf << "MRawCrateArray not found... aborting." << endl;
         return kFALSE;
     }
@@ -126 +135 @@
     if (!fRawEvtTime)
     {
-        *fLog << "MRawFileWrite::PreProcess - WARNING: MRawEvtTime not found... aborting." << endl;
+        *fLog << dbginf << "MRawEvtTime not found... aborting." << endl;
         return kFALSE;
     }
@@ -133 +142 @@
     if (!fRawRunHeader)
     {
-        *fLog << "MRawFileWrite::PreProcess - ERROR: MRawRunHeader not found... aborting." << endl;
+        *fLog << dbginf << "MRawRunHeader not found... aborting." << endl;
         return kFALSE;
     }
@@ -222 +231 @@
     fOut->Write();
 
-    //
-    // close root file
-    //
-    fOut->Close();
-
-    //
-    // delete instance
-    //
-    delete fOut;
-
     return kTRUE;
 }

trunk/MagicSoft/Mars/mraw/MRawFileWrite.h

@@ -35 +35 @@
 public:
     MRawFileWrite(const char *fname,
-                  Option_t *opt="UPDATE",
+                  const Option_t *opt="UPDATE",
                   const char *ftitle="Unnamed",
-                  Int_t comp=9,
+                  const Int_t comp=9,
                   const char *name=NULL, const char *title=NULL);
+    ~MRawFileWrite();
 
     Bool_t PreProcess(MParList *pList);