Changeset 6563 for trunk/MagicSoft

Timestamp:

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

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• callisto.rc (modified) (1 diff)
• mjobs/MJCalibTest.cc (modified) (3 diffs)
• mjobs/MJCalibration.cc (modified) (1 diff)

trunk/MagicSoft/Mars/callisto.rc

@@ -127 +127 @@
 # Use pin diode
 #MJCalibration.UsePINDiode: No
+# Use pixel check option
+#MJCalibration.PixelCheck: 
+#MJCalibTest.PixelCheck: 
 
 # -------------------------------------------------------------------------

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);

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -1909 +1909 @@
     tlist.PrintStatistics();
 
+  if (fPixelCheck)
+    {
+      MHCalibrationChargeCam *hcam = (MHCalibrationChargeCam*)plist.FindObject("MHCalibrationChargeCam");
+      MHCalibrationChargePix &pix1 = (MHCalibrationChargePix&)(*hcam)[fCheckedPixId];
+      pix1.DrawClone("");
+      
+      MHCalibrationChargePix &pix2 = (MHCalibrationChargePix&)(*hcam)(fCheckedPixId);
+      pix2.DrawClone("");
+      
+      if (IsRelTimes())
+        {
+          MHCalibrationRelTimeCam *hccam = (MHCalibrationRelTimeCam*)plist.FindObject("MHCalibrationRelTimeCam");
+          MHCalibrationPix &pix11 = (*hccam)[fCheckedPixId];
+          pix11.DrawClone("");
+          MHCalibrationPix &pix12 = (*hccam)(fCheckedPixId);
+          pix12.DrawClone("");
+        }
+    }
+
     if (!fCalibrationPINDiode.IsValid())
         SetUsePINDiode(kFALSE);