Changeset 2806 for trunk/MagicSoft


Ignore:
Timestamp:
01/14/04 18:14:50 (21 years ago)
Author:
gaug
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r2805 r2806  
    1313   * manalysis/AnalysisLinkDef.h
    1414     - include MFFT
    15      - put MCurrents.cc back into the Makefile (was only in the LinkDef)
     15
     16   * manalysis/MExtractedSignalCam.h
     17     - removed variables fNumHiGainSamples and fNumLoGainSamples
     18     - function SetNumUsedFADCSlices replaced by SetUsedFADCSlices
     19
     20   * manalysis/MExtractSignal.cc
     21     - updated call to SetUsedFADCSlices
    1622
    1723

  • trunk/MagicSoft/Mars/manalysis/MExtractSignal.cc

    r2767 r2806  
    136136    fSignals->InitSize(cam->GetNumPixels());   
    137137
    138     fSignals->SetNumUsedFADCSlices(fNumHiGainSamples, fHiGainFirst, fHiGainFirst+fNumHiGainSamples-1,
    139                                    fNumLoGainSamples, fLoGainFirst, fLoGainFirst+fNumLoGainSamples-1);
     138    fSignals->SetUsedFADCSlices(fHiGainFirst, fHiGainFirst+fNumHiGainSamples-1,
     139                                fLoGainFirst, fLoGainFirst+fNumLoGainSamples-1);
    140140
    141141    return kTRUE;

  • trunk/MagicSoft/Mars/manalysis/MExtractedSignalCam.h

    r2728 r2806  
    1313private:
    1414    TClonesArray *fArray; // FIXME: Change TClonesArray away from a pointer?
    15 
    16     // FIXME: Is it necessary to store this information for each event?
    17     Byte_t fNumUsedHiGainFADCSlices;
    18     Byte_t fNumUsedLoGainFADCSlices;
    1915
    2016    Byte_t fFirstUsedSliceHiGain;
    … …  
    3430    Int_t GetSize() const;
    3531
    36     Byte_t GetNumUsedFADCSlices()          { return fNumUsedHiGainFADCSlices; }
    37     Byte_t GetNumUsedHiGainFADCSlices()    { return fNumUsedHiGainFADCSlices; }
    38     Byte_t GetNumUsedLoGainFADCSlices()    { return fNumUsedLoGainFADCSlices; }
     32    Byte_t GetNumUsedFADCSlices()          { return fLastUsedSliceHiGain-fFirstUsedSliceHiGain+1; }
     33    Byte_t GetNumUsedHiGainFADCSlices()    { return fLastUsedSliceHiGain-fFirstUsedSliceHiGain+1; }
     34    Byte_t GetNumUsedLoGainFADCSlices()    { return fLastUsedSliceLoGain-fFirstUsedSliceLoGain+1; }
    3935
    4036    Byte_t GetFirstUsedSliceHiGain()       { return fFirstUsedSliceHiGain; }
    … …  
    4440    Byte_t GetLastUsedSliceLoGain()        { return fLastUsedSliceLoGain; }
    4541
    46     void   SetNumUsedFADCSlices(Byte_t numh, Byte_t firsth, Byte_t lasth,
    47                                 Byte_t numl, Byte_t firstl, Byte_t lastl)
     42    void   SetUsedFADCSlices(Byte_t firsth, Byte_t lasth,
     43                       Byte_t firstl, Byte_t lastl)
    4844    {
    49         // FIXME: Calculate the number of used slices from first/last
    50         //        to make sure, that the stored values are always
    51         //        consistent!
    52         fNumUsedHiGainFADCSlices = numh;
    53         fFirstUsedSliceHiGain    = firsth;
    54         fLastUsedSliceHiGain     = lasth;
    55         fNumUsedLoGainFADCSlices = numl;
    56         fFirstUsedSliceLoGain    = firstl;
    57         fLastUsedSliceLoGain     = lastl;
     45      fFirstUsedSliceHiGain    = firsth;
     46      fLastUsedSliceHiGain     = lasth;
     47      fFirstUsedSliceLoGain    = firstl;
     48      fLastUsedSliceLoGain     = lastl;
    5849    }
    5950

  • trunk/MagicSoft/Mars/manalysis/MPedCalcPedRun.cc

    r2747 r2806  
    173173{
    174174    Int_t sum=0;
    175     Byte_t EvenNumSamples=(fNumHiGainSamples/2*2==fNumHiGainSamples) ? fNumHiGainSamples:fNumHiGainSamples-1;
     175    Byte_t EvenNumSamples=(fNumHiGainSamples/2*2==fNumHiGainSamples)
     176                        ? fNumHiGainSamples : fNumHiGainSamples-1;
    176177
    177178    do sum += *ptr;
Note: See TracChangeset for help on using the changeset viewer.