Changeset 3868


Ignore:
Timestamp:
04/28/04 13:36:09 (21 years ago)
Author:
gaug
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars/msignal
Files:
8 edited

Legend:

Unmodified
Added
Removed

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

    r3861 r3868  
    6565
    6666
    67 void MExtractFixedWindow::FindSignalHiGain(Byte_t *ptr, Int_t size, Int_t &sum, Byte_t &sat) const
     67void MExtractFixedWindow::FindSignalHiGain(Byte_t *ptr, Int_t &sum, Byte_t &sat) const
    6868{
    6969
    … …  
    8282}
    8383
    84 void MExtractFixedWindow::FindSignalLoGain(Byte_t *ptr, Int_t size, Int_t &sum, Byte_t &sat) const
     84void MExtractFixedWindow::FindSignalLoGain(Byte_t *ptr, Int_t &sum, Byte_t &sat) const
    8585{
    8686

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

    r3861 r3868  
    2222  static const Byte_t fgLoGainLast;      // Last FADC slice Lo-Gain (currently set to: 14)
    2323
    24   void   FindSignalHiGain(Byte_t *ptr, Int_t last, Int_t &sum, Byte_t &sat) const;
    25   void   FindSignalLoGain(Byte_t *ptr, Int_t last, Int_t &sum, Byte_t &sat) const;
     24  void   FindSignalHiGain(Byte_t *ptr, Int_t &sum, Byte_t &sat) const;
     25  void   FindSignalLoGain(Byte_t *ptr, Int_t &sum, Byte_t &sat) const;
    2626
    2727  void   StreamPrimitive(ofstream &out) const;

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

    r3862 r3868  
    192192// is stored in "sum", and the number of saturated  slices in "sat".
    193193//
    194 void MExtractFixedWindowPeakSearch::FindSignalHiGain(Byte_t *ptr, Int_t size, Int_t &sum, Byte_t &sat) const
     194void MExtractFixedWindowPeakSearch::FindSignalHiGain(Byte_t *ptr, Int_t &sum, Byte_t &sat) const
    195195{
    196196  //
    … …  
    217217// is stored in "sum", and the number of saturated  slices in "sat".
    218218//
    219 void MExtractFixedWindowPeakSearch::FindSignalLoGain(Byte_t *ptr, Int_t size, Int_t &sum, Byte_t &sat) const
     219void MExtractFixedWindowPeakSearch::FindSignalLoGain(Byte_t *ptr, Int_t &sum, Byte_t &sat) const
    220220{
    221221  //
    … …  
    296296      Byte_t sathi;
    297297
    298       FindSignalHiGain(pixel.GetHiGainSamples()+hiGainFirst, fWindowSizeHiGain, sumhi, sathi);
     298      FindSignalHiGain(pixel.GetHiGainSamples()+hiGainFirst, sumhi, sathi);
    299299
    300300      Int_t sumlo=0;
    … …  
    302302      if (pixel.HasLoGain())
    303303        {
    304           FindSignalLoGain(pixel.GetLoGainSamples()+loGainFirst, fWindowSizeLoGain, sumlo, satlo);
     304          FindSignalLoGain(pixel.GetLoGainSamples()+loGainFirst, sumlo, satlo);
    305305          if (satlo)
    306306            sat++;

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

    r3861 r3868  
    2323  Byte_t  fWindowSizeLoGain;     // Number of Lo Gain slices in window
    2424
    25   void   FindSignalHiGain(Byte_t *ptr, Int_t last, Int_t &sum, Byte_t &sat) const;
    26   void   FindSignalLoGain(Byte_t *ptr, Int_t last, Int_t &sum, Byte_t &sat) const; 
     25  void   FindSignalHiGain(Byte_t *ptr, Int_t &sum, Byte_t &sat) const;
     26  void   FindSignalLoGain(Byte_t *ptr, Int_t &sum, Byte_t &sat) const; 
    2727
    2828  void   FindPeak(Byte_t *ptr, Byte_t window, Byte_t &startslice, Int_t &signal, Int_t &sat) const;

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

    r3861 r3868  
    100100
    101101
    102 void MExtractSlidingWindow::FindSignalHiGain(Byte_t *ptr, Int_t size,  Int_t &max, Byte_t &sat) const
     102void MExtractSlidingWindow::FindSignalHiGain(Byte_t *ptr, Int_t &max, Byte_t &sat) const
    103103{
    104     const Byte_t *end = ptr + size;
     104    const Byte_t *end = ptr + fHiGainLast - fHiGainFirst + 1;
    105105
    106106    Int_t sum=0;
    … …  
    140140
    141141
    142 void MExtractSlidingWindow::FindSignalLoGain(Byte_t *ptr, Int_t size,  Int_t &max, Byte_t &sat) const
     142void MExtractSlidingWindow::FindSignalLoGain(Byte_t *ptr, Int_t &max, Byte_t &sat) const
    143143{
    144     const Byte_t *end = ptr + size;
     144    const Byte_t *end = ptr + fLoGainLast - fLoGainFirst + 1;
    145145
    146146    Int_t sum=0;

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

    r3861 r3868  
    2020  Byte_t  fWindowSizeLoGain;             // Number of Lo Gain slices in window 
    2121 
    22   void   FindSignalHiGain(Byte_t *ptr, Int_t last, Int_t &max, Byte_t &sat) const;
    23   void   FindSignalLoGain(Byte_t *ptr, Int_t last, Int_t &max, Byte_t &sat) const; 
     22  void   FindSignalHiGain(Byte_t *ptr, Int_t &max, Byte_t &sat) const;
     23  void   FindSignalLoGain(Byte_t *ptr, Int_t &max, Byte_t &sat) const; 
    2424
    2525public:

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

    r3865 r3868  
    135135}
    136136
    137 void MExtractor::FindSignalHiGain(Byte_t *ptr, Int_t last, Int_t &sum, Byte_t &sat) const
     137void MExtractor::FindSignalHiGain(Byte_t *firstused, Int_t &sum, Byte_t &sat) const
    138138{
    139139  return;
    140140}
    141141
    142 void MExtractor::FindSignalLoGain(Byte_t *ptr, Int_t last, Int_t &sum, Byte_t &sat) const
     142void MExtractor::FindSignalLoGain(Byte_t *firstused, Int_t &sum, Byte_t &sat) const
    143143{
    144144  return;
    … …  
    163163      Byte_t sathi;
    164164
    165       FindSignalHiGain(pixel.GetHiGainSamples()+fHiGainFirst, fHiGainLast, sumhi, sathi);
     165      FindSignalHiGain(pixel.GetHiGainSamples()+fHiGainFirst, sumhi, sathi);
    166166
    167167      Int_t  sumlo = 0;
    … …  
    170170      if (pixel.HasLoGain())
    171171        {
    172           FindSignalLoGain(pixel.GetLoGainSamples()+fLoGainFirst, fLoGainLast, sumlo, satlo);
     172          FindSignalLoGain(pixel.GetLoGainSamples()+fLoGainFirst, sumlo, satlo);
    173173         
    174174          if (satlo)

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

    r3861 r3868  
    4545    Byte_t  fSaturationLimit;
    4646
    47     virtual void FindSignalHiGain(Byte_t *ptr, Int_t last, Int_t &sum, Byte_t &sat) const;
    48     virtual void FindSignalLoGain(Byte_t *ptr, Int_t last, Int_t &sum, Byte_t &sat) const;
     47    virtual void FindSignalHiGain(Byte_t *firstused, Int_t &sum, Byte_t &sat) const;
     48    virtual void FindSignalLoGain(Byte_t *firstused, Int_t &sum, Byte_t &sat) const;
    4949
    5050    virtual Int_t  PreProcess(MParList *pList);
Note: See TracChangeset for help on using the changeset viewer.