Skip to content
Snippets Groups Projects
Commit 8179369c authored by Jan Petermann's avatar Jan Petermann
Browse files

Merge branch '71-tests-for-conversion-db' into develop

parents c1dd73f1 d477f08d
No related branches found
No related tags found
No related merge requests found
Showing
with 8 additions and 39710 deletions
import warnings
import numpy as np import numpy as np
...@@ -9,8 +11,8 @@ def from_lin(data): ...@@ -9,8 +11,8 @@ def from_lin(data):
return 10 * np.log10(data) return 10 * np.log10(data)
def mean(data): def mean(data, axis=None):
return from_lin(np.mean(to_lin(data))) return from_lin(np.mean(to_lin(data), axis=axis))
def subtract(signal, noise): def subtract(signal, noise):
...@@ -18,6 +20,10 @@ def subtract(signal, noise): ...@@ -18,6 +20,10 @@ def subtract(signal, noise):
def average(datasets): def average(datasets):
warnings.warn(
"Use `openqlab.conversion.de.mean` with argument 'axis=-1' instead",
DeprecationWarning,
)
lin = to_lin(datasets) lin = to_lin(datasets)
average = np.sum(lin, 0) / len(lin) average = np.sum(lin, 0) / len(lin)
return from_lin(average) return from_lin(average)
......
Type;FSP;
Version;4.50;
Date;30.Aug 17;
Mode;ANALYZER;
Center Freq;327270.750000;Hz
Freq Offset;0.000000;Hz
Span;0.000000;Hz
x-Axis;LIN;
Start;327270.750000;Hz
Stop;327270.750000;Hz
Ref Level;14.000000;dBm
Level Offset;0.000000;dB
Ref Position;100.000000;%
y-Axis;LOG;
Level Range;100.000000;dB
Rf Att;50.000000;dB
RBW;10.000000;Hz
VBW;30.000000;Hz
SWT;5.000000;s
Trace Mode;AVERAGE;
Detector;SAMPLE;
Sweep Count;1;
Trace 1:;;
x-Unit;test;
y-Unit;dBm;
Preamplifier;NOT AVAILABLE;
Transducer;OFF;
Values;8001;
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment