Changeset 8365
- Timestamp:
- 03/04/07 14:46:44 (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc
r8355 r8365 1 1 /* ======================================================================== *\ 2 ! $Name: not supported by cvs2svn $:$Id: MHCalibrationChargeCam.cc,v 1.5 4 2007-03-03 22:00:25tbretz Exp $2 ! $Name: not supported by cvs2svn $:$Id: MHCalibrationChargeCam.cc,v 1.55 2007-03-04 14:46:44 tbretz Exp $ 3 3 ! -------------------------------------------------------------------------- 4 4 ! … … 154 154 #include "MBadPixelsPix.h" 155 155 156 #include "MRawEvtData.h"157 156 #include "MRawRunHeader.h" 158 157 #include "MRawEvtPixelIter.h" 159 158 159 #include "MPedestalSubtractedEvt.h" 160 160 161 #include "MExtractedSignalCam.h" 161 162 #include "MExtractedSignalPix.h" 162 163 #include "MArrayI.h"164 #include "MArrayD.h"165 163 166 164 ClassImp(MHCalibrationChargeCam); … … 328 326 Bool_t MHCalibrationChargeCam::SetupHists(const MParList *pList) 329 327 { 330 331 fRawEvt = (MRawEvtData*)pList->FindObject("MRawEvtData"); 332 if (!fRawEvt) 333 { 334 *fLog << err << dbginf << "MRawEvtData not found... aborting." << endl; 335 return kFALSE; 336 } 337 338 return kTRUE; 328 fRawEvt = (MPedestalSubtractedEvt*)pList->FindObject("MPedestalSubtractedEvt"); 329 if (!fRawEvt) 330 { 331 *fLog << err << dbginf << "MPedestalSubtractedEvt not found... aborting." << endl; 332 return kFALSE; 333 } 334 335 return kTRUE; 339 336 } 340 337 … … 754 751 } 755 752 756 MRawEvtPixelIter pixel(fRawEvt); 757 while (pixel.Next()) 753 const Int_t npix = fRawEvt->GetNumPixels(); 754 const Int_t nhi = fRunHeader->GetNumSamplesHiGain(); 755 for (int pixid=0; pixid<npix; pixid++) 758 756 { 759 const UInt_t pixid = pixel.GetPixelId();760 761 757 MHCalibrationChargePix &histhi = (MHCalibrationChargePix&)(*this)[pixid]; 762 763 758 if (histhi.IsExcluded()) 764 759 continue; 765 766 const Float_t timehi = (Float_t)pixel.GetIdxMaxHiGainSample(hifirst, hilast); 767 760 761 const Float_t timehi = fRawEvt->GetMax(pixid, hifirst, hilast)+hifirst; 768 762 histhi.FillAbsTime(timehi); 769 763 … … 778 772 MHCalibrationChargePix &histlo = (MHCalibrationChargePix&)(*this)(pixid); 779 773 780 const Float_t timelo = (Float_t)pixel.GetIdxMaxLoGainSample(lofirst, lolast);774 const Float_t timelo = fRawEvt->GetMax(pixid, nhi+lofirst, nhi+lolast)+lofirst; 781 775 histlo.FillAbsTime(timelo); 782 776 … … 785 779 } 786 780 } 787 781 788 782 for (UInt_t j=0; j<nareas; j++) 789 783 { … … 795 789 796 790 MHCalibrationChargePix &hipix = (MHCalibrationChargePix&)GetAverageHiGainArea(j); 797 798 791 799 792 if (IsOscillations())
Note:
See TracChangeset
for help on using the changeset viewer.