Changeset 3769 for trunk/MagicSoft


Ignore:
Timestamp:
04/16/04 19:51:08 (20 years ago)
Author:
moralejo
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r3768 r3769  
    4242       signal integration range (only for MC), now from slices 5 to 10.
    4343
     44   * msignal/MExtractSignal3.[h,cc]
     45     - Changed name of function SetRange for the more adecquate
     46       "SetWindows". No change in behaviour of the function.
    4447
    4548 2004/04/16: Markus Gaug

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

    r3633 r3769  
    7878  AddToBranchList("MRawEvtData.*");
    7979
    80   SetRange();
    81 }
    82 
    83 void MExtractSignal3::SetRange(Byte_t windowh, Byte_t windowl, Byte_t peaksearchwindow)
     80  SetWindows();
     81}
     82
     83void MExtractSignal3::SetWindows(Byte_t windowh, Byte_t windowl, Byte_t peaksearchwindow)
    8484{
    8585  //
    … …  
    9393  if (fWindowSizeHiGain != windowh)
    9494    *fLog << endl << warn <<
    95       "MExtractSignal3::SetRange - Hi Gain window size has to be even, set to: "
     95      "MExtractSignal3::SetWindows - Hi Gain window size has to be even, set to: "
    9696          << int(fWindowSizeHiGain) << " samples " << endl;
    9797   
    9898  if (fWindowSizeLoGain != windowl)
    9999    *fLog << endl << warn <<
    100       "MExtractSignal3::SetRange - Lo Gain window size has to be even, set to: "
     100      "MExtractSignal3::SetWindows - Lo Gain window size has to be even, set to: "
    101101          << int(fWindowSizeLoGain) << " samples " << endl;
    102102
    103103  if (fPeakSearchWindowSize != peaksearchwindow)
    104104    *fLog << endl << warn <<
    105       "MExtractSignal3::SetRange - Peak Search window size has to be even, set to: "
     105      "MExtractSignal3::SetWindows - Peak Search window size has to be even, set to: "
    106106          << int(fPeakSearchWindowSize) << " samples " << endl;
    107107
    … …  
    110110    {
    111111      fWindowSizeHiGain = 2;
    112       *fLog << warn << "MExtractSignal3::SetRange - Hi Gain window size set to two samples" << endl;
     112      *fLog << warn << "MExtractSignal3::SetWindows - Hi Gain window size set to two samples" << endl;
    113113    }
    114114
    … …  
    116116    {
    117117      fWindowSizeLoGain = 2;
    118       *fLog << warn << "MExtractSignal3::SetRange - Lo Gain window size set to two samples" << endl;
     118      *fLog << warn << "MExtractSignal3::SetWindows - Lo Gain window size set to two samples" << endl;
    119119    }
    120120
    … …  
    122122    {
    123123      fPeakSearchWindowSize = 2;
    124       *fLog << warn << "MExtractSignal3::SetRange - Peak Search window size set to two samples" << endl;
     124      *fLog << warn << "MExtractSignal3::SetWindows - Peak Search window size set to two samples" << endl;
    125125    }
    126126
    … …  
    129129    {
    130130      fWindowSizeHiGain = fNumHiGainSamples & ~1;
    131       *fLog << warn << "MExtractSignal3::SetRange - Hi Gain window size set to "
     131      *fLog << warn << "MExtractSignal3::SetWindows - Hi Gain window size set to "
    132132            << int(fWindowSizeHiGain) << " samples " << endl;
    133133    }
    … …  
    136136    {
    137137      fWindowSizeLoGain = fNumLoGainSamples & ~1;
    138       *fLog << warn << "MExtractSignal3::SetRange - Lo Gain window size set to "
     138      *fLog << warn << "MExtractSignal3::SetWindows - Lo Gain window size set to "
    139139            << int(fWindowSizeLoGain) << " samples " << endl;
    140140    }

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

    r3633 r3769  
    5353    MExtractSignal3(const char *name=NULL, const char *title=NULL);
    5454
    55     void SetRange(Byte_t windowh=fgWindowSize, Byte_t windowl=fgWindowSize,
    56                   Byte_t peaksearchwindow=fgPeakSearchWindowSize);
     55    void SetWindows(Byte_t windowh=fgWindowSize, Byte_t windowl=fgWindowSize,
     56                    Byte_t peaksearchwindow=fgPeakSearchWindowSize);
    5757
    5858    void SetSaturationLimit(Byte_t lim) { fSaturationLimit = lim; }
Note: See TracChangeset for help on using the changeset viewer.