Changeset 4723 for trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

Timestamp:

08/24/04 18:15:29 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mjobs/MJPedestal.cc (modified) (7 diffs)

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -440 +440 @@
 
 }
-
-
-Bool_t MJPedestal::WriteResult()
+/*
+Bool_t MJPedestal::WriteEventloop(MEvtLoop &evtloop) const
 {
     if (fOutputPath.IsNull())
@@ -452 +451 @@
 
     TFile file(oname, fOverwrite?"RECREATE":"NEW", "File created by MJPedestal", 9);
+    if (!file.IsOpen())
+    {
+        *fLog << err << "ERROR - Couldn't open file " << oname << " for writing..." << endl;
+        return kFALSE;
+    }
+
+    if (evtloop.Write(fName)<=0)
+    {
+        *fLog << err << "Unable to write MEvtloop to " << oname << endl;
+        return kFALSE;
+    }
+
+    return kTRUE;
+}
+*/
+Bool_t MJPedestal::WriteResult()
+{
+    if (fOutputPath.IsNull())
+        return kTRUE;
+
+    const TString oname(GetOutputFile());
+
+    *fLog << inf << "Writing to file: " << oname << endl;
+
+    TFile file(oname, "UPDATE", "File created by MJPedestal", 9);
     if (!file.IsOpen())
     {
@@ -527 +551 @@
         return;
 
-    TString e1 = fEnv->GetValue("MJPedestal.OutputPath", "");
+    TString e1 = fEnv->GetValue(Form("%s.OutputPath", fName.Data()), "");
     if (!e1.IsNull())
     {
@@ -534 +558 @@
     }
 
-    SetMaxEvents(fEnv->GetValue("MJPedestal.MaxEvents", fMaxEvents));
-    SetOverwrite(fEnv->GetValue("MJPedestal.AllowOverwrite", fOverwrite));
-
-    fUseData = fEnv->GetValue("MJPedestal.UseData", fUseData);
+    SetMaxEvents(fEnv->GetValue(Form("%s.MaxEvents", fName.Data()), fMaxEvents));
+    SetOverwrite(fEnv->GetValue(Form("%s.AllowOverwrite", fName.Data()), fOverwrite));
+
+    fUseData = fEnv->GetValue(Form("%s.UseData", fName.Data()), fUseData);
 }
 
@@ -570 +594 @@
     MTaskList tlist;
     plist.AddToList(&tlist);
+    plist.AddToList(this); // take care of fDisplay!
 
     MReadMarsFile read("Events");
@@ -640 +665 @@
         evtloop.ReadEnv(*fEnv);
 
+    //    if (!WriteEventloop(evtloop))
+    //        return kFALSE;
+
     // Execute first analysis
     if (!evtloop.Eventloop(fMaxEvents))
@@ -654 +682 @@
         return kFALSE;
 
-    *fLog << inf << GetDescriptor() << ": Done." << endl;
+    *fLog << all << GetDescriptor() << ": Done." << endl;
 
     return kTRUE;