Changeset 6078 for trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

Timestamp:

01/28/05 11:18:44 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mjobs/MJCalibration.cc (modified) (6 diffs)

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -1346 +1346 @@
 const char* MJCalibration::GetOutputFile() const
 {
+    const TString name(GetOutputFileName());
+    if (name.IsNull())
+        return "";
+
+    return Form("%s/%s", fPathOut.Data(), name.Data());
+}
+
+const char* MJCalibration::GetOutputFileName() const
+{
     if (fSequence.IsValid())
-        return Form("%s/calib%08d.root", (const char*)fPathOut, fSequence.GetSequence());
+        return Form("calib%08d.root", fSequence.GetSequence());
     if (!fRuns)
         return "";
 
-    return Form("%s/%s-F1.root", (const char*)fPathOut, (const char*)fRuns->GetRunsAsFileName());
+    return Form("%s-F1.root", (const char*)fRuns->GetRunsAsFileName());
 }
 
@@ -1814 +1823 @@
     DisplayResult(plist);
 
-    if (!IsNoStorage())
-      if (!WriteResult(plist.FindObject("MGeomCam")))
+    if (!WriteResult(plist))
         return kFALSE;
 
-    if (IsHistsStorage())
-      {
-        if (!WriteHists(plist))
-          return kFALSE;
-      }
-    
     *fLog << all << GetDescriptor() << ": Done." << endl;
 
@@ -1909 +1911 @@
 }
 
+/*
 Bool_t MJCalibration::WriteEventloop(MEvtLoop &evtloop) const
 {
-
-  if (IsNoStorage())
-    return kTRUE;
+    if (IsNoStorage())
+        return kTRUE;
 
   if (fPathOut.IsNull())
@@ -1924 +1926 @@
   TFile file(oname, fOverwrite?"RECREATE":"NEW", "File created by MJCalibration", 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 kFALSE;
+  }
   
   return kTRUE;
 }
+*/
 
 Bool_t MJCalibration::WriteTasks(MTask *t1, MTask *t2) const
@@ -1943 +1946 @@
         return kTRUE;
 
-    if (fPathOut.IsNull())
-        return kTRUE;
-
-    const TString oname(GetOutputFile());
-
-    *fLog << inf << "Writing to file: " << oname << endl;
-
-    TFile file(oname, fOverwrite?"RECREATE":"NEW", "File created by MJCalibration", 9);
-    if (!file.IsOpen())
-    {
-        *fLog << err << "ERROR - Couldn't open file " << oname << " for writing..." << endl;
-        return kFALSE;
-    }
-
+    TObjArray cont;
     if (t1)
-    {
-        *fLog << inf << " - Writing Task " << t1->GetName() << " [" << t1->ClassName() << "]..." << flush;
-        if (t1->Write()<=0)
-        {
-            *fLog << err << "Unable to write " << t1->GetName() << " to " << oname << endl;
-            return kFALSE;
-        }
-        *fLog << "ok." << endl;
-    }
-
+        cont.Add(t1);
     if (t2)
-    {
-        *fLog << inf << " - Writing Task " << t2->GetName() << " [" << t2->ClassName() << "]..." << flush;
-        if (t2->Write()<=0)
-        {
-            *fLog << err << "Unable to write " << t2->GetName() << " to " << oname << endl;
-            return kFALSE;
-        }
-        *fLog << "ok." << endl;
-    }
-
-    return kTRUE;
+        cont.Add(t2);
+
+    return WriteContainer(cont, GetOutputFileName(), fOverwrite?"RECREATE":"NEW");
 }
 
@@ -1996 +1969 @@
 // - MCalibrationRelTimeCam or MCalibrationIntensityRelTimeCam     
 //
-Bool_t MJCalibration::WriteResult(TObject *geom)
+Bool_t MJCalibration::WriteResult(MParList &plist)
 {
-    if (fPathOut.IsNull())
-    {
-        *fLog << inf << "No output path specified via SetPathOut - no output written." << endl;
-        return kTRUE;
-    }
-
-    const TString oname(GetOutputFile());
-
-    *fLog << inf << "Writing to file: " << oname << endl;
-
-    TFile file(oname, "UPDATE", "File created by MJCalibration", 9);
-    if (!file.IsOpen())
-    {
-        *fLog << err << "ERROR - Couldn't open file " << oname << " for writing..." << endl;
-        return kFALSE;
-    }
-
     TObjArray cont;
-    if (fDisplay)
-        cont.Add(fDisplay);
-
-    if (IsIntensity())
-    {
-        cont.Add(&fIntensBadCam);
-        cont.Add(&fIntensCalibCam);
-        cont.Add(&fIntensQECam);
-        cont.Add(&fIntensBlindCam);
-    }
-    else
-    {
-        cont.Add(&fBadPixels);
-        cont.Add(&fCalibrationCam);
-        cont.Add(&fQECam);
-        cont.Add(&fCalibrationBlindCam);
-    }
-    cont.Add(&fCalibrationPINDiode);
-
-    //if (IsRelTimes())
-    cont.Add(IsIntensity() ? (TObject*)&fIntensRelTimeCam : (TObject*)&fRelTimeCam);
-
-    if (!geom)
-        *fLog << warn << " - WARNING - MGeomCam... not found!" << endl;
-    else
-        cont.Add(geom);
-
-    return WriteContainer(cont);
-}
-
-// --------------------------------------------------------------------------
-//
-// Write the calibration histograms into the output file GetOutputFile(), 
-// if fOutputPath exists.
-// 
-// The following containers are written:
-// - MHCalibrationChargeCam
-// - MHCalibrationChargeBlindCam
-// - MHCalibrationChargePINDiode
-// If the flag kRelTimes is set, then also:
-// - MHCalibrationRelTimeBlindCam
-//
-Bool_t MJCalibration::WriteHists(MParList &plist)
-{
-    if (fPathOut.IsNull())
-        return kTRUE;
-
-    const TString oname(GetOutputFile());
-
-    *fLog << inf << "Writing to file: " << oname << endl;
-
-    TFile file(oname, "UPDATE", "File created by MJCalibration", 9);
-    if (!file.IsOpen())
-    {
-        *fLog << err << "ERROR - Couldn't open file " << oname << " for writing..." << endl;
-        return kFALSE;
-    }
-
-    TObjArray cont;
-    cont.Add(plist.FindObject("MHCalibrationChargeCam"));
-    cont.Add(plist.FindObject("MHCalibrationChargeBlindCam"));
-    cont.Add(plist.FindObject("MHCalibrationChargePINDiode"));
-    if (IsRelTimes())
-        cont.Add(plist.FindObject("MHCalibrationRelTimeCam"));
-
-    return WriteContainer(cont);
+
+    if (!IsNoStorage())
+    {
+        if (IsIntensity())
+        {
+            cont.Add(&fIntensBadCam);
+            cont.Add(&fIntensCalibCam);
+            cont.Add(&fIntensQECam);
+            cont.Add(&fIntensBlindCam);
+        }
+        else
+        {
+            cont.Add(&fBadPixels);
+            cont.Add(&fCalibrationCam);
+            cont.Add(&fQECam);
+            cont.Add(&fCalibrationBlindCam);
+        }
+        cont.Add(&fCalibrationPINDiode);
+
+        //if (IsRelTimes())
+        cont.Add(IsIntensity() ? (TObject*)&fIntensRelTimeCam : (TObject*)&fRelTimeCam);
+
+        TObject *geom = plist.FindObject("MGeomCam");
+        if (!geom)
+            *fLog << warn << " - WARNING - MGeomCam... not found for writing!" << endl;
+        else
+            cont.Add(geom);
+    }
+
+    if (IsHistsStorage())
+    {
+        cont.Add(plist.FindObject("MHCalibrationChargeCam"));
+        cont.Add(plist.FindObject("MHCalibrationChargeBlindCam"));
+        cont.Add(plist.FindObject("MHCalibrationChargePINDiode"));
+        if (IsRelTimes())
+            cont.Add(plist.FindObject("MHCalibrationRelTimeCam"));
+    }
+
+    return WriteContainer(cont, GetOutputFileName(), "UPDATE");
 }