Changeset 2972
- Timestamp:
- 01/30/04 10:19:25 (21 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r2971 r2972 21 21 - fill Blind Pixel with information about its fitted pedestal if 22 22 available 23 - initialize charges histogram with a bigger range 24 - use pedestal information to constrain the pedestal fit ranges 23 25 24 26 -
trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.cc
r2956 r2972 114 114 using namespace std; 115 115 116 const Int_t MCalibrationCalc::fBlindPixelId = 559; 117 const Int_t MCalibrationCalc::fPINDiodeId = 9999; 118 116 119 // -------------------------------------------------------------------------- 117 120 // … … 121 124 : fPedestals(NULL), fCalibrations(NULL), fSignals(NULL), 122 125 fRawEvt(NULL), fRunHeader(NULL), fArrivalTime(NULL), fEvtTime(NULL) 123 // fBlindPixelId(559), fPINDiodeId(9999)124 126 { 125 127 … … 461 463 { 462 464 463 case kBlindPixelId:465 case fBlindPixelId: 464 466 465 467 if (!blindpixel.FillCharge(sumhi)) … … 479 481 break; 480 482 481 case kPINDiodeId:483 case fPINDiodeId: 482 484 483 485 if (!pindiode.FillCharge(sumhi)) … … 583 585 *fLog << inf << GetDescriptor() << ": Fitting the Blind Pixel" << endl; 584 586 587 // 588 // retrieve mean and sigma of the blind pixel pedestal, 589 // so that we can use it for the fit 590 // 591 if (fPedestals->IsUseHists()) 592 { 593 // 594 // retrieve the pedestal pix of the blind pixel 595 // 596 MPedestalPix &ped = (*fPedestals)[fBlindPixelId]; 597 // 598 // retrieve the blind pixel histogram container 599 // 600 MHCalibrationBlindPixel *hist = blindpixel.GetHist(); 601 // 602 // Set the corresponding values 603 // 604 const Float_t peddiff = ped.GetMean() 605 - ped.GetPedestal()*fSignals->GetNumUsedFADCSlices(); 606 const Float_t pederr = ped.GetMeanErr(); 607 const Float_t pedsigma = ped.GetSigma(); 608 const Float_t pedsigmaerr = ped.GetSigmaErr(); 609 610 hist->SetMeanPedestal(peddiff); 611 hist->SetMeanPedestalErr(pederr); 612 hist->SetSigmaPedestal(pedsigma); 613 hist->SetSigmaPedestalErr(pedsigmaerr); 614 } 615 585 616 if (!blindpixel.FitCharge()) 586 617 { -
trunk/MagicSoft/Mars/mcalib/MHCalibrationBlindPixel.h
r2931 r2972 64 64 Double_t fLambdaCheckErr; 65 65 66 Double_t fMeanPedestal; 67 Double_t fMeanPedestalErr; 68 Double_t fSigmaPedestal; 69 Double_t fSigmaPedestalErr; 70 66 71 public: 67 72 … … 76 81 Bool_t FillBlindPixelChargevsN(Stat_t rq, Int_t t); 77 82 78 79 //Getters 83 // Setters 84 void SetMeanPedestal(const Float_t f) { fMeanPedestal = f; } 85 void SetMeanPedestalErr(const Float_t f) { fMeanPedestalErr = f; } 86 void SetSigmaPedestal(const Float_t f) { fSigmaPedestal = f; } 87 void SetSigmaPedestalErr(const Float_t f) { fSigmaPedestalErr = f; } 88 89 // Getters 80 90 const Double_t GetLambda() const { return fLambda; } 81 91 const Double_t GetLambdaCheck() const { return fLambdaCheck; } … … 224 234 Double_t arg = 0.; 225 235 226 // Double_t mu0 = 0.;227 236 Double_t mu0 = par[1]; 228 237 Double_t mu1 = par[2];
Note:
See TracChangeset
for help on using the changeset viewer.