Changeset 2765
- Timestamp:
- 01/09/04 22:57:10 (21 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r2764 r2765 5 5 -*-*- END OF LINE -*-*- 6 6 2004/01/09: Markus Gaug 7 8 * mcalib/MCalibrationCam.[h,cc] 9 - take out 1-dim histos because we can use 10 the projections in MHCamera (s.b.) 7 11 8 12 * mcalib/MHCalibrationBlindPixel.h -
trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.cc
r2760 r2765 239 239 for (UInt_t i=0;i<cam->GetNumPixels();i++) 240 240 { 241 241 242 MCalibrationPix &pix = (*fCalibrations)[i]; 242 243 pix.DefinePixId(i); 244 MHCalibrationPixel *hist = pix.GetHist(); 245 246 hist->SetTimeFitRangesHiGain(fSignals->GetFirstUsedSliceHiGain(), 247 fSignals->GetLastUsedSliceHiGain()); 248 hist->SetTimeFitRangesLoGain(fSignals->GetFirstUsedSliceLoGain(), 249 fSignals->GetLastUsedSliceLoGain()); 250 243 251 } 244 252 … … 453 461 MCalibrationPix &pix = (*fCalibrations)[pixid]; 454 462 463 // 464 // get the pedestals 465 // 455 466 const Float_t ped = (*fPedestals)[pixid].GetPedestal() * fNumHiGainSamples; 456 const Float_t prms = (*fPedestals)[pixid].GetPedestalRms() * TMath::Sqrt((float)fNumHiGainSamples); 457 467 const Float_t prms = (*fPedestals)[pixid].GetPedestalRms() * fSqrtHiGainSamples; 468 469 // 470 // set them in the calibration camera 471 // 458 472 pix.SetPedestal(ped,prms); 459 473 474 // 475 // perform the Gauss fits to the charges 476 // 460 477 pix.FitCharge(); 461 478 479 // 480 // Fill 1-dim histograms with the results 481 // 482 fCalibrations->Fill1DimCharges(pix.GetCharge(),pix.GetErrCharge(), 483 pix.GetSigmaCharge(),pix.GetChargeProb()); 484 485 // 486 // Perform the Gauss fits to the arrival times 487 // 462 488 if (TESTBIT(fFlags,kUseTimeFits)) 463 489 pix.FitTime(); -
trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc
r2734 r2765 83 83 fBlindPixel = new MCalibrationBlindPix(); 84 84 fPINDiode = new MCalibrationPINDiode(); 85 85 86 } 86 87 … … 337 338 break; 338 339 case 7: 339 val = (*this)[idx].GetTime ChiSquare();340 val = (*this)[idx].GetTimeProb(); 340 341 break; 341 342 case 8: -
trunk/MagicSoft/Mars/mcalib/MCalibrationCam.h
r2734 r2765 57 57 Float_t fMeanPhotErrOutsidePlexiglass; // The uncertainty about the number of photons in an INNER PIXEL 58 58 59 TH1F* fHChargeAllPixels; //! 60 TH1F* fHChargeErrAllPixels; //! 61 TH1F* fHChargeSigmaAllPixels; //! 62 TH1F* fHChargeProbAllPixels; //! 63 64 TH1F* fHTimeAllPixels; //! 65 TH1F* fHTimeSigmaAllPixels; //! 66 TH1F* fHTimeProbAllPixels; //! 67 68 TH1F* fHPedAllPixels; //! 69 TH1F* fHPedRMSAllPixels; //! 70 TH1F* fHSigmaPerChargeAllPixels; //! 71 TH1F* fHPhEAllPixels; //! 72 73 TH1F* fHConvPhEperFADCAllPixels; //! 74 TH1F* fHConvPhperFADCAllPixels; //! 75 76 TH1D* fOffsets; //! 77 TH1D* fSlopes; //! 59 TH1D* fOffsets; //! 60 TH1D* fSlopes; //! 78 61 79 TH2D* fOffvsSlope; 62 TH2D* fOffvsSlope; //! 80 63 81 64 public: … … 95 78 96 79 void InitSize(const Int_t i); 97 Int_t GetSize() const;80 Int_t GetSize() const; 98 81 99 UInt_t GetNumPixels() const { return fNumPixels; }82 UInt_t GetNumPixels() const { return fNumPixels; } 100 83 101 84 Bool_t IsPixelUsed(Int_t idx) const; … … 117 100 MCalibrationPINDiode *GetPINDiode() const { return fPINDiode; } 118 101 119 void SetColor(CalibrationColor_t color) { fColor = color; }102 void SetColor(CalibrationColor_t color) { fColor = color; } 120 103 121 104 Bool_t GetConversionFactorFFactor(Int_t ipx, Float_t &mean, Float_t &err, Float_t &sigma); -
trunk/MagicSoft/Mars/mcalib/MCalibrationPix.cc
r2759 r2765 389 389 { 390 390 391 if (fTime < fHist->GetTimeLowerFitRange()+1.) 391 Float_t lowerrange; 392 Float_t upperrange; 393 394 if (fHiGainSaturation) 395 { 396 lowerrange = (Float_t)fHist->GetTimeLowerFitRangeLoGain()+1.; 397 upperrange = (Float_t)fHist->GetTimeUpperFitRangeLoGain()+1.; 398 } 399 else 400 { 401 lowerrange = (Float_t)fHist->GetTimeLowerFitRangeHiGain()+1.; 402 upperrange = (Float_t)fHist->GetTimeUpperFitRangeHiGain()+1.; 403 } 404 405 406 if (fTime < lowerrange) 392 407 { 393 408 *fLog << warn 394 409 << "WARNING: Mean Fitted Time inside or smaller than first used FADC slice in Pixel " 395 << fPixId << endl;396 return kFALSE; 397 } 398 399 if (fTime < fHist->GetTimeUpperFitRange()-1.)410 << fPixId << " time: " << fTime << " Range: " << lowerrange << endl; 411 return kFALSE; 412 } 413 414 if (fTime > upperrange) 400 415 { 401 416 *fLog << warn 402 417 << "WARNING: Mean Fitted Time inside or greater than last used FADC slice in Pixel " 403 << fPixId << endl;418 << fPixId << " time: " << fTime << " Range: " << upperrange << endl; 404 419 return kFALSE; 405 420 } … … 484 499 fSigmaTime = fHist->GetTimeSigma(); 485 500 fTimeChiSquare = fHist->GetTimeChiSquare(); 501 fTimeProb = fHist->GetTimeProb(); 486 502 487 503 if (!CheckTimeFitValidity())
Note:
See TracChangeset
for help on using the changeset viewer.