Fix notebook imports

PlasmaFAIR · Jun 3, 2024 · c6d4c6c · c6d4c6c
1 parent d215da3
commit c6d4c6c
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 73 deletions.
diff --git a/Analytic_Benchmark.ipynb b/Analytic_Benchmark.ipynb
@@ -7,18 +7,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from netCDF4 import Dataset\n",
-    "import pandas as pd\n",
     "import numpy as np\n",
-    "import matplotlib as mpl\n",
-    "from fusiondls.DLScommonTools import *\n",
-    "import os\n",
-    "import pickle as pkl\n",
-    "from scipy import interpolate\n",
-    "import scipy as sp\n",
+    "from fusiondls import LfuncN, LRBv21, file_read\n",
     "from fusiondls.Analytic_DLS import CfInt\n",
-    "from fusiondls.LRBv21 import LRBv21\n",
-    "\n",
     "\n",
     "# Here are some useful labels to use for plotting throughout notebook\n",
     "store_labels = dict()\n",

diff --git a/Ex. 1 - Basics.ipynb b/Ex. 1 - Basics.ipynb
@@ -7,16 +7,13 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from netCDF4 import Dataset\n",
-    "import pandas as pd\n",
-    "import numpy as np\n",
+    "import copy\n",
+    "\n",
     "import matplotlib as mpl\n",
-    "from DLScommonTools import *\n",
-    "import os\n",
-    "import pickle as pkl\n",
-    "from scipy import interpolate\n",
-    "import scipy as sp\n",
-    "from LRBv21 import LRBv21\n",
+    "import numpy as np\n",
+    "from fusiondls import LRBv21, file_read, file_write\n",
+    "from fusiondls.AnalyticCoolingCurves import LfuncKallenbachAr\n",
+    "\n",
     "colors = [\"teal\",\"darkorange\",\"firebrick\",\"limegreen\",\"magenta\",\"cyan\",\"navy\"]\n",
     "\n",
     "# Here are some useful labels to use for plotting throughout notebook\n",

diff --git a/Ex. 2 - Manipulating profiles.ipynb b/Ex. 2 - Manipulating profiles.ipynb
@@ -16,20 +16,14 @@
     }
    ],
    "source": [
-    "from netCDF4 import Dataset\n",
-    "import pandas as pd\n",
-    "import numpy as np\n",
-    "import matplotlib as mpl\n",
-    "from DLScommonTools import *\n",
-    "import os\n",
-    "import pickle as pkl\n",
-    "from scipy import interpolate\n",
-    "import scipy as sp\n",
-    "colors = [\"teal\",\"darkorange\",\"firebrick\",\"limegreen\",\"magenta\",\"cyan\",\"navy\"]\n",
+    "import copy\n",
     "\n",
+    "import matplotlib as mpl\n",
+    "import numpy as np\n",
+    "from fusiondls import LRBv21, file_read\n",
+    "from matplotlib.ticker import StrMethodFormatter\n",
     "\n",
-    "%load_ext autoreload\n",
-    "%autoreload 2\n",
+    "colors = [\"teal\",\"darkorange\",\"firebrick\",\"limegreen\",\"magenta\",\"cyan\",\"navy\"]\n",
     "\n",
     "# Here are some useful labels to use for plotting throughout notebook\n",
     "store_labels = dict()\n",

diff --git a/Ex. 3 - Advanced post-processing.ipynb b/Ex. 3 - Advanced post-processing.ipynb
@@ -16,20 +16,14 @@
     }
    ],
    "source": [
-    "from netCDF4 import Dataset\n",
-    "import pandas as pd\n",
-    "import numpy as np\n",
-    "import matplotlib as mpl\n",
-    "from DLScommonTools import *\n",
-    "import os\n",
-    "import pickle as pkl\n",
-    "from scipy import interpolate\n",
-    "import scipy as sp\n",
-    "from LRBv21 import LRBv21\n",
-    "\n",
+    "import copy\n",
     "\n",
-    "%load_ext autoreload\n",
-    "%autoreload 2\n",
+    "import matplotlib as mpl\n",
+    "import numpy as np\n",
+    "from fusiondls import LRBv21\n",
+    "from fusiondls.AnalyticCoolingCurves import LfuncKallenbachAr\n",
+    "from matplotlib.collections import LineCollection\n",
+    "from matplotlib.ticker import StrMethodFormatter\n",
     "\n",
     "# Here are some useful labels to use for plotting throughout notebook\n",
     "colors = [\"teal\",\"darkorange\",\"firebrick\",\"limegreen\",\"magenta\",\"cyan\",\"navy\"]\n",

diff --git a/Ex. 4 - Front movement sensitivity.ipynb b/Ex. 4 - Front movement sensitivity.ipynb
@@ -7,20 +7,13 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from netCDF4 import Dataset\n",
-    "import pandas as pd\n",
-    "import numpy as np\n",
+    "import copy\n",
+    "\n",
     "import matplotlib as mpl\n",
-    "from DLScommonTools import *\n",
-    "import os\n",
-    "import pickle as pkl\n",
+    "import numpy as np\n",
+    "from fusiondls import LRBv21, file_read\n",
+    "from fusiondls.AnalyticCoolingCurves import LfuncKallenbachAr\n",
     "from scipy import interpolate\n",
-    "import scipy as sp\n",
-    "from LRBv21 import LRBv21\n",
-    "\n",
-    "\n",
-    "%load_ext autoreload\n",
-    "%autoreload 2\n",
     "\n",
     "# Here are some useful labels to use for plotting throughout notebook\n",
     "colors = [\"teal\",\"darkorange\",\"firebrick\",\"limegreen\",\"magenta\",\"cyan\",\"navy\"]\n",

diff --git a/Ex. 5 - 2D parameter space scan.ipynb b/Ex. 5 - 2D parameter space scan.ipynb
@@ -16,20 +16,15 @@
     }
    ],
    "source": [
-    "from netCDF4 import Dataset\n",
-    "import pandas as pd\n",
-    "import numpy as np\n",
-    "import matplotlib as mpl\n",
-    "from DLScommonTools import *\n",
-    "import os\n",
-    "import pickle as pkl\n",
-    "from scipy import interpolate\n",
-    "import scipy as sp\n",
-    "from LRBv21 import LRBv21\n",
-    "\n",
+    "import copy\n",
     "\n",
-    "%load_ext autoreload\n",
-    "%autoreload 2\n",
+    "import matplotlib as mpl\n",
+    "import matplotlib.pyplot as plt\n",
+    "import numpy as np\n",
+    "from fusiondls import LRBv21, file_read, file_write, make_arrays\n",
+    "from fusiondls.AnalyticCoolingCurves import LfuncKallenbachAr\n",
+    "from fusiondls.DLScommonTools import scale_BxBt, scale_Lc\n",
+    "from matplotlib.ticker import StrMethodFormatter\n",
     "\n",
     "# Here are some useful labels to use for plotting throughout notebook\n",
     "colors = [\"teal\",\"darkorange\",\"firebrick\",\"limegreen\",\"magenta\",\"cyan\",\"navy\"]\n",

diff --git a/tests/test_analytic.py b/tests/test_analytic.py
@@ -1,9 +1,8 @@
-from fusiondls.Analytic_DLS import CfInt
-from fusiondls.DLScommonTools import LfuncN, file_read
-from fusiondls.LRBv21 import LRBv21
+import pathlib
 
 import numpy as np
-import pathlib
+from fusiondls import LfuncN, LRBv21, file_read
+from fusiondls.Analytic_DLS import CfInt
 
 
 def test_analytic():