Changeset 5793 for trunk/MagicSoft/Mars


Ignore:
Timestamp:
01/10/05 22:32:14 (20 years ago)
Author:
gaug
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r5792 r5793  
    5151     - take fNameWeightsFile into the streamer, otherwise the Clone()
    5252       will always create an extractor with cosmic's weights.
     53     - set fOffsetLoGain to a slighly higher value. The DF seems to
     54       have a different offset since it uses different pulse shapes
     55       and thus sightly different time definitions.
    5356
    5457

  • trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc

    r5790 r5793  
    7979const Int_t  MExtractTimeAndChargeDigitalFilter::fgSignalStartBinLoGain    =  4;
    8080const TString MExtractTimeAndChargeDigitalFilter::fgNameWeightsFile        = "msignal/cosmics_weights.dat";
     81const Float_t MExtractTimeAndChargeDigitalFilter::fgOffsetLoGain           = 1.8;   // 5 ns
    8182// --------------------------------------------------------------------------
    8283//
    … …  
    102103
    103104    SetNameWeightsFile();
     105    SetOffsetLoGain(fgOffsetLoGain);
    104106}
    105107
    … …  
    199201
    200202  fTimeShiftHiGain = (Float_t)fHiGainFirst + 0.5 + 1./fBinningResolutionHiGain;
    201   fTimeShiftLoGain = (Float_t)fLoGainFirst + 0.5 + 1./fBinningResolutionLoGain;
     203  fTimeShiftLoGain = 0.5 + 1./fBinningResolutionLoGain;
    202204  //
    203205  // We need here the effective number of samples which is about 2.5 in the case of a window
    … …  
    209211  fSqrtLoGainSamples = TMath::Sqrt(fNumLoGainSamples);
    210212 
     213  Print("weights");
     214
    211215  return kTRUE;
    212216}
    … …  
    539543      return;
    540544
    541   time = max_p + fTimeShiftLoGain /* this shifts the time to the start of the rising edge */
     545  time = max_p + fTimeShiftLoGain + (Float_t)fLoGainFirst /* this shifts the time to the start of the rising edge */
    542546      - ((Float_t)t_iter)/fBinningResolutionLoGain - time_sum/sum;
    543547}

  • trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.h

    r5792 r5793  
    3232  static const Int_t  fgSignalStartBinLoGain;    //! Default for fSignalStartBinLoGain (now set to: 4)
    3333  static const TString fgNameWeightsFile;        //! "cosmics_weights.dat"
    34 
     34  static const Float_t fgOffsetLoGain;           //! Default for fOffsetLoGain (now set to 1.8)
     35 
    3536  MArrayF fHiGainSignal;                        //! Need fast access to the signals in a float way
    3637  MArrayF fLoGainSignal;                        //! Store them in separate arrays
Note: See TracChangeset for help on using the changeset viewer.