Changeset 8274 for trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc
- Timestamp:
- 01/29/07 12:49:21 (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc
r8132 r8274 1 1 /* ======================================================================== *\ 2 ! $Name: not supported by cvs2svn $:$Id: MCalibrateData.cc,v 1.6 1 2006-10-19 13:58:29tbretz Exp $2 ! $Name: not supported by cvs2svn $:$Id: MCalibrateData.cc,v 1.62 2007-01-29 12:46:55 tbretz Exp $ 3 3 ! -------------------------------------------------------------------------- 4 4 ! … … 159 159 : fGeomCam(NULL), fBadPixels(NULL), fCalibrations(NULL), fIntensCalib(NULL), 160 160 fQEs(NULL), fIntensQE(NULL), fSignals(NULL), fCerPhotEvt(NULL), fCalibConstCam(NULL), 161 fIntensConst(NULL), fPedestalFlag(kNo), fSignalType(kPhot), fRenormFactor(1.),162 161 fIntensConst(NULL), /*fPedestalExt(NULL), fPedestalRndm(NULL), fPedPhotCam(NULL),*/ 162 fPedestalFlag(kNo), fSignalType(kPhot), fRenormFactor(1.), fScaleFactor(1.) 163 163 { 164 164 … … 216 216 return kFALSE; 217 217 } 218 /* 219 fPedPhotCam = (MPedPhotCam*)pList->FindCreateObj("MPedPhotCam"); 220 if (!fPedPhotCam) 221 return kFALSE; 222 223 fPedestalExt = (MPedestalCam*)pList->FindObject("MPedestalFromExtractor", "MPedestalCam"); 224 if (!fPedestalExt) 225 { 226 *fLog << err << "MPedestalFromExtractor [MPedestalCam] not found ... aborting" << endl; 227 return kFALSE; 228 } 229 /* 230 fPedestalRndm = (MPedestalCam*)pList->FindObject("MPedestalFromExtractorRndm", "MPedestalCam"); 231 if (!fPedestalRndm) 232 { 233 *fLog << err << "MPedestalFromExtractorRndm [MPedestalCam] not found ... aborting" << endl; 234 return kFALSE; 235 } 236 */ 218 237 219 238 fSignals = 0; … … 795 814 } /* if (data) */ 796 815 797 798 816 if (pedestal) 799 817 { … … 816 834 (*pedphot)[pixidx].Set(mean, rms); 817 835 pedphot->SetReadyToSave(); 836 //break; 818 837 } 838 /* 839 const Double_t mean = (*fPedestalExt)[pixidx].GetPedestal() * pedmeancalib; 840 const Double_t rms = (*fPedestalExt)[pixidx].GetPedestalRms() * pedrmscalib; 841 842 (*fPedPhotCam)[pixidx].Set(mean, rms); 843 fPedPhotCam->SetReadyToSave(); 844 */ 819 845 } /* if (pedestal) */ 820 846 } 847 848 // Now we should take the bias (MPedPhotExtractor/Mean) and 849 // pedestal rms (MPedPhotExtractorRndm/Rms) and store it 850 // into MSignalPix 821 851 822 852 if (data)
Note:
See TracChangeset
for help on using the changeset viewer.