Changeset 17539


Ignore:
Timestamp:
02/05/14 10:44:43 (11 years ago)
Author:
lyard
Message:
moved uint64 to int64 in DrsCalibration member variables
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Mars/mcore/DrsCalib.h

    r17400 r17539  
    2020{
    2121protected:
    22     uint64_t fNumEntries;
     22    int64_t fNumEntries;
    2323
    2424    size_t fNumSamples;
     
    120120
    121121    void AddRel(const int16_t *val,    const int16_t *start,
    122                 const int32_t *offset, const uint32_t scale)
     122                const int32_t *offset, const int64_t scale)
    123123    {
    124124        /*
     
    220220    }*/
    221221
    222     void AddAbs(const int16_t *val,    const  int16_t *start,
    223                 const int32_t *offset, const uint32_t scale)
     222    void AddAbs(const int16_t *val,    const int16_t *start,
     223                const int32_t *offset, const int64_t scale)
    224224    {
    225225        /*
     
    297297
    298298    static void ApplyCh(float *vec, const int16_t *val, int16_t start, uint32_t roi,
    299                         const int32_t *offset, const uint32_t scaleabs,
    300                         const int64_t *gain,   const uint64_t scalegain)
     299                        const int32_t *offset, const int64_t scaleabs,
     300                        const int64_t *gain,   const int64_t scalegain)
    301301    {
    302302        if (start<0)
     
    360360
    361361    static void ApplyCh(float *vec, const int16_t *val, int16_t start, uint32_t roi,
    362                         const int32_t *offset, const uint32_t scaleabs,
    363                         const int64_t *gain,   const uint64_t scalegain,
    364                         const int64_t *trgoff, const uint64_t scalerel)
     362                        const int32_t *offset, const int64_t scaleabs,
     363                        const int64_t *gain,   const int64_t scalegain,
     364                        const int64_t *trgoff, const int64_t scalerel)
    365365    {
    366366        if (start<0)
     
    849849        {
    850850            *ptr      = scale*double(*it)/fNumEntries;
    851             *(ptr+sz) = scale*sqrt(double(*i2*int64_t(fNumEntries) - *it * *it))/fNumEntries;
     851            *(ptr+sz) = scale*sqrt(double(*i2*fNumEntries - *it * *it))/fNumEntries;
    852852
    853853            ptr++;
     
    929929    const std::vector<int64_t> &GetSum() const { return fSum; }
    930930
    931     uint64_t GetNumEntries() const { return fNumEntries; }
     931    int64_t GetNumEntries() const { return fNumEntries; }
    932932};
    933933
     
    935935{
    936936public:
    937     uint64_t fNumEntries;
     937    int64_t fNumEntries;
    938938
    939939    size_t fNumSamples;
     
    12091209    std::vector<int64_t> fTrgOff;
    12101210
    1211     uint64_t fNumOffset;
    1212     uint64_t fNumGain;
    1213     uint64_t fNumTrgOff;
     1211    int64_t fNumOffset;
     1212    int64_t fNumGain;
     1213    int64_t fNumTrgOff;
    12141214
    12151215    uint32_t fStep;
     
    13151315
    13161316        fStep      = file.GetUInt("STEP");
    1317         fNumOffset = file.GetUInt("NBOFFSET");
    1318         fNumGain   = file.GetUInt("NBGAIN");
    1319         fNumTrgOff = file.GetUInt("NBTRGOFF");
     1317        fNumOffset = file.GetInt("NBOFFSET");
     1318        fNumGain   = file.GetInt("NBGAIN");
     1319        fNumTrgOff = file.GetInt("NBTRGOFF");
    13201320        fRoi       = file.GetUInt("NROI");
    13211321        fNumTm     = file.HasKey("NTM") ? file.GetUInt("NTM") : 0;
Note: See TracChangeset for help on using the changeset viewer.