diff --git a/applications/lofar2/model/pfb_os/one_pfb.ipynb b/applications/lofar2/model/pfb_os/one_pfb.ipynb index 93f9556a6b33c41bf56b2130e665fdf2f4b01933..08b63ae8aaf95cdf085dc97da30dab6a0efa6942 100644 --- a/applications/lofar2/model/pfb_os/one_pfb.ipynb +++ b/applications/lofar2/model/pfb_os/one_pfb.ipynb @@ -20,7 +20,7 @@ }, { "cell_type": "code", - "execution_count": 161, + "execution_count": 13, "id": "02689e50", "metadata": {}, "outputs": [], @@ -32,7 +32,7 @@ }, { "cell_type": "code", - "execution_count": 162, + "execution_count": 14, "id": "65235f50", "metadata": {}, "outputs": [], @@ -42,7 +42,7 @@ }, { "cell_type": "code", - "execution_count": 163, + "execution_count": 15, "id": "acea4f0a", "metadata": {}, "outputs": [ @@ -52,7 +52,7 @@ "<module 'dsp' from '/dop466_0/kooistra/git/hdl/applications/lofar2/model/pfb_os/dsp.py'>" ] }, - "execution_count": 163, + "execution_count": 15, "metadata": {}, "output_type": "execute_result" } @@ -64,7 +64,7 @@ }, { "cell_type": "code", - "execution_count": 164, + "execution_count": 16, "id": "a39e99a2", "metadata": {}, "outputs": [], @@ -74,7 +74,7 @@ }, { "cell_type": "code", - "execution_count": 165, + "execution_count": 17, "id": "55e0fe37", "metadata": {}, "outputs": [], @@ -86,7 +86,7 @@ }, { "cell_type": "code", - "execution_count": 166, + "execution_count": 18, "id": "3436bc2a", "metadata": {}, "outputs": [], @@ -108,7 +108,7 @@ }, { "cell_type": "code", - "execution_count": 167, + "execution_count": 19, "id": "e08b5ba2", "metadata": {}, "outputs": [ @@ -152,7 +152,7 @@ }, { "cell_type": "code", - "execution_count": 168, + "execution_count": 20, "id": "ca6b8c9d", "metadata": {}, "outputs": [], @@ -176,7 +176,7 @@ }, { "cell_type": "code", - "execution_count": 169, + "execution_count": 21, "id": "181d6c07", "metadata": {}, "outputs": [], @@ -193,7 +193,7 @@ }, { "cell_type": "code", - "execution_count": 170, + "execution_count": 22, "id": "6108ff59", "metadata": {}, "outputs": [ @@ -201,22 +201,15 @@ "name": "stdout", "output_type": "stream", "text": [ - "> prototype_fir_low_pass_filter()\n", - "Pass band specification\n", - ". f_pb = 0.0290625\n", - ". w_tb = 0.011625000000000002\n", - ". f_sb = 0.0406875\n", - "hFirls:\n", - ". f_pb = 0.029063\n", - ". w_tb = 0.011625\n", - ". f_sb = 0.040688\n", - ". beta = 1.000000\n", - ". Q = 1\n", - ". N = 127\n", - ". DC sum = 1.000000\n", - ". Symmetrical coefs = True\n", "hInterpolated.imag ~= 0\n", - "hInterpolated:\n", + "> design_fir_low_pass_filter()\n", + ". Method = firls\n", + ". Q = 1.000000\n", + ". fsub = fpass * 2 = 0.058125\n", + ". fpass = 0.029063\n", + ". fstop = 0.040688\n", + ". fNyquist = 0.500000\n", + ". fs = 1.000000\n", ". Ncoefs = 128\n", ". DC sum = 1.000000\n", ". Symmetrical coefs = True\n", @@ -227,13 +220,13 @@ "source": [ "# Use subband prototype FIR filter, to minimize aliasing\n", "if firType == 'firls':\n", - " hPrototype = dsp.prototype_fir_low_pass_filter(\n", - " Ndft, Ntaps, Ncoefs, hpFactor, transitionFactor, stopRippleFactor, beta)" + " hPrototype = dsp.prototype_fir_low_pass_filter(firType,\n", + " Ndft, Ntaps, Ncoefs, hpFactor, transitionFactor, stopRippleFactor, beta, fs)" ] }, { "cell_type": "code", - "execution_count": 171, + "execution_count": 23, "id": "3ec78793", "metadata": {}, "outputs": [], @@ -251,7 +244,7 @@ }, { "cell_type": "code", - "execution_count": 172, + "execution_count": 24, "id": "8e867248", "metadata": {}, "outputs": [ @@ -295,7 +288,7 @@ }, { "cell_type": "code", - "execution_count": 173, + "execution_count": 25, "id": "eee415a1", "metadata": {}, "outputs": [], @@ -315,7 +308,7 @@ }, { "cell_type": "code", - "execution_count": 174, + "execution_count": 26, "id": "9468907a", "metadata": {}, "outputs": [], @@ -336,7 +329,7 @@ }, { "cell_type": "code", - "execution_count": 175, + "execution_count": 27, "id": "4d046175", "metadata": {}, "outputs": [ @@ -395,7 +388,7 @@ }, { "cell_type": "code", - "execution_count": 176, + "execution_count": 28, "id": "c8d0560c", "metadata": {}, "outputs": [], @@ -423,7 +416,7 @@ }, { "cell_type": "code", - "execution_count": 177, + "execution_count": 29, "id": "c0573913", "metadata": {}, "outputs": [