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

Timestamp:

10/12/04 11:11:50 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -88 +88 @@
 // Default constructor. 
 //
-// Sets fRuns to 0, fExtractor to NULL, fDataCheck to kFALSE
+// Sets:
+// - fRuns to 0, 
+// - fExtractor to NULL, 
+// - fDataCheck to kFALSE, 
+// - fUseData to kFALSE
+// - fStorage to kNormalStorage
 //
 MJPedestal::MJPedestal(const char *name, const char *title) 
@@ -94 +99 @@
       fDataCheck(kFALSE), fUseData(kFALSE)
 {
-    fName  = name  ? name  : "MJPedestal";
-    fTitle = title ? title : "Tool to create a pedestal file (MPedestalCam)";
+
+  fName  = name  ? name  : "MJPedestal";
+  fTitle = title ? title : "Tool to create a pedestal file (MPedestalCam)";
+  
+  SetNormalStorage();
 }
 
@@ -109 +117 @@
 }
 
+//---------------------------------------------------------------------------------
+//
+// Try to read an existing MPedestalCam from a previously created output file. 
+// If found, also an MBadPixelsCam and the corresponding display is read.
+//
+// In case of Storage type "kNoStorage" or if the file is not found or the 
+// MPedestalCam cannot be read, return kFALSE, otherwise kTRUE.
+//
 Bool_t MJPedestal::ReadPedestalCam()
 {
-    const TString fname = GetOutputFile();
-
-    if (gSystem->AccessPathName(fname, kFileExists))
-    {
-        *fLog << warn << "Input file " << fname << " doesn't exist, will create it." << endl;
-        return kFALSE;
-    }
-
-    *fLog << inf << "Reading from file: " << fname << endl;
-
-    TFile file(fname, "READ");
-    if (fPedestalCam.Read()<=0)
-    {
-        *fLog << err << "Unable to read MPedestalCam from " << fname << endl;
-        return kFALSE;
-    }
-
-    if (file.FindKey("MBadPixelsCam"))
-    {
-        MBadPixelsCam bad;
+
+  if (IsNoStorage())
+    return kFALSE;
+  
+  const TString fname = GetOutputFile();
+  
+  if (gSystem->AccessPathName(fname, kFileExists))
+    {
+      *fLog << warn << "Input file " << fname << " doesn't exist, will create it." << endl;
+      return kFALSE;
+    }
+  
+  *fLog << inf << "Reading from file: " << fname << endl;
+  
+  TFile file(fname, "READ");
+  if (fPedestalCam.Read()<=0)
+    {
+      *fLog << err << "Unable to read MPedestalCam from " << fname << endl;
+      return kFALSE;
+    }
+  
+  if (file.FindKey("MBadPixelsCam"))
+    {
+      MBadPixelsCam bad;
         if (bad.Read()<=0)
-        {
+          {
             *fLog << err << "Unable to read MBadPixelsCam from " << fname << endl;
             return kFALSE;
-        }
+          }
         fBadPixels.Merge(bad);
     }
 
-    if (fDisplay && !fDisplay->GetCanvas("Pedestals"))
-        fDisplay->Read();
-
-    return kTRUE;
-}
-
+  if (fDisplay && !fDisplay->GetCanvas("Pedestals"))
+    fDisplay->Read();
+  
+  return kTRUE;
+}
+
+//---------------------------------------------------------------------------------
+//
+// Display the results. 
+// If Display type "kDataCheck" was chosen, also the reference lines are displayed.
+//
 void MJPedestal::DisplayResult(MParList &plist)
 {
@@ -480 +505 @@
 }
 
+//---------------------------------------------------------------------------------
+//
+// Try to write the created MPedestalCam in the output file. 
+// If possible, also an MBadPixelsCam and the corresponding display is written.
+//
+// In case of Storage type "kNoStorage" or if any of the containers
+// cannot be written, return kFALSE, otherwise kTRUE.
+//
 Bool_t MJPedestal::WriteResult()
 {
-    if (fPathOut.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())
-    {
-        *fLog << err << "ERROR - Couldn't open file " << oname << " for writing..." << endl;
-        return kFALSE;
-    }
-
-    if (fDisplay && fDisplay->Write()<=0)
-    {
-        *fLog << err << "Unable to write MStatusDisplay to " << oname << endl;
-        return kFALSE;
-    }
-
-    if (fPedestalCam.Write()<=0)
-    {
-        *fLog << err << "Unable to write MPedestalCam to " << oname << endl;
-        return kFALSE;
-    }
-
-    if (fBadPixels.Write()<=0)
-    {
-        *fLog << err << "Unable to write MBadPixelsCam to " << oname << endl;
-        return kFALSE;
-    }
-
+  
+  if (IsNoStorage())
     return kTRUE;
+
+  if (fPathOut.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())
+    {
+      *fLog << err << "ERROR - Couldn't open file " << oname << " for writing..." << endl;
+      return kFALSE;
+    }
+  
+  if (fDisplay && fDisplay->Write()<=0)
+    {
+      *fLog << err << "Unable to write MStatusDisplay to " << oname << endl;
+      return kFALSE;
+    }
+
+  if (fPedestalCam.Write()<=0)
+    {
+      *fLog << err << "Unable to write MPedestalCam to " << oname << endl;
+      return kFALSE;
+    }
+
+  if (fBadPixels.Write()<=0)
+    {
+      *fLog << err << "Unable to write MBadPixelsCam to " << oname << endl;
+      return kFALSE;
+    }
+
+  return kTRUE;
 }