@@ -140,11 +140,11 @@ bool checkPeak<1>(const double *data, double threshold, long i)
140
140
141
141
// Refinement
142
142
143
- template <void Func (double *, double *, const double *, unsigned long , unsigned long )>
143
+ template <void Func (double *, double *, const double *, unsigned long , long )>
144
144
void refinePeaks(double *positions, double *values, const double *data, unsigned long *peaks, unsigned long nPeaks)
145
145
{
146
146
for (unsigned long i = 0 ; i < nPeaks; i++)
147
- Func (positions, values, data, i, peaks[i]);
147
+ Func (positions, values, data, i, static_cast < long >( peaks[i]) );
148
148
}
149
149
150
150
void parabolicInterp (double & position, double & value, double idx, double vm1, double v_0, double vp1)
@@ -156,18 +156,18 @@ void parabolicInterp(double& position, double& value, double idx, double vm1, do
156
156
value = v_0 - (0.25 * (vm1 - vp1) * correction);
157
157
}
158
158
159
- void refineNone (double *positions, double *values, const double *data, unsigned long peak, unsigned long idx)
159
+ void refineNone (double *positions, double *values, const double *data, unsigned long peak, long idx)
160
160
{
161
161
positions[peak] = idx;
162
162
values[peak] = data[idx];
163
163
}
164
164
165
- void refineParabolic (double *positions, double *values, const double *data, unsigned long peak, unsigned long idx)
165
+ void refineParabolic (double *positions, double *values, const double *data, unsigned long peak, long idx)
166
166
{
167
167
parabolicInterp (positions[peak], values[peak], idx, data[idx-1 ], data[idx], data[idx+1 ]);
168
168
}
169
169
170
- void refineParabolicLog (double *positions, double *values, const double *data, unsigned long peak, unsigned long idx)
170
+ void refineParabolicLog (double *positions, double *values, const double *data, unsigned long peak, long idx)
171
171
{
172
172
// Take log values (avoiding values that are too low) - doesn't work for negative values
173
173
// N.B. we assume a max of -80dB difference between samples to prevent extreme overshoot
0 commit comments