Changeset 5813
- Timestamp:
- 01/12/05 21:25:58 (20 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeSpline.cc
r5795 r5813 268 268 fWindowSizeHiGain = 1; 269 269 fWindowSizeLoGain = 1; 270 } 270 fRiseTimeHiGain = 0.5; 271 } 272 273 fRiseTimeLoGain = fRiseTimeHiGain * fLoGainStretch; 274 fFallTimeLoGain = fFallTimeHiGain * fLoGainStretch; 271 275 272 276 if (IsExtractionType(kIntegral)) 273 277 { 274 275 fRiseTimeLoGain = fRiseTimeHiGain * fLoGainStretch;276 fFallTimeLoGain = fFallTimeHiGain * fLoGainStretch;277 278 278 279 fNumHiGainSamples = fRiseTimeHiGain + fFallTimeHiGain; … … 334 335 if (*p++ >= fSaturationLimit) 335 336 if (!sat) 336 sat = ids- 3;337 sat = ids-2; 337 338 338 339 } … … 356 357 if (*logain++ >= fSaturationLimit) 357 358 if (!sat) 358 sat = ids- 3;359 sat = ids-2; 359 360 360 361 range++; … … 425 426 // Don't start if the maxpos is too close to the limits. 426 427 // 427 if (sat || maxpos < 1 || maxpos > range-2) 428 { 429 dtime = 0.5; 428 if (sat || maxpos < TMath::Ceil(fRiseTimeHiGain) || maxpos > range-2) 429 { 430 431 dtime = 1.0; 430 432 if (IsExtractionType(kAmplitude)) 431 433 { … … 784 786 if (sat || maxpos < TMath::Ceil(fRiseTimeLoGain) || maxpos > range-2) 785 787 { 786 dtime = 0.5; 788 789 dtime = 1.0; 787 790 if (IsExtractionType(kAmplitude)) 788 791 {
Note:
See TracChangeset
for help on using the changeset viewer.