CalcDB: use direct value for floor in value to dB conversion

pull/60/head
f4exb 2017-08-17 17:17:25 +02:00
rodzic 90ce3ec9ad
commit 3536cfb816
2 zmienionych plików z 8 dodań i 6 usunięć

Wyświetl plik

@ -16,17 +16,19 @@
#include "util/db.h" #include "util/db.h"
#include <cmath> #include <cmath>
#include <cassert>
double CalcDb::dbPower(double magsq, double floordB) double CalcDb::dbPower(double magsq, double floor)
{ {
if (magsq > 0) assert(floor > 0.0);
if (magsq > floor)
{ {
double val = 10.0 * log10(magsq); return 10.0 * log10(magsq);
return val > floordB ? val : floordB;
} }
else else
{ {
return floordB; return 10.0 * log10(floor);
} }
} }

Wyświetl plik

@ -22,7 +22,7 @@
class CalcDb class CalcDb
{ {
public: public:
static double dbPower(double magsq, double floordB = -100.0); static double dbPower(double magsq, double floor = 1e-10);
static double powerFromdB(double powerdB); static double powerFromdB(double powerdB);
}; };