Changeset 5460
- Timestamp:
- 11/23/04 10:00:51 (20 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r5459 r5460 38 38 - stores the histogram RMS in MCalibrationPix in function 39 39 FitHiGainHists and FitLoGainHists 40 41 * mjobs/MJCalibration.cc 42 - display in the datacheck the RMS per Mean instead of the reduced 43 sigma per mean which is anyhow reflected by the number of photo- 44 electrons. 40 45 41 46 -
trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc
r5239 r5460 1193 1193 pix.SetHiGainMean ( hist.GetMean() ); 1194 1194 pix.SetHiGainMeanVar ( hist.GetMeanErr() * hist.GetMeanErr() ); 1195 pix.SetHiGainRms ( hist.GetHistRms() ); 1195 1196 pix.SetHiGainSigma ( hist.GetSigma() ); 1196 1197 pix.SetHiGainSigmaVar ( hist.GetSigmaErr()* hist.GetSigmaErr() ); … … 1275 1276 pix.SetLoGainMean ( hist.GetMean() ); 1276 1277 pix.SetLoGainMeanVar ( hist.GetMeanErr() * hist.GetMeanErr() ); 1278 pix.SetLoGainRms ( hist.GetHistRms() ); 1277 1279 pix.SetLoGainSigma ( hist.GetSigma() ); 1278 1280 pix.SetLoGainSigmaVar ( hist.GetSigmaErr() * hist.GetSigmaErr() ); -
trunk/MagicSoft/Mars/mhcalib/MHGausEvents.h
r5135 r5460 122 122 TH1I *GetHPowerProbability() { return fHPowerProbability; } 123 123 const TH1I *GetHPowerProbability() const { return fHPowerProbability; } 124 const Double_t GetHistRms() const { return fHGausHist.GetRMS(); } 124 125 const Double_t GetMean() const { return fMean; } 125 126 const Double_t GetMeanErr() const { return fMeanErr; } -
trunk/MagicSoft/Mars/mjobs/MJCalibration.cc
r5403 r5460 132 132 #include "MCalibrationChargeCalc.h" 133 133 #include "MCalibColorSet.h" 134 #include "MCalibrationRelTimeCam.h" 135 #include "MCalibrationRelTimeCalc.h" 134 136 135 137 #include "MHGausEvents.h" … … 139 141 #include "MHCalibrationChargePINDiode.h" 140 142 #include "MHCalibrationRelTimeCam.h" 141 #include "MCalibrationRelTimeCam.h"142 #include "MCalibrationRelTimeCalc.h"143 143 144 144 #include "MReadMarsFile.h" 145 #include "MPedCalcPedRun.h" 145 146 #include "MRawFileRead.h" 146 147 #include "MGeomApply.h" … … 341 342 MHCamera disp34(geomcam, "TimeOscillating", "Oscillating Pixels"); 342 343 MHCamera disp35(geomcam, "TotalConv", "Conversion Factor to photons"); 344 MHCamera disp36(geomcam, "RMSperMean", "Charge histogram RMS per Mean"); 343 345 344 346 MCalibrationChargeCam *cam = NULL; … … 425 427 disp29.SetCamContent(*cam, 27); 426 428 429 // RMS and Mean 430 disp36.SetCamContent(*cam,32); 431 427 432 disp1.SetYTitle("Q [FADC counts]"); 428 433 disp2.SetYTitle("\\sigma_{Q} [FADC counts]"); … … 463 468 464 469 disp35.SetYTitle("Conv.Factor [Ph/FADC counts]"); 470 471 disp36.SetYTitle("Charge RMS/<Q> [1]"); 465 472 466 473 for (UInt_t i=0;i<geomcam.GetNumPixels();i++) … … 569 576 570 577 // 571 // R EDUCED SIGMAS578 // RMS per Charge 572 579 // 573 580 … … 575 582 gPad->SetBorderMode(0); 576 583 gPad->SetTicks(); 577 MHCamera *obj3=(MHCamera*)disp 4.DrawCopy("hist");584 MHCamera *obj3=(MHCamera*)disp36.DrawCopy("hist"); 578 585 // 579 586 // for the datacheck, fix the ranges!! 580 587 // 581 obj3->SetMinimum(0.);588 // obj3->SetMinimum(0.); 582 589 // obj3->SetMaximum(fgChargeMax); 583 590 // … … 599 606 gPad->SetBorderMode(0); 600 607 if (geomcam.InheritsFrom("MGeomCamMagic")) 601 DisplayDoubleProject(&disp 4, "dead", "noisy");608 DisplayDoubleProject(&disp36, "dead", "noisy"); 602 609 603 610 // … … 1558 1565 plist.AddToList(&pedcam); 1559 1566 plist.AddToList(&fBadPixels); 1560 1567 1561 1568 // 1562 1569 // Calibration Results containers … … 1630 1637 calcalc.SetOutputPath(fPathOut); 1631 1638 calcalc.SetOutputFile(Form("%s-ChargeCalibStat.txt",(const char*)fRuns->GetRunsAsFileName())); 1639 timecalc.SetOutputPath(fPathOut); 1640 timecalc.SetOutputFile(Form("%s-ChargeCalibStat.txt",(const char*)fRuns->GetRunsAsFileName())); 1632 1641 } 1633 1642 … … 1668 1677 filltme.SetDrawOption(drawoption.Data()); 1669 1678 */ 1670 //1671 // Apply a filter against cosmics1672 // (will have to be needed in the future1673 // when the calibration hardware-trigger is working)1674 //1675 MFCosmics cosmics;1676 MContinue cont(&cosmics);1677 1678 1679 MTaskEnv taskenv("ExtractSignal"); 1679 1680 taskenv.SetDefault(fExtractor ? fExtractor : &extract2); … … 1681 1682 tlist.AddToList(&merge); 1682 1683 tlist.AddToList(&apply); 1684 1685 MPedCalcPedRun pedcalc; 1686 pedcalc.SetWindowSize(fExtractor 1687 ? (Int_t)TMath::Nint(fExtractor->GetNumHiGainSamples()) 1688 : (Int_t)TMath::Nint(extract2.GetNumHiGainSamples()) 1689 ); 1690 pedcalc.SetRange(fExtractor 1691 ? fExtractor->GetHiGainFirst() 1692 : extract2.GetHiGainFirst(), 1693 fExtractor 1694 ? fExtractor->GetHiGainLast() 1695 : extract2.GetHiGainLast() 1696 ); 1697 1698 if (IsIntensity()) 1699 tlist.AddToList(&pedcalc); 1700 1701 MCalibColorSet colorset; 1702 tlist.AddToList(&colorset); 1703 1683 1704 tlist.AddToList(&taskenv); 1684 1705 tlist.AddToList(&pinext); … … 1695 1716 1696 1717 // 1697 // FIXME: This is not yet implemented in the classes!!! 1698 // 1718 // Apply a filter against cosmics 1719 // (will have to be needed in the future 1720 // when the calibration hardware-trigger is working) 1721 // 1722 MFCosmics cosmics; 1723 MContinue cont(&cosmics); 1724 1699 1725 if (fColor == MCalibrationCam::kCT1) 1700 1726 tlist.AddToList(&cont); 1701 1702 MCalibColorSet colorset;1703 tlist.AddToList(&colorset);1704 1727 1705 1728 MCalibColorSteer steer;
Note:
See TracChangeset
for help on using the changeset viewer.