Changeset 3279
- Timestamp:
- 02/24/04 18:09:51 (21 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/mcalib/MCalibrate.cc
r3278 r3279 184 184 UInt_t npix = fSignals->GetSize(); 185 185 186 Float_t hiloconv = 1.;186 Float_t hiloconv = 0.; 187 187 Float_t hiloconverr = 0.; 188 Float_t calibrationConversionFactor = 1.;188 Float_t calibrationConversionFactor = 0.; 189 189 Float_t calibrationConversionFactorErr = 0.; 190 190 … … 197 197 if (!pix.IsChargeValid()) 198 198 continue; 199 200 hiloconv = pix.GetConversionHiLo();201 hiloconverr= pix.GetConversionHiLoErr();202 199 203 200 switch(fCalibrationMode) … … 209 206 calibrationConversionFactorErr = pix.GetConversionBlindPixelMethodErr(); 210 207 } 208 else 209 continue; 211 210 break; 212 211 case kPinDiode: … … 216 215 calibrationConversionFactorErr = pix.GetConversionPINDiodeMethodErr(); 217 216 } 217 else 218 continue; 218 219 break; 219 220 case kFfactor: … … 223 224 calibrationConversionFactorErr = pix.GetConversionFFactorMethodErr(); 224 225 } 226 else 227 continue; 225 228 break; 226 229 case kCombined: … … 230 233 calibrationConversionFactorErr = pix.GetConversionCombinedMethodErr(); 231 234 } 235 else 236 continue; 232 237 break; 233 238 case kDummy: 239 hiloconv = 1.; 240 hiloconverr = 0.; 234 241 calibrationConversionFactor = 1.; 235 242 calibrationConversionFactorErr = 0.; 236 243 break; 237 } 238 } 244 245 } /* switch calibration mode */ 246 247 hiloconv = pix.GetConversionHiLo(); 248 hiloconverr= pix.GetConversionHiLoErr(); 249 250 } /* if(fCalibrationMode!=kNone) */ 239 251 240 252 MExtractedSignalPix &sig = (*fSignals)[pixidx]; … … 272 284 if (sig.GetNumLoGainSaturated() > 0) 273 285 cpix->SetPixelSaturated(); 274 } 286 287 } /* for (UInt_t pixidx=0; pixidx<npix; pixidx++) */ 275 288 276 289 fCerPhotEvt->FixSize();
Note:
See TracChangeset
for help on using the changeset viewer.