Changeset 6216 for trunk/MagicSoft

Timestamp:

02/02/05 20:00:41 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJCalibTest.cc (modified) (6 diffs)
• MJCalibTest.h (modified) (4 diffs)

trunk/MagicSoft/Mars/mjobs/MJCalibTest.cc

@@ -51 +51 @@
 
 #include "MPedestalCam.h"
+#include "MPedPhotCam.h"
 #include "MBadPixelsCam.h"
 #include "MBadPixelsTreat.h"
@@ -212 +213 @@
 }
 
-
-const char* MJCalibTest::GetInputFile() const
+// --------------------------------------------------------------------------
+//
+// Retrieve the output file written by WriteResult()
+// 
+const char* MJCalibTest::GetOutputFile() const
+{
+    const TString name(GetOutputFileName());
+    if (name.IsNull())
+        return "";
+
+    return Form("%s/%s", fPathOut.Data(), name.Data());
+}
+
+
+const char* MJCalibTest::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());
-  
-}
-
-
-const char* MJCalibTest::GetOutputFile() const
-{
-
-  if (fSequence.IsValid())
-    return Form("%s/test%08d.root", (const char*)fPathOut, fSequence.GetSequence());
-  
-  if (!fRuns)
-    return "";
-  
-  return Form("%s/%s-Test.root", (const char*)fPathOut, (const char*)fRuns->GetRunsAsFileName());
+  return Form("%s-F1.root", (const char*)fRuns->GetRunsAsFileName());
   
 }
@@ -243 +243 @@
 {
 
-  const TString fname = GetInputFile();
+  const TString fname = GetOutputFile();
   
   *fLog << inf << "Reading from file: " << fname << endl;
@@ -385 +385 @@
 
   if (!ReadCalibration(calibcont, badpix, extractor1, extractor2, geom))
-    return kFALSE;
+    {
+      *fLog << err << "Could not read calibration constants " << endl;
+      return kFALSE;
+    }
   
   *fLog << all;
@@ -574 +577 @@
   
   /*
-    MHCalibrationTestCam *hcam = (MHCalibrationTestCam*)plist.FindObject("MHCalibrationTestCam");
-    MHCalibrationPix &pix1 = (*hcam)(100);
-    pix1.DrawClone("");
-    gPad->SaveAs("test_test_100.ps");
-
-    MHCalibrationTestTimeCam *hccam = (MHCalibrationTestTimeCam*)plist.FindObject("MHCalibrationTestTimeCam");
-    MHCalibrationPix &pix11 = (*hccam)(100);
-    pix11.DrawClone("");
-    gPad->SaveAs("test_testtime_100.ps");
+  MHCalibrationTestCam *hcam = (MHCalibrationTestCam*)plist.FindObject("MHCalibrationTestCam");
+  MHCalibrationPix &pix1 = (*hcam)[47];
+  pix1.DrawClone("");
+  gPad->SaveAs("test_test_100.ps");
+  
+  MHCalibrationTestTimeCam *hccam = (MHCalibrationTestTimeCam*)plist.FindObject("MHCalibrationTestTimeCam");
+  MHCalibrationPix &pix11 = (*hccam)[47];
+  pix11.DrawClone("");
+  gPad->SaveAs("test_testtime_100.ps");
   */
-    
 
   DisplayResult(plist);
@@ -614 +616 @@
     }
 
-    if (fPedPhotCam.Write()<=0)
-    {
-        *fLog << err << "Unable to write MPedPhotCam to " << oname << endl;
-        return kFALSE;
-    }
-
     if (fTestCam.Write()<=0)
     {

trunk/MagicSoft/Mars/mjobs/MJCalibTest.h

@@ -13 +13 @@
 #ifndef MARS_MHCalibrationTestTimeCam
 #include "MHCalibrationTestTimeCam.h"
-#endif
-#ifndef MARS_MPedPhotCam
-#include "MPedPhotCam.h"
 #endif
 #ifndef MARS_MBadPixelsCam
@@ -40 +37 @@
   MCalibrationTestCam      fTestCam;
   MHCalibrationTestTimeCam fTestTimeCam;
-  MPedPhotCam              fPedPhotCam;
 
   enum  Display_t                                      // Possible Display types
@@ -61 +57 @@
                          MExtractor* &ext1, MExtractor* &ext2, TString &geom) const;
 
+  const char* GetOutputFileName() const;
+
 public:
 
@@ -66 +64 @@
   
   const char* GetOutputFile() const;
-  const char* GetInputFile() const;
   
   MCalibrationTestCam      &GetTestCam()      { return fTestCam; }
   MHCalibrationTestTimeCam &GetTestTimeCam()  { return fTestTimeCam; }  
-  MPedPhotCam          &GetPedPhotCam() { return fPedPhotCam; }
   const MBadPixelsCam &GetBadPixels()  const { return fBadPixels; }