Changeset 5813


Ignore:
Timestamp:
01/12/05 21:25:58 (20 years ago)
Author:
gaug
Message:
*** empty log message ***
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeSpline.cc

    r5795 r5813  
    268268      fWindowSizeHiGain  = 1;
    269269      fWindowSizeLoGain  = 1;
    270     }
     270      fRiseTimeHiGain    = 0.5;
     271    }
     272
     273  fRiseTimeLoGain    = fRiseTimeHiGain * fLoGainStretch;
     274  fFallTimeLoGain    = fFallTimeHiGain * fLoGainStretch;     
    271275
    272276  if (IsExtractionType(kIntegral))
    273277    {
    274 
    275       fRiseTimeLoGain    = fRiseTimeHiGain * fLoGainStretch;
    276       fFallTimeLoGain    = fFallTimeHiGain * fLoGainStretch;     
    277278
    278279      fNumHiGainSamples  = fRiseTimeHiGain + fFallTimeHiGain;
     
    334335      if (*p++ >= fSaturationLimit)
    335336        if (!sat)
    336           sat = ids-3;
     337          sat = ids-2;
    337338     
    338339    }
     
    356357          if (*logain++ >= fSaturationLimit)
    357358            if (!sat)
    358               sat = ids-3;
     359              sat = ids-2;
    359360
    360361          range++;
     
    425426  // Don't start if the maxpos is too close to the limits.
    426427  //
    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;
    430432      if (IsExtractionType(kAmplitude))
    431433        {
     
    784786  if (sat || maxpos < TMath::Ceil(fRiseTimeLoGain) || maxpos > range-2)
    785787    {
    786       dtime = 0.5;
     788
     789      dtime = 1.0;
    787790      if (IsExtractionType(kAmplitude))
    788791        {
Note: See TracChangeset for help on using the changeset viewer.