Changeset 6563 for trunk/MagicSoft/Mars/mjobs/MJCalibTest.cc

Timestamp:

02/17/05 10:34:53 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mjobs/MJCalibTest.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mjobs/MJCalibTest.cc

@@ -283 +283 @@
 {
   
-
   if (!fSequence.IsValid())
     {
@@ -454 +453 @@
     }
 
+
   MCalibrateData        photcalc;
+  photcalc.AddPedestal("Fundamental");
+  photcalc.SetCalibrationMode(MCalibrateData::kFfactor);
+  photcalc.SetPedestalFlag(MCalibrateData::kEvent);
+  photcalc.SetSignalType(MCalibrateData::kPhe);
+
   MCalibrateRelTimes    caltimes;
-  if (IsUseMC()) // MC file
-    {
-      photcalc.SetCalibrationMode(MCalibrateData::kFfactor);
-      photcalc.SetPedestalFlag(MCalibrateData::kRun);
-      photcalc.AddPedestal("MPedestalCam", "MPedPhotFundamental");
-    }
-  else
-    {
-      photcalc.SetCalibrationMode(MCalibrateData::kFfactor);
-      photcalc.AddPedestal("Fundamental");
-      photcalc.SetPedestalFlag(MCalibrateData::kEvent);
-      photcalc.SetSignalType(MCalibrateData::kPhe);
-    }
-
   MBadPixelsCalc        badcalc;
   MBadPixelsTreat       badtreat;
@@ -539 +530 @@
   tlist.PrintStatistics();
   
-  /*
-  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");
-  */
+  if (fPixelCheck)
+    {
+      MHCalibrationTestCam *hcam = (MHCalibrationTestCam*)plist.FindObject("MHCalibrationTestCam");
+      MHCalibrationPix &pix1 = (*hcam)[fCheckedPixId];
+      pix1.DrawClone("");
+      
+      MHCalibrationTestTimeCam *hccam = (MHCalibrationTestTimeCam*)plist.FindObject("MHCalibrationTestTimeCam");
+      MHCalibrationPix &pix11 = (*hccam)[fCheckedPixId];
+      pix11.DrawClone("");
+    }
 
   DisplayResult(plist);