Changeset 17539
- Timestamp:
- 02/05/14 10:44:43 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Mars/mcore/DrsCalib.h
r17400 r17539 20 20 { 21 21 protected: 22 uint64_t fNumEntries;22 int64_t fNumEntries; 23 23 24 24 size_t fNumSamples; … … 120 120 121 121 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) 123 123 { 124 124 /* … … 220 220 }*/ 221 221 222 void AddAbs(const int16_t *val, const 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) 224 224 { 225 225 /* … … 297 297 298 298 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) 301 301 { 302 302 if (start<0) … … 360 360 361 361 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) 365 365 { 366 366 if (start<0) … … 849 849 { 850 850 *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; 852 852 853 853 ptr++; … … 929 929 const std::vector<int64_t> &GetSum() const { return fSum; } 930 930 931 uint64_t GetNumEntries() const { return fNumEntries; }931 int64_t GetNumEntries() const { return fNumEntries; } 932 932 }; 933 933 … … 935 935 { 936 936 public: 937 uint64_t fNumEntries;937 int64_t fNumEntries; 938 938 939 939 size_t fNumSamples; … … 1209 1209 std::vector<int64_t> fTrgOff; 1210 1210 1211 uint64_t fNumOffset;1212 uint64_t fNumGain;1213 uint64_t fNumTrgOff;1211 int64_t fNumOffset; 1212 int64_t fNumGain; 1213 int64_t fNumTrgOff; 1214 1214 1215 1215 uint32_t fStep; … … 1315 1315 1316 1316 fStep = file.GetUInt("STEP"); 1317 fNumOffset = file.Get UInt("NBOFFSET");1318 fNumGain = file.Get UInt("NBGAIN");1319 fNumTrgOff = file.Get UInt("NBTRGOFF");1317 fNumOffset = file.GetInt("NBOFFSET"); 1318 fNumGain = file.GetInt("NBGAIN"); 1319 fNumTrgOff = file.GetInt("NBTRGOFF"); 1320 1320 fRoi = file.GetUInt("NROI"); 1321 1321 fNumTm = file.HasKey("NTM") ? file.GetUInt("NTM") : 0;
Note:
See TracChangeset
for help on using the changeset viewer.