- Timestamp:
- 02/17/05 10:34:53 (20 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/callisto.rc
r6508 r6563 127 127 # Use pin diode 128 128 #MJCalibration.UsePINDiode: No 129 # Use pixel check option 130 #MJCalibration.PixelCheck: 131 #MJCalibTest.PixelCheck: 129 132 130 133 # ------------------------------------------------------------------------- -
trunk/MagicSoft/Mars/mjobs/MJCalibTest.cc
r6281 r6563 283 283 { 284 284 285 286 285 if (!fSequence.IsValid()) 287 286 { … … 454 453 } 455 454 455 456 456 MCalibrateData photcalc; 457 photcalc.AddPedestal("Fundamental"); 458 photcalc.SetCalibrationMode(MCalibrateData::kFfactor); 459 photcalc.SetPedestalFlag(MCalibrateData::kEvent); 460 photcalc.SetSignalType(MCalibrateData::kPhe); 461 457 462 MCalibrateRelTimes caltimes; 458 if (IsUseMC()) // MC file459 {460 photcalc.SetCalibrationMode(MCalibrateData::kFfactor);461 photcalc.SetPedestalFlag(MCalibrateData::kRun);462 photcalc.AddPedestal("MPedestalCam", "MPedPhotFundamental");463 }464 else465 {466 photcalc.SetCalibrationMode(MCalibrateData::kFfactor);467 photcalc.AddPedestal("Fundamental");468 photcalc.SetPedestalFlag(MCalibrateData::kEvent);469 photcalc.SetSignalType(MCalibrateData::kPhe);470 }471 472 463 MBadPixelsCalc badcalc; 473 464 MBadPixelsTreat badtreat; … … 539 530 tlist.PrintStatistics(); 540 531 541 /* 542 MHCalibrationTestCam *hcam = (MHCalibrationTestCam*)plist.FindObject("MHCalibrationTestCam"); 543 MHCalibrationPix &pix1 = (*hcam)[47]; 544 pix1.DrawClone(""); 545 gPad->SaveAs("test_test_100.ps"); 546 547 MHCalibrationTestTimeCam *hccam = (MHCalibrationTestTimeCam*)plist.FindObject("MHCalibrationTestTimeCam"); 548 MHCalibrationPix &pix11 = (*hccam)[47]; 549 pix11.DrawClone(""); 550 gPad->SaveAs("test_testtime_100.ps"); 551 */ 532 if (fPixelCheck) 533 { 534 MHCalibrationTestCam *hcam = (MHCalibrationTestCam*)plist.FindObject("MHCalibrationTestCam"); 535 MHCalibrationPix &pix1 = (*hcam)[fCheckedPixId]; 536 pix1.DrawClone(""); 537 538 MHCalibrationTestTimeCam *hccam = (MHCalibrationTestTimeCam*)plist.FindObject("MHCalibrationTestTimeCam"); 539 MHCalibrationPix &pix11 = (*hccam)[fCheckedPixId]; 540 pix11.DrawClone(""); 541 } 552 542 553 543 DisplayResult(plist); -
trunk/MagicSoft/Mars/mjobs/MJCalibration.cc
r6314 r6563 1909 1909 tlist.PrintStatistics(); 1910 1910 1911 if (fPixelCheck) 1912 { 1913 MHCalibrationChargeCam *hcam = (MHCalibrationChargeCam*)plist.FindObject("MHCalibrationChargeCam"); 1914 MHCalibrationChargePix &pix1 = (MHCalibrationChargePix&)(*hcam)[fCheckedPixId]; 1915 pix1.DrawClone(""); 1916 1917 MHCalibrationChargePix &pix2 = (MHCalibrationChargePix&)(*hcam)(fCheckedPixId); 1918 pix2.DrawClone(""); 1919 1920 if (IsRelTimes()) 1921 { 1922 MHCalibrationRelTimeCam *hccam = (MHCalibrationRelTimeCam*)plist.FindObject("MHCalibrationRelTimeCam"); 1923 MHCalibrationPix &pix11 = (*hccam)[fCheckedPixId]; 1924 pix11.DrawClone(""); 1925 MHCalibrationPix &pix12 = (*hccam)(fCheckedPixId); 1926 pix12.DrawClone(""); 1927 } 1928 } 1929 1911 1930 if (!fCalibrationPINDiode.IsValid()) 1912 1931 SetUsePINDiode(kFALSE);
Note:
See TracChangeset
for help on using the changeset viewer.