Merge pull request #80 from tjlang/master

Updated for PyPI distribution

Author: tjlang

MANIFEST.in

@@ -1,5 +1,11 @@
 include README.md
 include LICENSE.txt
 include CHANGELOG.md
+include pyproject.toml
+recursive-include csu_radartools *.py *.pyx *.c *.pxd
+recursive-include csu_radartools/beta_function_parameters *.csv
 recursive-include notebooks *.ipynb
 recursive-include tests *.py
+global-exclude __pycache__
+global-exclude *.py[co]
+global-exclude *~

csu_radartools/_version.py

@@ -2,5 +2,5 @@
 
 """Version File."""
 
-VERSION_INFO = (1, 4, 0, 'dev0')
+VERSION_INFO = (1, 4, 0)
 __version__ = '.'.join(map(str, VERSION_INFO))

csu_radartools/calc_kdp_ray_fir.pyx

@@ -1,6 +1,7 @@
 # cython: boundscheck=False
 # cython: language_level=2
 
+import cython
 from libc.math cimport sqrt
 cimport numpy as np
 import numpy as np
@@ -190,5 +191,6 @@ def hid_beta_f(int ngates, float[:] x_arr, float a, float b, float m):
 
     for i in range(ngates):
         beta[i] = 1.0 / (1.0 + (((x_arr[i] - m) / a)**2.0)**b)
+        # beta[i] = 1.0 / (1.0 + np.power(np.power((x_arr[i] - m) / a, 2.0), b))
 
     return beta

notebooks/CSU_RadarTools_Demo.ipynb

@@ -109,7 +109,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 3,
    "metadata": {},
    "outputs": [
     {
@@ -140,7 +140,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 4,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -159,7 +159,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
+   "execution_count": 5,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -266,12 +266,23 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 13,
+   "execution_count": 6,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "0.8747849464416504 seconds\n"
+     ]
+    }
+   ],
    "source": [
+    "import time\n",
+    "begin_time = time.time()\n",
     "fh = csu_fhc.csu_fhc_summer(dz=dz, zdr=dr, rho=rh, kdp=kd, use_temp=True, band='C',\n",
-    "                            T=radar_T)"
+    "                            T=radar_T)\n",
+    "print(time.time() - begin_time, 'seconds')"
    ]
   },
   {
@@ -297,7 +308,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 8,
+   "execution_count": 7,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -326,7 +337,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 17,
+   "execution_count": 8,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -342,7 +353,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 18,
+   "execution_count": 9,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -375,7 +386,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 19,
+   "execution_count": 10,
    "metadata": {},
    "outputs": [
     {
@@ -2237,7 +2248,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.12.3"
+   "version": "3.12.10"
   }
  },
  "nbformat": 4,