Skip to content

Commit

Permalink
Removed fftw processors
Browse files Browse the repository at this point in the history
  • Loading branch information
iguinn committed Apr 28, 2024
1 parent a54b390 commit 66689f9
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 389 deletions.
1 change: 0 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ install_requires =
parse
pint
pyarrow
pyfftw
scipy
tqdm>=4.27
python_requires = >=3.9
Expand Down
4 changes: 0 additions & 4 deletions src/dspeed/processors/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
from .convolutions import convolve_wf, fft_convolve_wf
from .dwt import discrete_wavelet_transform
from .energy_kernels import cusp_filter, dplms, zac_filter
from .fftw import dft, inv_dft, psd
from .fixed_time_pickoff import fixed_time_pickoff
from .gaussian_filter1d import gaussian_filter1d
from .get_multi_local_extrema import get_multi_local_extrema
Expand Down Expand Up @@ -115,9 +114,6 @@
"t0_filter",
"zac_filter",
"discrete_wavelet_transform",
"dft",
"inv_dft",
"psd",
"fixed_time_pickoff",
"gaussian_filter1d",
"get_multi_local_extrema",
Expand Down
280 changes: 0 additions & 280 deletions src/dspeed/processors/fftw.py

This file was deleted.

18 changes: 2 additions & 16 deletions tests/configs/icpc-dsp-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
"zacEmax",
"zacEftp",
"cuspEftp",
"wf_psd"
],
"processors": {
"tp_min, tp_max, wf_min, wf_max": {
Expand Down Expand Up @@ -311,16 +310,9 @@
"args": ["wf_trap2", "tp_0_est + 8.096*us", "'l'", "trapQftp"],
"unit": "ADC"
},
"QDrift": {
"function": "multiply",
"module": "numpy",
"args": ["trapQftp", "(4*us)/waveform.period", "QDrift"],
"unit": "ADC"
},
"QDrift": "trapQftp * 16",
"dt_eff": {
"function": "divide",
"module": "numpy",
"args": ["QDrift", "trapTmax", "dt_eff"],
"function": "QDrift/trapTmax",
"unit": "ns"
},
"wf_le": {
Expand Down Expand Up @@ -359,11 +351,5 @@
"args": ["tp_0_est", "tp_aoe_max/16", "tp_aoe_samp"],
"unit": "ns"
},
"wf_psd": {
"function": "psd",
"module": "dspeed.processors",
"args": ["wf_blsub", "wf_psd"],
"init_args": ["wf_blsub", "wf_psd"]
}
}
}

0 comments on commit 66689f9

Please sign in to comment.