Merge pull request #39 from JarronL/develop

import all funcs into nrc_utils
JarronL · Nov 18, 2020 · ce15749 · ce15749
2 parents 2cae117 + 17ad4d1
commit ce15749
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 30 deletions.
diff --git a/notebooks/Basic_Usage.ipynb b/notebooks/Basic_Usage.ipynb
@@ -35,7 +35,10 @@
     "# jedi 0.14.1 tab completion fails; will be fixed in 0.14.2\n",
     "import jedi\n",
     "if jedi.__version__ == '0.14.1':\n",
-    "    %config Completer.use_jedi = False"
+    "    %config Completer.use_jedi = False\n",
+    "    \n",
+    "# Progress bar\n",
+    "from tqdm.auto import trange, tqdm"
    ]
   },
   {

diff --git a/notebooks/Coronagraph_Basics.ipynb b/notebooks/Coronagraph_Basics.ipynb
diff --git a/pynrc/nrc_utils.py b/pynrc/nrc_utils.py
@@ -47,10 +47,12 @@
 
 from .maths import robust
 from .maths.fast_poly import *
-from .maths.image_manip import frebin, fshift, pad_or_cut_to_size
-from .maths.image_manip import hist_indices, binned_statistic
-from .maths.coords import dist_image, xy_to_rtheta, rtheta_to_xy, xy_rot
-from .maths.coords import det_to_sci, sci_to_det, plotAxes
+from .maths.image_manip import *
+from .maths.coords import *
+# from .maths.image_manip import frebin, fshift, pad_or_cut_to_size
+# from .maths.image_manip import hist_indices, binned_statistic
+# from .maths.coords import dist_image, xy_to_rtheta, rtheta_to_xy, xy_rot
+# from .maths.coords import det_to_sci, sci_to_det, plotAxes
 
 # OPD info
 from .opds import opd_default, OPDFile_to_HDUList