From c0ad160688c0cc5dfbcbffc83d41c40cd4d782af Mon Sep 17 00:00:00 2001
From: ZexinLee <551901204@qq.com>
Date: Sun, 24 Mar 2019 00:04:52 +0800
Subject: [PATCH 1/5] Refactor code for Mag_Dipole.ipynb
---
geoscilabs/mag/MagDipole.py | 90 ++++++++++++++++++++-
notebooks/mag/Mag_Dipole.ipynb | 141 +++------------------------------
2 files changed, 101 insertions(+), 130 deletions(-)
diff --git a/geoscilabs/mag/MagDipole.py b/geoscilabs/mag/MagDipole.py
index 1184f522..ea5fae54 100644
--- a/geoscilabs/mag/MagDipole.py
+++ b/geoscilabs/mag/MagDipole.py
@@ -1,5 +1,6 @@
import numpy as np
-
+from mpl_toolkits.mplot3d import Axes3D
+import matplotlib.pyplot as plt
def MagneticMonopoleField(obsloc, poleloc=(0.0, 0.0, 0.0), Q=1):
# relative obs. loc. to pole, assuming pole at origin
@@ -88,3 +89,90 @@ def MagneticLongDipoleField(
obsloc, (x2 + dipoleloc[0], y2 + dipoleloc[1], z2 + dipoleloc[2]), Q=-Q
)
return Bx1 + Bx2, By1 + By2, Bz1 + Bz2
+
+def DrawMagneticDipole3D(
+ dipoleloc=(0.,0.,-50.), dipoledec=0., dipoleinc=90., dipoleL=100., obsloc="null", dipolemoment=1.0
+):
+ # define a dipole
+ # dipoleloc = (0.,0.,-50.)
+ # dipoleL = 100.
+ # dipoledec, dipoleinc = 0., 90.
+ # dipolemoment = 1e13
+
+ # geomagnetic field
+ B0, Binc, Bdec = 53600e-9, 90., 0. # in Tesla, degree, degree
+ B0x = B0*np.cos(np.radians(Binc))*np.sin(np.radians(Bdec))
+ B0y = B0*np.cos(np.radians(Binc))*np.cos(np.radians(Bdec))
+ B0z = -B0*np.sin(np.radians(Binc))
+
+ # set observation grid
+ xmin, xmax, ymin, ymax, z = -5., 5., -5., 5., 1. # x, y bounds and elevation
+ profile_x = 0. # x-coordinate of y-profile
+ profile_y = 0. # y-coordinate of x-profile
+ h = 0.2 # grid interval
+ radii = (2., 5.) # how many layers of field lines for plotting
+ Naz = 10 # number of azimuth
+
+ # get field lines
+ linex, liney, linez = MagneticLongDipoleLine(dipoleloc,dipoledec,dipoleinc,dipoleL,radii,Naz)
+
+ # get map
+ xi, yi = np.meshgrid(np.r_[xmin:xmax+h:h], np.r_[ymin:ymax+h:h])
+ x1, y1 = xi.flatten(), yi.flatten()
+ z1 = np.full(x1.shape,z)
+ Bx, By, Bz = np.zeros(len(x1)), np.zeros(len(x1)), np.zeros(len(x1))
+
+ for i in np.arange(len(x1)):
+ Bx[i], By[i], Bz[i] = MagneticLongDipoleField(dipoleloc,dipoledec,dipoleinc,dipoleL,(x1[i],y1[i],z1[i]),dipolemoment)
+ Ba1 = np.dot(np.r_[B0x,B0y,B0z], np.vstack((Bx,By,Bz)))
+
+ # get x-profile
+ x2 = np.r_[xmin:xmax+h:h]
+ y2, z2 = np.full(x2.shape,profile_y), np.full(x2.shape,z)
+ Bx, By, Bz = np.zeros(len(x2)), np.zeros(len(x2)), np.zeros(len(x2))
+ for i in np.arange(len(x2)):
+ Bx[i], By[i], Bz[i] = MagneticLongDipoleField(dipoleloc,dipoledec,dipoleinc,dipoleL,(x2[i],y2[i],z2[i]),dipolemoment)
+ Ba2 = np.dot(np.r_[B0x,B0y,B0z], np.vstack((Bx,By,Bz)))
+
+ # get y-profile
+ y3 = np.r_[ymin:ymax+h:h]
+ x3, z3 = np.full(y3.shape,profile_x), np.full(y3.shape,z)
+ Bx, By, Bz = np.zeros(len(x3)), np.zeros(len(x3)), np.zeros(len(x3))
+ for i in np.arange(len(x3)):
+ Bx[i], By[i], Bz[i] = MagneticLongDipoleField(dipoleloc,dipoledec,dipoleinc,dipoleL,(x3[i],y3[i],z3[i]),dipolemoment)
+ Ba3 = np.dot(np.r_[B0x,B0y,B0z], np.vstack((Bx,By,Bz)))
+
+ fig = plt.figure()
+ ax = fig.gca(projection='3d')
+
+ # plot field lines
+ for lx,ly,lz in zip(linex,liney,linez):
+ ax.plot(lx,ly,lz,'-',markersize=1)
+
+ # plot map
+ ax.scatter(x1,y1,z1,s=2,alpha=0.3)
+ Bt = Ba1.reshape(xi.shape)*1e9 # contour and color scale in nT
+ c = ax.contourf(xi,yi,Bt,alpha=1,zdir='z',offset=z-max(radii)*2,cmap='jet',
+ levels=np.linspace(Bt.min(),Bt.max(),50,endpoint=True))
+ fig.colorbar(c)
+
+ # auto-scaling for profile plot
+ ptpmax = np.max((Ba2.ptp(),Ba3.ptp())) # dynamic range
+ autoscaling = np.max(radii) / ptpmax
+
+ # plot x-profile
+ ax.scatter(x2,y2,z2,s=2,c='black',alpha=0.3)
+ ax.plot(x2,Ba2*autoscaling,zs=ymax,c='black',zdir='y')
+
+ # plot y-profile
+ ax.scatter(x3,y3,z3,s=2,c='black',alpha=0.3)
+ ax.plot(y3,Ba3*autoscaling,zs=xmin,c='black',zdir='x')
+
+ ax.set_xlabel('X')
+ ax.set_ylabel('Y')
+ ax.set_zlabel('Z')
+
+ ax.set_xlim(xmin, xmax)
+ ax.set_ylim(ymin, ymax)
+ ax.set_zlim(z-max(radii)*2, max(radii)*1.5)
+
diff --git a/notebooks/mag/Mag_Dipole.ipynb b/notebooks/mag/Mag_Dipole.ipynb
index 18e7f612..cc11cd53 100644
--- a/notebooks/mag/Mag_Dipole.ipynb
+++ b/notebooks/mag/Mag_Dipole.ipynb
@@ -2,15 +2,18 @@
"cells": [
{
"cell_type": "code",
- "execution_count": 1,
- "metadata": {},
+ "execution_count": 2,
+ "metadata": {
+ "scrolled": false
+ },
"outputs": [],
"source": [
"%matplotlib notebook\n",
- "from mpl_toolkits.mplot3d import Axes3D\n",
- "import matplotlib.pyplot as plt\n",
- "import numpy as np\n",
- "from geoscilabs.mag.MagDipole import MagneticLongDipoleLine, MagneticLongDipoleField"
+ "# from mpl_toolkits.mplot3d import Axes3D\n",
+ "# import matplotlib.pyplot as plt\n",
+ "# import numpy as np\n",
+ "from geoscilabs.mag.MagDipole import DrawMagneticDipole3D\n",
+ "# MagneticLongDipoleLine, MagneticLongDipoleField, "
]
},
{
@@ -27,19 +30,6 @@
"* dipolemoement: $m=\\frac{QL}{\\mu_0}$\n"
]
},
- {
- "cell_type": "code",
- "execution_count": 2,
- "metadata": {},
- "outputs": [],
- "source": [
- "# define a dipole\n",
- "dipoleloc = (0.,0.,-50.)\n",
- "dipoleL = 100.\n",
- "dipoledec, dipoleinc = 0., 90.\n",
- "dipolemoment = 1e13"
- ]
- },
{
"cell_type": "markdown",
"metadata": {},
@@ -51,19 +41,6 @@
"* Bdec: declination of the earth's field"
]
},
- {
- "cell_type": "code",
- "execution_count": 3,
- "metadata": {},
- "outputs": [],
- "source": [
- "# geomagnetic field\n",
- "B0, Binc, Bdec = 53600e-9, 90., 0. # in Tesla, degree, degree\n",
- "B0x = B0*np.cos(np.radians(Binc))*np.sin(np.radians(Bdec))\n",
- "B0y = B0*np.cos(np.radians(Binc))*np.cos(np.radians(Bdec))\n",
- "B0z = -B0*np.sin(np.radians(Binc))"
- ]
- },
{
"cell_type": "markdown",
"metadata": {},
@@ -78,21 +55,6 @@
"* Naz: number of azimuth angles for the field line"
]
},
- {
- "cell_type": "code",
- "execution_count": 4,
- "metadata": {},
- "outputs": [],
- "source": [
- "# set observation grid\n",
- "xmin, xmax, ymin, ymax, z = -5., 5., -5., 5., 1. # x, y bounds and elevation\n",
- "profile_x = 0. # x-coordinate of y-profile\n",
- "profile_y = 0. # y-coordinate of x-profile\n",
- "h = 0.2 # grid interval\n",
- "radii = (2., 5.) # how many layers of field lines for plotting\n",
- "Naz = 10 # number of azimuth"
- ]
- },
{
"cell_type": "markdown",
"metadata": {},
@@ -100,42 +62,6 @@
"### Calculate data for plotting"
]
},
- {
- "cell_type": "code",
- "execution_count": 5,
- "metadata": {},
- "outputs": [],
- "source": [
- "# get field lines\n",
- "linex, liney, linez = MagneticLongDipoleLine(dipoleloc,dipoledec,dipoleinc,dipoleL,radii,Naz)\n",
- "\n",
- "# get map\n",
- "xi, yi = np.meshgrid(np.r_[xmin:xmax+h:h], np.r_[ymin:ymax+h:h])\n",
- "x1, y1 = xi.flatten(), yi.flatten()\n",
- "z1 = np.full(x1.shape,z)\n",
- "Bx, By, Bz = np.zeros(len(x1)), np.zeros(len(x1)), np.zeros(len(x1))\n",
- "\n",
- "for i in np.arange(len(x1)):\n",
- " Bx[i], By[i], Bz[i] = MagneticLongDipoleField(dipoleloc,dipoledec,dipoleinc,dipoleL,(x1[i],y1[i],z1[i]),dipolemoment)\n",
- "Ba1 = np.dot(np.r_[B0x,B0y,B0z], np.vstack((Bx,By,Bz)))\n",
- "\n",
- "# get x-profile\n",
- "x2 = np.r_[xmin:xmax+h:h]\n",
- "y2, z2 = np.full(x2.shape,profile_y), np.full(x2.shape,z)\n",
- "Bx, By, Bz = np.zeros(len(x2)), np.zeros(len(x2)), np.zeros(len(x2))\n",
- "for i in np.arange(len(x2)):\n",
- " Bx[i], By[i], Bz[i] = MagneticLongDipoleField(dipoleloc,dipoledec,dipoleinc,dipoleL,(x2[i],y2[i],z2[i]),dipolemoment)\n",
- "Ba2 = np.dot(np.r_[B0x,B0y,B0z], np.vstack((Bx,By,Bz)))\n",
- "\n",
- "# get y-profile\n",
- "y3 = np.r_[ymin:ymax+h:h]\n",
- "x3, z3 = np.full(y3.shape,profile_x), np.full(y3.shape,z)\n",
- "Bx, By, Bz = np.zeros(len(x3)), np.zeros(len(x3)), np.zeros(len(x3))\n",
- "for i in np.arange(len(x3)):\n",
- " Bx[i], By[i], Bz[i] = MagneticLongDipoleField(dipoleloc,dipoledec,dipoleinc,dipoleL,(x3[i],y3[i],z3[i]),dipolemoment)\n",
- "Ba3 = np.dot(np.r_[B0x,B0y,B0z], np.vstack((Bx,By,Bz)))"
- ]
- },
{
"cell_type": "markdown",
"metadata": {},
@@ -148,7 +74,7 @@
},
{
"cell_type": "code",
- "execution_count": 6,
+ "execution_count": 3,
"metadata": {},
"outputs": [
{
@@ -934,7 +860,7 @@
{
"data": {
"text/html": [
- ""
+ ""
],
"text/plain": [
""
@@ -942,53 +868,10 @@
},
"metadata": {},
"output_type": "display_data"
- },
- {
- "data": {
- "text/plain": [
- "(-9.0, 7.5)"
- ]
- },
- "execution_count": 6,
- "metadata": {},
- "output_type": "execute_result"
}
],
"source": [
- "fig = plt.figure()\n",
- "ax = fig.gca(projection='3d')\n",
- "\n",
- "# plot field lines\n",
- "for lx,ly,lz in zip(linex,liney,linez):\n",
- " ax.plot(lx,ly,lz,'-',markersize=1)\n",
- "\n",
- "# plot map\n",
- "ax.scatter(x1,y1,z1,s=2,alpha=0.3)\n",
- "Bt = Ba1.reshape(xi.shape)*1e9 # contour and color scale in nT \n",
- "c = ax.contourf(xi,yi,Bt,alpha=1,zdir='z',offset=z-max(radii)*2,cmap='jet',\n",
- " levels=np.linspace(Bt.min(),Bt.max(),50,endpoint=True))\n",
- "fig.colorbar(c)\n",
- "\n",
- "# auto-scaling for profile plot\n",
- "ptpmax = np.max((Ba2.ptp(),Ba3.ptp())) # dynamic range\n",
- "autoscaling = np.max(radii) / ptpmax\n",
- "\n",
- "# plot x-profile\n",
- "ax.scatter(x2,y2,z2,s=2,c='black',alpha=0.3)\n",
- "ax.plot(x2,Ba2*autoscaling,zs=ymax,c='black',zdir='y')\n",
- "\n",
- "# plot y-profile\n",
- "ax.scatter(x3,y3,z3,s=2,c='black',alpha=0.3)\n",
- "ax.plot(y3,Ba3*autoscaling,zs=xmin,c='black',zdir='x')\n",
- "\n",
- "ax.set_xlabel('X')\n",
- "ax.set_ylabel('Y')\n",
- "ax.set_zlabel('Z')\n",
- "\n",
- "ax.set_xlim(xmin, xmax)\n",
- "ax.set_ylim(ymin, ymax)\n",
- "ax.set_zlim(z-max(radii)*2, max(radii)*1.5)\n",
- "\n"
+ "DrawMagneticDipole3D()"
]
},
{
From f77567e615a156943f2f9f53799efe41c086ded5 Mon Sep 17 00:00:00 2001
From: wwzzyyzzrr
Date: Fri, 29 Mar 2019 23:29:00 +0800
Subject: [PATCH 2/5] Modify MagDipole
---
geoscilabs/mag/MagDipole.py | 211 +++++++--
notebooks/mag/Mag_Dipole.ipynb | 832 ++-------------------------------
2 files changed, 217 insertions(+), 826 deletions(-)
diff --git a/geoscilabs/mag/MagDipole.py b/geoscilabs/mag/MagDipole.py
index ea5fae54..2a39f13b 100644
--- a/geoscilabs/mag/MagDipole.py
+++ b/geoscilabs/mag/MagDipole.py
@@ -1,7 +1,21 @@
import numpy as np
from mpl_toolkits.mplot3d import Axes3D
import matplotlib.pyplot as plt
-
+from ipywidgets import (
+ interactive,
+ IntSlider,
+ widget,
+ FloatText,
+ FloatSlider,
+ ToggleButton,
+ VBox,
+ HBox,
+ Output,
+ interactive_output,
+ Layout,
+ FloatRangeSlider,
+ Checkbox
+)
def MagneticMonopoleField(obsloc, poleloc=(0.0, 0.0, 0.0), Q=1):
# relative obs. loc. to pole, assuming pole at origin
dx, dy, dz = obsloc[0] - poleloc[0], obsloc[1] - poleloc[1], obsloc[2] - poleloc[2]
@@ -91,22 +105,19 @@ def MagneticLongDipoleField(
return Bx1 + Bx2, By1 + By2, Bz1 + Bz2
def DrawMagneticDipole3D(
- dipoleloc=(0.,0.,-50.), dipoledec=0., dipoleinc=90., dipoleL=100., obsloc="null", dipolemoment=1.0
+ dipoleLoc_X=0.,dipoleLoc_Y=0.,dipoleLoc_Z=-50., dipoledec=0., dipoleinc=90., dipoleL=100., dipolemoment=1.0, B0=53600e-9 , Binc=90., Bdec=0,
+ xStart=-3, xEnd=3, yStart=-3,yEnd=3,
+ showField =True,showCurve=True,showLocation=True,showStrength=True
):
- # define a dipole
- # dipoleloc = (0.,0.,-50.)
- # dipoleL = 100.
- # dipoledec, dipoleinc = 0., 90.
- # dipolemoment = 1e13
-
- # geomagnetic field
- B0, Binc, Bdec = 53600e-9, 90., 0. # in Tesla, degree, degree
+ dipoleloc=(dipoleLoc_X,dipoleLoc_Y,dipoleLoc_Z);
B0x = B0*np.cos(np.radians(Binc))*np.sin(np.radians(Bdec))
B0y = B0*np.cos(np.radians(Binc))*np.cos(np.radians(Bdec))
B0z = -B0*np.sin(np.radians(Binc))
# set observation grid
- xmin, xmax, ymin, ymax, z = -5., 5., -5., 5., 1. # x, y bounds and elevation
+ z = 1. # x, y bounds and elevation
+ ymin=xmin = min(xStart,yStart)
+ ymax=xmax = max(xEnd,yEnd)
profile_x = 0. # x-coordinate of y-profile
profile_y = 0. # y-coordinate of x-profile
h = 0.2 # grid interval
@@ -117,7 +128,7 @@ def DrawMagneticDipole3D(
linex, liney, linez = MagneticLongDipoleLine(dipoleloc,dipoledec,dipoleinc,dipoleL,radii,Naz)
# get map
- xi, yi = np.meshgrid(np.r_[xmin:xmax+h:h], np.r_[ymin:ymax+h:h])
+ xi, yi = np.meshgrid(np.r_[xStart:xEnd+h:h], np.r_[yStart:yEnd+h:h])
x1, y1 = xi.flatten(), yi.flatten()
z1 = np.full(x1.shape,z)
Bx, By, Bz = np.zeros(len(x1)), np.zeros(len(x1)), np.zeros(len(x1))
@@ -127,7 +138,7 @@ def DrawMagneticDipole3D(
Ba1 = np.dot(np.r_[B0x,B0y,B0z], np.vstack((Bx,By,Bz)))
# get x-profile
- x2 = np.r_[xmin:xmax+h:h]
+ x2 = np.r_[xStart:xEnd+h:h]
y2, z2 = np.full(x2.shape,profile_y), np.full(x2.shape,z)
Bx, By, Bz = np.zeros(len(x2)), np.zeros(len(x2)), np.zeros(len(x2))
for i in np.arange(len(x2)):
@@ -135,7 +146,7 @@ def DrawMagneticDipole3D(
Ba2 = np.dot(np.r_[B0x,B0y,B0z], np.vstack((Bx,By,Bz)))
# get y-profile
- y3 = np.r_[ymin:ymax+h:h]
+ y3 = np.r_[yStart:yEnd+h:h]
x3, z3 = np.full(y3.shape,profile_x), np.full(y3.shape,z)
Bx, By, Bz = np.zeros(len(x3)), np.zeros(len(x3)), np.zeros(len(x3))
for i in np.arange(len(x3)):
@@ -145,28 +156,32 @@ def DrawMagneticDipole3D(
fig = plt.figure()
ax = fig.gca(projection='3d')
- # plot field lines
- for lx,ly,lz in zip(linex,liney,linez):
- ax.plot(lx,ly,lz,'-',markersize=1)
-
- # plot map
- ax.scatter(x1,y1,z1,s=2,alpha=0.3)
- Bt = Ba1.reshape(xi.shape)*1e9 # contour and color scale in nT
- c = ax.contourf(xi,yi,Bt,alpha=1,zdir='z',offset=z-max(radii)*2,cmap='jet',
- levels=np.linspace(Bt.min(),Bt.max(),50,endpoint=True))
- fig.colorbar(c)
+ if showField:
+ # plot field lines
+ for lx,ly,lz in zip(linex,liney,linez):
+ ax.plot(lx,ly,lz,'-',markersize=1, zorder=100)
- # auto-scaling for profile plot
- ptpmax = np.max((Ba2.ptp(),Ba3.ptp())) # dynamic range
- autoscaling = np.max(radii) / ptpmax
+ if showLocation:
+ ax.scatter(x1,y1,z1,s=2,alpha=0.3)
+
+ if showStrength:
+ # plot map
+ Bt = Ba1.reshape(xi.shape)*1e9 # contour and color scale in nT
+ c = ax.contourf(xi,yi,Bt,alpha=1,zdir='z',offset=z-max(radii)*2,cmap='jet',
+ levels=np.linspace(Bt.min(),Bt.max(),50,endpoint=True),zorder = 0)
+ fig.colorbar(c)
- # plot x-profile
- ax.scatter(x2,y2,z2,s=2,c='black',alpha=0.3)
- ax.plot(x2,Ba2*autoscaling,zs=ymax,c='black',zdir='y')
+ if showCurve:
+ # auto-scaling for profile plot
+ ptpmax = np.max((Ba2.ptp(),Ba3.ptp())) # dynamic range
+ autoscaling = np.max(radii) / ptpmax
+ # plot x-profile
+ ax.scatter(x2,y2,z2,s=2,c='black',alpha=0.3)
+ ax.plot(x2,Ba2*autoscaling,zs=ymax,c='black',zdir='y')
- # plot y-profile
- ax.scatter(x3,y3,z3,s=2,c='black',alpha=0.3)
- ax.plot(y3,Ba3*autoscaling,zs=xmin,c='black',zdir='x')
+ # plot y-profile
+ ax.scatter(x3,y3,z3,s=2,c='black',alpha=0.3)
+ ax.plot(y3,Ba3*autoscaling,zs=xmin,c='black',zdir='x')
ax.set_xlabel('X')
ax.set_ylabel('Y')
@@ -175,4 +190,134 @@ def DrawMagneticDipole3D(
ax.set_xlim(xmin, xmax)
ax.set_ylim(ymin, ymax)
ax.set_zlim(z-max(radii)*2, max(radii)*1.5)
+
+
+# draw the widgets
+def interact_pic():
+ dipoleLoc_X=FloatText(
+ value=0,
+ description='X',
+ disabled=False
+ )
+ dipoleLoc_Y=FloatText(
+ value=0,
+ description='Y',
+ disabled=False
+ )
+ dipoleLoc_Z=FloatText(
+ value=-50.,
+ description='Z',
+ disabled=False
+ )
+ dipoleL=FloatText(
+ value=100.,
+ description='Length',
+ disabled=False
+ )
+ dipoleDec=FloatText(
+ value=0,
+ description='dipoleDec',
+ disabled=False
+ )
+ dipoleInc=FloatText(
+ value=90.,
+ description='dipoleInc',
+ disabled=False
+ )
+ dipolemoment=FloatText(
+ value=1.,
+ description='Dipolemoment',
+ disabled=False
+ )
+ B0 = FloatText(
+ value=53600e-9,
+ description=r"$B_0$",
+ disabled=False
+ )
+ Binc = FloatText(
+ value=90,
+ description="Binc",
+ disabled=False
+ )
+ Bdec = FloatText(
+ value=0,
+ description="Bdec",
+ disabled=False
+ )
+ xStart = FloatText(
+ value=-3,
+ description="xStart",
+ disabled=False
+ )
+ xEnd = FloatText(
+ value=3,
+ description="xEnd",
+ disabled=False
+ )
+ yStart = FloatText(
+ value=-3,
+ description="yStart",
+ disabled=False
+ )
+ yEnd = FloatText(
+ value=3,
+ description="yEnd",
+ disabled=False
+ )
+
+ showField = Checkbox(
+ value=True,
+ description='Show the Field',
+ disabled=False
+ )
+ showCurve = Checkbox(
+ value=True,
+ description='Show the Black Curve',
+ disabled=False
+ )
+ showLocation = Checkbox(
+ value=True,
+ description='Show the Location of the Point',
+ disabled=False
+ )
+ showStrength = Checkbox(
+ value=True,
+ description='Show the Field Strength Figure',
+ disabled=False
+ )
+
+
+
+ out1 = HBox([dipoleLoc_X,dipoleLoc_Y,dipoleLoc_Z])
+ out2 = HBox([dipoleDec, dipoleInc])
+ out3 = HBox([dipoleL])
+ out4 = HBox([dipolemoment])
+ out5 = HBox([B0,Binc,Bdec])
+ out6 = HBox([xStart,xEnd])
+ out7 = HBox([yStart,yEnd])
+ out8 = VBox([showField,showCurve, showLocation, showStrength])
+ out = interactive_output(
+ DrawMagneticDipole3D,
+ {
+ "dipoleLoc_X":dipoleLoc_X,
+ "dipoleLoc_Y":dipoleLoc_Y,
+ "dipoleLoc_Z":dipoleLoc_Z,
+ "dipoledec": dipoleDec,
+ "dipoleinc": dipoleInc,
+ "dipoleL": dipoleL,
+ "dipolemoment": dipolemoment,
+ "B0":B0,
+ "Binc":Binc,
+ "Bdec":Bdec,
+ "xStart":xStart,
+ "xEnd":xEnd,
+ "yStart":yStart,
+ "yEnd":yEnd,
+ "showField":showField,
+ "showCurve":showCurve,
+ "showLocation":showLocation,
+ "showStrength":showStrength,
+ },
+ )
+ return VBox([out1,out2,out3,out4,out5,out6,out7,HBox([out, out8])])
\ No newline at end of file
diff --git a/notebooks/mag/Mag_Dipole.ipynb b/notebooks/mag/Mag_Dipole.ipynb
index cc11cd53..29d4c047 100644
--- a/notebooks/mag/Mag_Dipole.ipynb
+++ b/notebooks/mag/Mag_Dipole.ipynb
@@ -2,18 +2,14 @@
"cells": [
{
"cell_type": "code",
- "execution_count": 2,
+ "execution_count": 1,
"metadata": {
"scrolled": false
},
"outputs": [],
"source": [
"%matplotlib notebook\n",
- "# from mpl_toolkits.mplot3d import Axes3D\n",
- "# import matplotlib.pyplot as plt\n",
- "# import numpy as np\n",
- "from geoscilabs.mag.MagDipole import DrawMagneticDipole3D\n",
- "# MagneticLongDipoleLine, MagneticLongDipoleField, "
+ "from geoscilabs.mag.MagDipole import interact_pic"
]
},
{
@@ -74,796 +70,18 @@
},
{
"cell_type": "code",
- "execution_count": 3,
+ "execution_count": 2,
"metadata": {},
"outputs": [
{
"data": {
- "application/javascript": [
- "/* Put everything inside the global mpl namespace */\n",
- "window.mpl = {};\n",
- "\n",
- "\n",
- "mpl.get_websocket_type = function() {\n",
- " if (typeof(WebSocket) !== 'undefined') {\n",
- " return WebSocket;\n",
- " } else if (typeof(MozWebSocket) !== 'undefined') {\n",
- " return MozWebSocket;\n",
- " } else {\n",
- " alert('Your browser does not have WebSocket support.' +\n",
- " 'Please try Chrome, Safari or Firefox ≥ 6. ' +\n",
- " 'Firefox 4 and 5 are also supported but you ' +\n",
- " 'have to enable WebSockets in about:config.');\n",
- " };\n",
- "}\n",
- "\n",
- "mpl.figure = function(figure_id, websocket, ondownload, parent_element) {\n",
- " this.id = figure_id;\n",
- "\n",
- " this.ws = websocket;\n",
- "\n",
- " this.supports_binary = (this.ws.binaryType != undefined);\n",
- "\n",
- " if (!this.supports_binary) {\n",
- " var warnings = document.getElementById(\"mpl-warnings\");\n",
- " if (warnings) {\n",
- " warnings.style.display = 'block';\n",
- " warnings.textContent = (\n",
- " \"This browser does not support binary websocket messages. \" +\n",
- " \"Performance may be slow.\");\n",
- " }\n",
- " }\n",
- "\n",
- " this.imageObj = new Image();\n",
- "\n",
- " this.context = undefined;\n",
- " this.message = undefined;\n",
- " this.canvas = undefined;\n",
- " this.rubberband_canvas = undefined;\n",
- " this.rubberband_context = undefined;\n",
- " this.format_dropdown = undefined;\n",
- "\n",
- " this.image_mode = 'full';\n",
- "\n",
- " this.root = $('');\n",
- " this._root_extra_style(this.root)\n",
- " this.root.attr('style', 'display: inline-block');\n",
- "\n",
- " $(parent_element).append(this.root);\n",
- "\n",
- " this._init_header(this);\n",
- " this._init_canvas(this);\n",
- " this._init_toolbar(this);\n",
- "\n",
- " var fig = this;\n",
- "\n",
- " this.waiting = false;\n",
- "\n",
- " this.ws.onopen = function () {\n",
- " fig.send_message(\"supports_binary\", {value: fig.supports_binary});\n",
- " fig.send_message(\"send_image_mode\", {});\n",
- " if (mpl.ratio != 1) {\n",
- " fig.send_message(\"set_dpi_ratio\", {'dpi_ratio': mpl.ratio});\n",
- " }\n",
- " fig.send_message(\"refresh\", {});\n",
- " }\n",
- "\n",
- " this.imageObj.onload = function() {\n",
- " if (fig.image_mode == 'full') {\n",
- " // Full images could contain transparency (where diff images\n",
- " // almost always do), so we need to clear the canvas so that\n",
- " // there is no ghosting.\n",
- " fig.context.clearRect(0, 0, fig.canvas.width, fig.canvas.height);\n",
- " }\n",
- " fig.context.drawImage(fig.imageObj, 0, 0);\n",
- " };\n",
- "\n",
- " this.imageObj.onunload = function() {\n",
- " fig.ws.close();\n",
- " }\n",
- "\n",
- " this.ws.onmessage = this._make_on_message_function(this);\n",
- "\n",
- " this.ondownload = ondownload;\n",
- "}\n",
- "\n",
- "mpl.figure.prototype._init_header = function() {\n",
- " var titlebar = $(\n",
- " '');\n",
- " var titletext = $(\n",
- " '');\n",
- " titlebar.append(titletext)\n",
- " this.root.append(titlebar);\n",
- " this.header = titletext[0];\n",
- "}\n",
- "\n",
- "\n",
- "\n",
- "mpl.figure.prototype._canvas_extra_style = function(canvas_div) {\n",
- "\n",
- "}\n",
- "\n",
- "\n",
- "mpl.figure.prototype._root_extra_style = function(canvas_div) {\n",
- "\n",
- "}\n",
- "\n",
- "mpl.figure.prototype._init_canvas = function() {\n",
- " var fig = this;\n",
- "\n",
- " var canvas_div = $('');\n",
- "\n",
- " canvas_div.attr('style', 'position: relative; clear: both; outline: 0');\n",
- "\n",
- " function canvas_keyboard_event(event) {\n",
- " return fig.key_event(event, event['data']);\n",
- " }\n",
- "\n",
- " canvas_div.keydown('key_press', canvas_keyboard_event);\n",
- " canvas_div.keyup('key_release', canvas_keyboard_event);\n",
- " this.canvas_div = canvas_div\n",
- " this._canvas_extra_style(canvas_div)\n",
- " this.root.append(canvas_div);\n",
- "\n",
- " var canvas = $('');\n",
- " canvas.addClass('mpl-canvas');\n",
- " canvas.attr('style', \"left: 0; top: 0; z-index: 0; outline: 0\")\n",
- "\n",
- " this.canvas = canvas[0];\n",
- " this.context = canvas[0].getContext(\"2d\");\n",
- "\n",
- " var backingStore = this.context.backingStorePixelRatio ||\n",
- "\tthis.context.webkitBackingStorePixelRatio ||\n",
- "\tthis.context.mozBackingStorePixelRatio ||\n",
- "\tthis.context.msBackingStorePixelRatio ||\n",
- "\tthis.context.oBackingStorePixelRatio ||\n",
- "\tthis.context.backingStorePixelRatio || 1;\n",
- "\n",
- " mpl.ratio = (window.devicePixelRatio || 1) / backingStore;\n",
- "\n",
- " var rubberband = $('');\n",
- " rubberband.attr('style', \"position: absolute; left: 0; top: 0; z-index: 1;\")\n",
- "\n",
- " var pass_mouse_events = true;\n",
- "\n",
- " canvas_div.resizable({\n",
- " start: function(event, ui) {\n",
- " pass_mouse_events = false;\n",
- " },\n",
- " resize: function(event, ui) {\n",
- " fig.request_resize(ui.size.width, ui.size.height);\n",
- " },\n",
- " stop: function(event, ui) {\n",
- " pass_mouse_events = true;\n",
- " fig.request_resize(ui.size.width, ui.size.height);\n",
- " },\n",
- " });\n",
- "\n",
- " function mouse_event_fn(event) {\n",
- " if (pass_mouse_events)\n",
- " return fig.mouse_event(event, event['data']);\n",
- " }\n",
- "\n",
- " rubberband.mousedown('button_press', mouse_event_fn);\n",
- " rubberband.mouseup('button_release', mouse_event_fn);\n",
- " // Throttle sequential mouse events to 1 every 20ms.\n",
- " rubberband.mousemove('motion_notify', mouse_event_fn);\n",
- "\n",
- " rubberband.mouseenter('figure_enter', mouse_event_fn);\n",
- " rubberband.mouseleave('figure_leave', mouse_event_fn);\n",
- "\n",
- " canvas_div.on(\"wheel\", function (event) {\n",
- " event = event.originalEvent;\n",
- " event['data'] = 'scroll'\n",
- " if (event.deltaY < 0) {\n",
- " event.step = 1;\n",
- " } else {\n",
- " event.step = -1;\n",
- " }\n",
- " mouse_event_fn(event);\n",
- " });\n",
- "\n",
- " canvas_div.append(canvas);\n",
- " canvas_div.append(rubberband);\n",
- "\n",
- " this.rubberband = rubberband;\n",
- " this.rubberband_canvas = rubberband[0];\n",
- " this.rubberband_context = rubberband[0].getContext(\"2d\");\n",
- " this.rubberband_context.strokeStyle = \"#000000\";\n",
- "\n",
- " this._resize_canvas = function(width, height) {\n",
- " // Keep the size of the canvas, canvas container, and rubber band\n",
- " // canvas in synch.\n",
- " canvas_div.css('width', width)\n",
- " canvas_div.css('height', height)\n",
- "\n",
- " canvas.attr('width', width * mpl.ratio);\n",
- " canvas.attr('height', height * mpl.ratio);\n",
- " canvas.attr('style', 'width: ' + width + 'px; height: ' + height + 'px;');\n",
- "\n",
- " rubberband.attr('width', width);\n",
- " rubberband.attr('height', height);\n",
- " }\n",
- "\n",
- " // Set the figure to an initial 600x600px, this will subsequently be updated\n",
- " // upon first draw.\n",
- " this._resize_canvas(600, 600);\n",
- "\n",
- " // Disable right mouse context menu.\n",
- " $(this.rubberband_canvas).bind(\"contextmenu\",function(e){\n",
- " return false;\n",
- " });\n",
- "\n",
- " function set_focus () {\n",
- " canvas.focus();\n",
- " canvas_div.focus();\n",
- " }\n",
- "\n",
- " window.setTimeout(set_focus, 100);\n",
- "}\n",
- "\n",
- "mpl.figure.prototype._init_toolbar = function() {\n",
- " var fig = this;\n",
- "\n",
- " var nav_element = $('')\n",
- " nav_element.attr('style', 'width: 100%');\n",
- " this.root.append(nav_element);\n",
- "\n",
- " // Define a callback function for later on.\n",
- " function toolbar_event(event) {\n",
- " return fig.toolbar_button_onclick(event['data']);\n",
- " }\n",
- " function toolbar_mouse_event(event) {\n",
- " return fig.toolbar_button_onmouseover(event['data']);\n",
- " }\n",
- "\n",
- " for(var toolbar_ind in mpl.toolbar_items) {\n",
- " var name = mpl.toolbar_items[toolbar_ind][0];\n",
- " var tooltip = mpl.toolbar_items[toolbar_ind][1];\n",
- " var image = mpl.toolbar_items[toolbar_ind][2];\n",
- " var method_name = mpl.toolbar_items[toolbar_ind][3];\n",
- "\n",
- " if (!name) {\n",
- " // put a spacer in here.\n",
- " continue;\n",
- " }\n",
- " var button = $('');\n",
- " button.addClass('ui-button ui-widget ui-state-default ui-corner-all ' +\n",
- " 'ui-button-icon-only');\n",
- " button.attr('role', 'button');\n",
- " button.attr('aria-disabled', 'false');\n",
- " button.click(method_name, toolbar_event);\n",
- " button.mouseover(tooltip, toolbar_mouse_event);\n",
- "\n",
- " var icon_img = $('');\n",
- " icon_img.addClass('ui-button-icon-primary ui-icon');\n",
- " icon_img.addClass(image);\n",
- " icon_img.addClass('ui-corner-all');\n",
- "\n",
- " var tooltip_span = $('');\n",
- " tooltip_span.addClass('ui-button-text');\n",
- " tooltip_span.html(tooltip);\n",
- "\n",
- " button.append(icon_img);\n",
- " button.append(tooltip_span);\n",
- "\n",
- " nav_element.append(button);\n",
- " }\n",
- "\n",
- " var fmt_picker_span = $('');\n",
- "\n",
- " var fmt_picker = $('');\n",
- " fmt_picker.addClass('mpl-toolbar-option ui-widget ui-widget-content');\n",
- " fmt_picker_span.append(fmt_picker);\n",
- " nav_element.append(fmt_picker_span);\n",
- " this.format_dropdown = fmt_picker[0];\n",
- "\n",
- " for (var ind in mpl.extensions) {\n",
- " var fmt = mpl.extensions[ind];\n",
- " var option = $(\n",
- " '', {selected: fmt === mpl.default_extension}).html(fmt);\n",
- " fmt_picker.append(option)\n",
- " }\n",
- "\n",
- " // Add hover states to the ui-buttons\n",
- " $( \".ui-button\" ).hover(\n",
- " function() { $(this).addClass(\"ui-state-hover\");},\n",
- " function() { $(this).removeClass(\"ui-state-hover\");}\n",
- " );\n",
- "\n",
- " var status_bar = $('');\n",
- " nav_element.append(status_bar);\n",
- " this.message = status_bar[0];\n",
- "}\n",
- "\n",
- "mpl.figure.prototype.request_resize = function(x_pixels, y_pixels) {\n",
- " // Request matplotlib to resize the figure. Matplotlib will then trigger a resize in the client,\n",
- " // which will in turn request a refresh of the image.\n",
- " this.send_message('resize', {'width': x_pixels, 'height': y_pixels});\n",
- "}\n",
- "\n",
- "mpl.figure.prototype.send_message = function(type, properties) {\n",
- " properties['type'] = type;\n",
- " properties['figure_id'] = this.id;\n",
- " this.ws.send(JSON.stringify(properties));\n",
- "}\n",
- "\n",
- "mpl.figure.prototype.send_draw_message = function() {\n",
- " if (!this.waiting) {\n",
- " this.waiting = true;\n",
- " this.ws.send(JSON.stringify({type: \"draw\", figure_id: this.id}));\n",
- " }\n",
- "}\n",
- "\n",
- "\n",
- "mpl.figure.prototype.handle_save = function(fig, msg) {\n",
- " var format_dropdown = fig.format_dropdown;\n",
- " var format = format_dropdown.options[format_dropdown.selectedIndex].value;\n",
- " fig.ondownload(fig, format);\n",
- "}\n",
- "\n",
- "\n",
- "mpl.figure.prototype.handle_resize = function(fig, msg) {\n",
- " var size = msg['size'];\n",
- " if (size[0] != fig.canvas.width || size[1] != fig.canvas.height) {\n",
- " fig._resize_canvas(size[0], size[1]);\n",
- " fig.send_message(\"refresh\", {});\n",
- " };\n",
- "}\n",
- "\n",
- "mpl.figure.prototype.handle_rubberband = function(fig, msg) {\n",
- " var x0 = msg['x0'] / mpl.ratio;\n",
- " var y0 = (fig.canvas.height - msg['y0']) / mpl.ratio;\n",
- " var x1 = msg['x1'] / mpl.ratio;\n",
- " var y1 = (fig.canvas.height - msg['y1']) / mpl.ratio;\n",
- " x0 = Math.floor(x0) + 0.5;\n",
- " y0 = Math.floor(y0) + 0.5;\n",
- " x1 = Math.floor(x1) + 0.5;\n",
- " y1 = Math.floor(y1) + 0.5;\n",
- " var min_x = Math.min(x0, x1);\n",
- " var min_y = Math.min(y0, y1);\n",
- " var width = Math.abs(x1 - x0);\n",
- " var height = Math.abs(y1 - y0);\n",
- "\n",
- " fig.rubberband_context.clearRect(\n",
- " 0, 0, fig.canvas.width, fig.canvas.height);\n",
- "\n",
- " fig.rubberband_context.strokeRect(min_x, min_y, width, height);\n",
- "}\n",
- "\n",
- "mpl.figure.prototype.handle_figure_label = function(fig, msg) {\n",
- " // Updates the figure title.\n",
- " fig.header.textContent = msg['label'];\n",
- "}\n",
- "\n",
- "mpl.figure.prototype.handle_cursor = function(fig, msg) {\n",
- " var cursor = msg['cursor'];\n",
- " switch(cursor)\n",
- " {\n",
- " case 0:\n",
- " cursor = 'pointer';\n",
- " break;\n",
- " case 1:\n",
- " cursor = 'default';\n",
- " break;\n",
- " case 2:\n",
- " cursor = 'crosshair';\n",
- " break;\n",
- " case 3:\n",
- " cursor = 'move';\n",
- " break;\n",
- " }\n",
- " fig.rubberband_canvas.style.cursor = cursor;\n",
- "}\n",
- "\n",
- "mpl.figure.prototype.handle_message = function(fig, msg) {\n",
- " fig.message.textContent = msg['message'];\n",
- "}\n",
- "\n",
- "mpl.figure.prototype.handle_draw = function(fig, msg) {\n",
- " // Request the server to send over a new figure.\n",
- " fig.send_draw_message();\n",
- "}\n",
- "\n",
- "mpl.figure.prototype.handle_image_mode = function(fig, msg) {\n",
- " fig.image_mode = msg['mode'];\n",
- "}\n",
- "\n",
- "mpl.figure.prototype.updated_canvas_event = function() {\n",
- " // Called whenever the canvas gets updated.\n",
- " this.send_message(\"ack\", {});\n",
- "}\n",
- "\n",
- "// A function to construct a web socket function for onmessage handling.\n",
- "// Called in the figure constructor.\n",
- "mpl.figure.prototype._make_on_message_function = function(fig) {\n",
- " return function socket_on_message(evt) {\n",
- " if (evt.data instanceof Blob) {\n",
- " /* FIXME: We get \"Resource interpreted as Image but\n",
- " * transferred with MIME type text/plain:\" errors on\n",
- " * Chrome. But how to set the MIME type? It doesn't seem\n",
- " * to be part of the websocket stream */\n",
- " evt.data.type = \"image/png\";\n",
- "\n",
- " /* Free the memory for the previous frames */\n",
- " if (fig.imageObj.src) {\n",
- " (window.URL || window.webkitURL).revokeObjectURL(\n",
- " fig.imageObj.src);\n",
- " }\n",
- "\n",
- " fig.imageObj.src = (window.URL || window.webkitURL).createObjectURL(\n",
- " evt.data);\n",
- " fig.updated_canvas_event();\n",
- " fig.waiting = false;\n",
- " return;\n",
- " }\n",
- " else if (typeof evt.data === 'string' && evt.data.slice(0, 21) == \"data:image/png;base64\") {\n",
- " fig.imageObj.src = evt.data;\n",
- " fig.updated_canvas_event();\n",
- " fig.waiting = false;\n",
- " return;\n",
- " }\n",
- "\n",
- " var msg = JSON.parse(evt.data);\n",
- " var msg_type = msg['type'];\n",
- "\n",
- " // Call the \"handle_{type}\" callback, which takes\n",
- " // the figure and JSON message as its only arguments.\n",
- " try {\n",
- " var callback = fig[\"handle_\" + msg_type];\n",
- " } catch (e) {\n",
- " console.log(\"No handler for the '\" + msg_type + \"' message type: \", msg);\n",
- " return;\n",
- " }\n",
- "\n",
- " if (callback) {\n",
- " try {\n",
- " // console.log(\"Handling '\" + msg_type + \"' message: \", msg);\n",
- " callback(fig, msg);\n",
- " } catch (e) {\n",
- " console.log(\"Exception inside the 'handler_\" + msg_type + \"' callback:\", e, e.stack, msg);\n",
- " }\n",
- " }\n",
- " };\n",
- "}\n",
- "\n",
- "// from http://stackoverflow.com/questions/1114465/getting-mouse-location-in-canvas\n",
- "mpl.findpos = function(e) {\n",
- " //this section is from http://www.quirksmode.org/js/events_properties.html\n",
- " var targ;\n",
- " if (!e)\n",
- " e = window.event;\n",
- " if (e.target)\n",
- " targ = e.target;\n",
- " else if (e.srcElement)\n",
- " targ = e.srcElement;\n",
- " if (targ.nodeType == 3) // defeat Safari bug\n",
- " targ = targ.parentNode;\n",
- "\n",
- " // jQuery normalizes the pageX and pageY\n",
- " // pageX,Y are the mouse positions relative to the document\n",
- " // offset() returns the position of the element relative to the document\n",
- " var x = e.pageX - $(targ).offset().left;\n",
- " var y = e.pageY - $(targ).offset().top;\n",
- "\n",
- " return {\"x\": x, \"y\": y};\n",
- "};\n",
- "\n",
- "/*\n",
- " * return a copy of an object with only non-object keys\n",
- " * we need this to avoid circular references\n",
- " * http://stackoverflow.com/a/24161582/3208463\n",
- " */\n",
- "function simpleKeys (original) {\n",
- " return Object.keys(original).reduce(function (obj, key) {\n",
- " if (typeof original[key] !== 'object')\n",
- " obj[key] = original[key]\n",
- " return obj;\n",
- " }, {});\n",
- "}\n",
- "\n",
- "mpl.figure.prototype.mouse_event = function(event, name) {\n",
- " var canvas_pos = mpl.findpos(event)\n",
- "\n",
- " if (name === 'button_press')\n",
- " {\n",
- " this.canvas.focus();\n",
- " this.canvas_div.focus();\n",
- " }\n",
- "\n",
- " var x = canvas_pos.x * mpl.ratio;\n",
- " var y = canvas_pos.y * mpl.ratio;\n",
- "\n",
- " this.send_message(name, {x: x, y: y, button: event.button,\n",
- " step: event.step,\n",
- " guiEvent: simpleKeys(event)});\n",
- "\n",
- " /* This prevents the web browser from automatically changing to\n",
- " * the text insertion cursor when the button is pressed. We want\n",
- " * to control all of the cursor setting manually through the\n",
- " * 'cursor' event from matplotlib */\n",
- " event.preventDefault();\n",
- " return false;\n",
- "}\n",
- "\n",
- "mpl.figure.prototype._key_event_extra = function(event, name) {\n",
- " // Handle any extra behaviour associated with a key event\n",
- "}\n",
- "\n",
- "mpl.figure.prototype.key_event = function(event, name) {\n",
- "\n",
- " // Prevent repeat events\n",
- " if (name == 'key_press')\n",
- " {\n",
- " if (event.which === this._key)\n",
- " return;\n",
- " else\n",
- " this._key = event.which;\n",
- " }\n",
- " if (name == 'key_release')\n",
- " this._key = null;\n",
- "\n",
- " var value = '';\n",
- " if (event.ctrlKey && event.which != 17)\n",
- " value += \"ctrl+\";\n",
- " if (event.altKey && event.which != 18)\n",
- " value += \"alt+\";\n",
- " if (event.shiftKey && event.which != 16)\n",
- " value += \"shift+\";\n",
- "\n",
- " value += 'k';\n",
- " value += event.which.toString();\n",
- "\n",
- " this._key_event_extra(event, name);\n",
- "\n",
- " this.send_message(name, {key: value,\n",
- " guiEvent: simpleKeys(event)});\n",
- " return false;\n",
- "}\n",
- "\n",
- "mpl.figure.prototype.toolbar_button_onclick = function(name) {\n",
- " if (name == 'download') {\n",
- " this.handle_save(this, null);\n",
- " } else {\n",
- " this.send_message(\"toolbar_button\", {name: name});\n",
- " }\n",
- "};\n",
- "\n",
- "mpl.figure.prototype.toolbar_button_onmouseover = function(tooltip) {\n",
- " this.message.textContent = tooltip;\n",
- "};\n",
- "mpl.toolbar_items = [[\"Home\", \"Reset original view\", \"fa fa-home icon-home\", \"home\"], [\"Back\", \"Back to previous view\", \"fa fa-arrow-left icon-arrow-left\", \"back\"], [\"Forward\", \"Forward to next view\", \"fa fa-arrow-right icon-arrow-right\", \"forward\"], [\"\", \"\", \"\", \"\"], [\"Pan\", \"Pan axes with left mouse, zoom with right\", \"fa fa-arrows icon-move\", \"pan\"], [\"Zoom\", \"Zoom to rectangle\", \"fa fa-square-o icon-check-empty\", \"zoom\"], [\"\", \"\", \"\", \"\"], [\"Download\", \"Download plot\", \"fa fa-floppy-o icon-save\", \"download\"]];\n",
- "\n",
- "mpl.extensions = [\"eps\", \"jpeg\", \"pdf\", \"png\", \"ps\", \"raw\", \"svg\", \"tif\"];\n",
- "\n",
- "mpl.default_extension = \"png\";var comm_websocket_adapter = function(comm) {\n",
- " // Create a \"websocket\"-like object which calls the given IPython comm\n",
- " // object with the appropriate methods. Currently this is a non binary\n",
- " // socket, so there is still some room for performance tuning.\n",
- " var ws = {};\n",
- "\n",
- " ws.close = function() {\n",
- " comm.close()\n",
- " };\n",
- " ws.send = function(m) {\n",
- " //console.log('sending', m);\n",
- " comm.send(m);\n",
- " };\n",
- " // Register the callback with on_msg.\n",
- " comm.on_msg(function(msg) {\n",
- " //console.log('receiving', msg['content']['data'], msg);\n",
- " // Pass the mpl event to the overridden (by mpl) onmessage function.\n",
- " ws.onmessage(msg['content']['data'])\n",
- " });\n",
- " return ws;\n",
- "}\n",
- "\n",
- "mpl.mpl_figure_comm = function(comm, msg) {\n",
- " // This is the function which gets called when the mpl process\n",
- " // starts-up an IPython Comm through the \"matplotlib\" channel.\n",
- "\n",
- " var id = msg.content.data.id;\n",
- " // Get hold of the div created by the display call when the Comm\n",
- " // socket was opened in Python.\n",
- " var element = $(\"#\" + id);\n",
- " var ws_proxy = comm_websocket_adapter(comm)\n",
- "\n",
- " function ondownload(figure, format) {\n",
- " window.open(figure.imageObj.src);\n",
- " }\n",
- "\n",
- " var fig = new mpl.figure(id, ws_proxy,\n",
- " ondownload,\n",
- " element.get(0));\n",
- "\n",
- " // Call onopen now - mpl needs it, as it is assuming we've passed it a real\n",
- " // web socket which is closed, not our websocket->open comm proxy.\n",
- " ws_proxy.onopen();\n",
- "\n",
- " fig.parent_element = element.get(0);\n",
- " fig.cell_info = mpl.find_output_cell(\"\");\n",
- " if (!fig.cell_info) {\n",
- " console.error(\"Failed to find cell for figure\", id, fig);\n",
- " return;\n",
- " }\n",
- "\n",
- " var output_index = fig.cell_info[2]\n",
- " var cell = fig.cell_info[0];\n",
- "\n",
- "};\n",
- "\n",
- "mpl.figure.prototype.handle_close = function(fig, msg) {\n",
- " var width = fig.canvas.width/mpl.ratio\n",
- " fig.root.unbind('remove')\n",
- "\n",
- " // Update the output cell to use the data from the current canvas.\n",
- " fig.push_to_output();\n",
- " var dataURL = fig.canvas.toDataURL();\n",
- " // Re-enable the keyboard manager in IPython - without this line, in FF,\n",
- " // the notebook keyboard shortcuts fail.\n",
- " IPython.keyboard_manager.enable()\n",
- " $(fig.parent_element).html('');\n",
- " fig.close_ws(fig, msg);\n",
- "}\n",
- "\n",
- "mpl.figure.prototype.close_ws = function(fig, msg){\n",
- " fig.send_message('closing', msg);\n",
- " // fig.ws.close()\n",
- "}\n",
- "\n",
- "mpl.figure.prototype.push_to_output = function(remove_interactive) {\n",
- " // Turn the data on the canvas into data in the output cell.\n",
- " var width = this.canvas.width/mpl.ratio\n",
- " var dataURL = this.canvas.toDataURL();\n",
- " this.cell_info[1]['text/html'] = '';\n",
- "}\n",
- "\n",
- "mpl.figure.prototype.updated_canvas_event = function() {\n",
- " // Tell IPython that the notebook contents must change.\n",
- " IPython.notebook.set_dirty(true);\n",
- " this.send_message(\"ack\", {});\n",
- " var fig = this;\n",
- " // Wait a second, then push the new image to the DOM so\n",
- " // that it is saved nicely (might be nice to debounce this).\n",
- " setTimeout(function () { fig.push_to_output() }, 1000);\n",
- "}\n",
- "\n",
- "mpl.figure.prototype._init_toolbar = function() {\n",
- " var fig = this;\n",
- "\n",
- " var nav_element = $('')\n",
- " nav_element.attr('style', 'width: 100%');\n",
- " this.root.append(nav_element);\n",
- "\n",
- " // Define a callback function for later on.\n",
- " function toolbar_event(event) {\n",
- " return fig.toolbar_button_onclick(event['data']);\n",
- " }\n",
- " function toolbar_mouse_event(event) {\n",
- " return fig.toolbar_button_onmouseover(event['data']);\n",
- " }\n",
- "\n",
- " for(var toolbar_ind in mpl.toolbar_items){\n",
- " var name = mpl.toolbar_items[toolbar_ind][0];\n",
- " var tooltip = mpl.toolbar_items[toolbar_ind][1];\n",
- " var image = mpl.toolbar_items[toolbar_ind][2];\n",
- " var method_name = mpl.toolbar_items[toolbar_ind][3];\n",
- "\n",
- " if (!name) { continue; };\n",
- "\n",
- " var button = $('');\n",
- " button.click(method_name, toolbar_event);\n",
- " button.mouseover(tooltip, toolbar_mouse_event);\n",
- " nav_element.append(button);\n",
- " }\n",
- "\n",
- " // Add the status bar.\n",
- " var status_bar = $('');\n",
- " nav_element.append(status_bar);\n",
- " this.message = status_bar[0];\n",
- "\n",
- " // Add the close button to the window.\n",
- " var buttongrp = $('');\n",
- " var button = $('');\n",
- " button.click(function (evt) { fig.handle_close(fig, {}); } );\n",
- " button.mouseover('Stop Interaction', toolbar_mouse_event);\n",
- " buttongrp.append(button);\n",
- " var titlebar = this.root.find($('.ui-dialog-titlebar'));\n",
- " titlebar.prepend(buttongrp);\n",
- "}\n",
- "\n",
- "mpl.figure.prototype._root_extra_style = function(el){\n",
- " var fig = this\n",
- " el.on(\"remove\", function(){\n",
- "\tfig.close_ws(fig, {});\n",
- " });\n",
- "}\n",
- "\n",
- "mpl.figure.prototype._canvas_extra_style = function(el){\n",
- " // this is important to make the div 'focusable\n",
- " el.attr('tabindex', 0)\n",
- " // reach out to IPython and tell the keyboard manager to turn it's self\n",
- " // off when our div gets focus\n",
- "\n",
- " // location in version 3\n",
- " if (IPython.notebook.keyboard_manager) {\n",
- " IPython.notebook.keyboard_manager.register_events(el);\n",
- " }\n",
- " else {\n",
- " // location in version 2\n",
- " IPython.keyboard_manager.register_events(el);\n",
- " }\n",
- "\n",
- "}\n",
- "\n",
- "mpl.figure.prototype._key_event_extra = function(event, name) {\n",
- " var manager = IPython.notebook.keyboard_manager;\n",
- " if (!manager)\n",
- " manager = IPython.keyboard_manager;\n",
- "\n",
- " // Check for shift+enter\n",
- " if (event.shiftKey && event.which == 13) {\n",
- " this.canvas_div.blur();\n",
- " event.shiftKey = false;\n",
- " // Send a \"J\" for go to next cell\n",
- " event.which = 74;\n",
- " event.keyCode = 74;\n",
- " manager.command_mode();\n",
- " manager.handle_keydown(event);\n",
- " }\n",
- "}\n",
- "\n",
- "mpl.figure.prototype.handle_save = function(fig, msg) {\n",
- " fig.ondownload(fig, null);\n",
- "}\n",
- "\n",
- "\n",
- "mpl.find_output_cell = function(html_output) {\n",
- " // Return the cell and output element which can be found *uniquely* in the notebook.\n",
- " // Note - this is a bit hacky, but it is done because the \"notebook_saving.Notebook\"\n",
- " // IPython event is triggered only after the cells have been serialised, which for\n",
- " // our purposes (turning an active figure into a static one), is too late.\n",
- " var cells = IPython.notebook.get_cells();\n",
- " var ncells = cells.length;\n",
- " for (var i=0; i= 3 moved mimebundle to data attribute of output\n",
- " data = data.data;\n",
- " }\n",
- " if (data['text/html'] == html_output) {\n",
- " return [cell, data, j];\n",
- " }\n",
- " }\n",
- " }\n",
- " }\n",
- "}\n",
- "\n",
- "// Register the function which deals with the matplotlib target/channel.\n",
- "// The kernel may be null if the page has been refreshed.\n",
- "if (IPython.notebook.kernel != null) {\n",
- " IPython.notebook.kernel.comm_manager.register_target('matplotlib', mpl.mpl_figure_comm);\n",
- "}\n"
- ],
- "text/plain": [
- ""
- ]
- },
- "metadata": {},
- "output_type": "display_data"
- },
- {
- "data": {
- "text/html": [
- ""
- ],
+ "application/vnd.jupyter.widget-view+json": {
+ "model_id": "607617e021c940b2838bbdbdb8f3b0d6",
+ "version_major": 2,
+ "version_minor": 0
+ },
"text/plain": [
- ""
+ "VBox(children=(HBox(children=(FloatText(value=0.0, description='X'), FloatText(value=0.0, description='Y'), Fl…"
]
},
"metadata": {},
@@ -871,9 +89,37 @@
}
],
"source": [
- "DrawMagneticDipole3D()"
+ "interact_pic()"
]
},
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "metadata": {},
+ "outputs": [],
+ "source": []
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "metadata": {},
+ "outputs": [],
+ "source": []
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "metadata": {},
+ "outputs": [],
+ "source": []
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "metadata": {},
+ "outputs": [],
+ "source": []
+ },
{
"cell_type": "code",
"execution_count": null,
@@ -898,7 +144,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
- "version": "3.6.6"
+ "version": "3.7.2"
}
},
"nbformat": 4,
From 64f94dd48857af88fde7462761f0306f18ae164e Mon Sep 17 00:00:00 2001
From: wwzzyyzzrr
Date: Wed, 3 Apr 2019 09:00:10 +0800
Subject: [PATCH 3/5] Change some details
---
geoscilabs/mag/MagDipole.py | 68 +++++++++++++++++++++-------------
notebooks/mag/Mag_Dipole.ipynb | 50 +++----------------------
2 files changed, 48 insertions(+), 70 deletions(-)
diff --git a/geoscilabs/mag/MagDipole.py b/geoscilabs/mag/MagDipole.py
index 2a39f13b..b6260491 100644
--- a/geoscilabs/mag/MagDipole.py
+++ b/geoscilabs/mag/MagDipole.py
@@ -105,10 +105,13 @@ def MagneticLongDipoleField(
return Bx1 + Bx2, By1 + By2, Bz1 + Bz2
def DrawMagneticDipole3D(
- dipoleLoc_X=0.,dipoleLoc_Y=0.,dipoleLoc_Z=-50., dipoledec=0., dipoleinc=90., dipoleL=100., dipolemoment=1.0, B0=53600e-9 , Binc=90., Bdec=0,
- xStart=-3, xEnd=3, yStart=-3,yEnd=3,
- showField =True,showCurve=True,showLocation=True,showStrength=True
+ dipoleLoc_X=0.,dipoleLoc_Y=0.,dipoleLoc_Z=-5., dipoledec=0., dipoleinc=0., dipoleL=1., dipolemoment=1.0, B0=53600e-9 , Binc=90., Bdec=0,
+ xStart=-6, xEnd=6, yStart=-6,yEnd=6,
+ showField =True,showCurve=True,showLocation=True,showStrength=True,
+ ifUpdate=True
):
+ if(ifUpdate==False):
+ return 0;
dipoleloc=(dipoleLoc_X,dipoleLoc_Y,dipoleLoc_Z);
B0x = B0*np.cos(np.radians(Binc))*np.sin(np.radians(Bdec))
B0y = B0*np.cos(np.radians(Binc))*np.cos(np.radians(Bdec))
@@ -116,12 +119,12 @@ def DrawMagneticDipole3D(
# set observation grid
z = 1. # x, y bounds and elevation
- ymin=xmin = min(xStart,yStart)
- ymax=xmax = max(xEnd,yEnd)
+ radii = (2., 5.) # how many layers of field lines for plotting
+ ymin=xmin = min(xStart,yStart,z-max(radii)*2)
+ ymax=xmax = max(xEnd,yEnd,max(radii)*2)
profile_x = 0. # x-coordinate of y-profile
profile_y = 0. # y-coordinate of x-profile
h = 0.2 # grid interval
- radii = (2., 5.) # how many layers of field lines for plotting
Naz = 10 # number of azimuth
# get field lines
@@ -167,7 +170,7 @@ def DrawMagneticDipole3D(
if showStrength:
# plot map
Bt = Ba1.reshape(xi.shape)*1e9 # contour and color scale in nT
- c = ax.contourf(xi,yi,Bt,alpha=1,zdir='z',offset=z-max(radii)*2,cmap='jet',
+ c = ax.contourf(xi,yi,Bt,alpha=1,zdir='z',offset=xmin,cmap='jet',
levels=np.linspace(Bt.min(),Bt.max(),50,endpoint=True),zorder = 0)
fig.colorbar(c)
@@ -187,30 +190,33 @@ def DrawMagneticDipole3D(
ax.set_ylabel('Y')
ax.set_zlabel('Z')
- ax.set_xlim(xmin, xmax)
- ax.set_ylim(ymin, ymax)
- ax.set_zlim(z-max(radii)*2, max(radii)*1.5)
+ # ax.set_xlim(xmin, xmax)
+ # ax.set_ylim(ymin, ymax)
+ # ax.set_zlim(-(xmax-xmin)/2, (xmax-xmin)/2)
+ ax.set_xlim(xmin,xmax)
+ ax.set_ylim(xmin,xmax)
+ ax.set_zlim(xmin,xmax)
# draw the widgets
def interact_pic():
dipoleLoc_X=FloatText(
value=0,
- description='X',
+ description='DipoleX',
disabled=False
)
dipoleLoc_Y=FloatText(
value=0,
- description='Y',
+ description='DipoleY',
disabled=False
)
dipoleLoc_Z=FloatText(
- value=-50.,
- description='Z',
+ value=-5.,
+ description='DipoleZ',
disabled=False
)
dipoleL=FloatText(
- value=100.,
+ value=1.,
description='Length',
disabled=False
)
@@ -220,13 +226,13 @@ def interact_pic():
disabled=False
)
dipoleInc=FloatText(
- value=90.,
+ value=0.,
description='dipoleInc',
disabled=False
)
dipolemoment=FloatText(
value=1.,
- description='Dipolemoment',
+ description='Moment',
disabled=False
)
B0 = FloatText(
@@ -246,22 +252,22 @@ def interact_pic():
)
xStart = FloatText(
- value=-3,
+ value=-6,
description="xStart",
disabled=False
)
xEnd = FloatText(
- value=3,
+ value=6,
description="xEnd",
disabled=False
)
yStart = FloatText(
- value=-3,
+ value=-6,
description="yStart",
disabled=False
)
yEnd = FloatText(
- value=3,
+ value=6,
description="yEnd",
disabled=False
)
@@ -273,12 +279,12 @@ def interact_pic():
)
showCurve = Checkbox(
value=True,
- description='Show the Black Curve',
+ description='show the profiles',
disabled=False
)
showLocation = Checkbox(
value=True,
- description='Show the Location of the Point',
+ description='show the locations of measurement',
disabled=False
)
showStrength = Checkbox(
@@ -286,7 +292,18 @@ def interact_pic():
description='Show the Field Strength Figure',
disabled=False
)
-
+ ifUpdate = Checkbox(
+ value=True,
+ description='Update Fig Real Time',
+ disabled=False
+ )
+ # ifUpdate = ToggleButton(
+ # value=True,
+ # description="UpdateRealTime",
+ # disabled=False,
+ # button_style="info", # 'success', 'info', 'warning', 'danger' or ''
+ # tooltip="Click me"
+ # )
out1 = HBox([dipoleLoc_X,dipoleLoc_Y,dipoleLoc_Z])
@@ -296,7 +313,7 @@ def interact_pic():
out5 = HBox([B0,Binc,Bdec])
out6 = HBox([xStart,xEnd])
out7 = HBox([yStart,yEnd])
- out8 = VBox([showField,showCurve, showLocation, showStrength])
+ out8 = VBox([showField,showCurve, showLocation, showStrength,ifUpdate])
out = interactive_output(
DrawMagneticDipole3D,
{
@@ -318,6 +335,7 @@ def interact_pic():
"showCurve":showCurve,
"showLocation":showLocation,
"showStrength":showStrength,
+ "ifUpdate":ifUpdate
},
)
return VBox([out1,out2,out3,out4,out5,out6,out7,HBox([out, out8])])
\ No newline at end of file
diff --git a/notebooks/mag/Mag_Dipole.ipynb b/notebooks/mag/Mag_Dipole.ipynb
index 29d4c047..56de6de9 100644
--- a/notebooks/mag/Mag_Dipole.ipynb
+++ b/notebooks/mag/Mag_Dipole.ipynb
@@ -51,13 +51,6 @@
"* Naz: number of azimuth angles for the field line"
]
},
- {
- "cell_type": "markdown",
- "metadata": {},
- "source": [
- "### Calculate data for plotting"
- ]
- },
{
"cell_type": "markdown",
"metadata": {},
@@ -71,17 +64,19 @@
{
"cell_type": "code",
"execution_count": 2,
- "metadata": {},
+ "metadata": {
+ "scrolled": false
+ },
"outputs": [
{
"data": {
"application/vnd.jupyter.widget-view+json": {
- "model_id": "607617e021c940b2838bbdbdb8f3b0d6",
+ "model_id": "e0808c6b9eed4af48f9ac5db4a23a35c",
"version_major": 2,
"version_minor": 0
},
"text/plain": [
- "VBox(children=(HBox(children=(FloatText(value=0.0, description='X'), FloatText(value=0.0, description='Y'), Fl…"
+ "VBox(children=(HBox(children=(FloatText(value=0.0, description='DipoleX'), FloatText(value=0.0, description='D…"
]
},
"metadata": {},
@@ -91,41 +86,6 @@
"source": [
"interact_pic()"
]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {},
- "outputs": [],
- "source": []
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {},
- "outputs": [],
- "source": []
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {},
- "outputs": [],
- "source": []
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {},
- "outputs": [],
- "source": []
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {},
- "outputs": [],
- "source": []
}
],
"metadata": {
From e36459d24f476f08751bc3ca2aa4cf01c4790c40 Mon Sep 17 00:00:00 2001
From: wwzzyyzzrr
Date: Wed, 3 Apr 2019 21:42:02 +0800
Subject: [PATCH 4/5] format the code
---
geoscilabs/mag/MagDipole.py | 309 +++++++++++++++++-------------------
1 file changed, 143 insertions(+), 166 deletions(-)
diff --git a/geoscilabs/mag/MagDipole.py b/geoscilabs/mag/MagDipole.py
index b6260491..9ce96511 100644
--- a/geoscilabs/mag/MagDipole.py
+++ b/geoscilabs/mag/MagDipole.py
@@ -14,8 +14,10 @@
interactive_output,
Layout,
FloatRangeSlider,
- Checkbox
+ Checkbox,
)
+
+
def MagneticMonopoleField(obsloc, poleloc=(0.0, 0.0, 0.0), Q=1):
# relative obs. loc. to pole, assuming pole at origin
dx, dy, dz = obsloc[0] - poleloc[0], obsloc[1] - poleloc[1], obsloc[2] - poleloc[2]
@@ -104,199 +106,175 @@ def MagneticLongDipoleField(
)
return Bx1 + Bx2, By1 + By2, Bz1 + Bz2
+
def DrawMagneticDipole3D(
- dipoleLoc_X=0.,dipoleLoc_Y=0.,dipoleLoc_Z=-5., dipoledec=0., dipoleinc=0., dipoleL=1., dipolemoment=1.0, B0=53600e-9 , Binc=90., Bdec=0,
- xStart=-6, xEnd=6, yStart=-6,yEnd=6,
- showField =True,showCurve=True,showLocation=True,showStrength=True,
- ifUpdate=True
+ dipoleLoc_X=0.0,
+ dipoleLoc_Y=0.0,
+ dipoleLoc_Z=-5.0,
+ dipoledec=0.0,
+ dipoleinc=0.0,
+ dipoleL=1.0,
+ dipolemoment=1.0,
+ B0=53600e-9,
+ Binc=90.0,
+ Bdec=0,
+ xStart=-6,
+ xEnd=6,
+ yStart=-6,
+ yEnd=6,
+ showField=True,
+ showCurve=True,
+ showLocation=True,
+ showStrength=True,
+ ifUpdate=True,
):
- if(ifUpdate==False):
- return 0;
- dipoleloc=(dipoleLoc_X,dipoleLoc_Y,dipoleLoc_Z);
- B0x = B0*np.cos(np.radians(Binc))*np.sin(np.radians(Bdec))
- B0y = B0*np.cos(np.radians(Binc))*np.cos(np.radians(Bdec))
- B0z = -B0*np.sin(np.radians(Binc))
+ if ifUpdate == False:
+ return 0
+ dipoleloc = (dipoleLoc_X, dipoleLoc_Y, dipoleLoc_Z)
+ B0x = B0 * np.cos(np.radians(Binc)) * np.sin(np.radians(Bdec))
+ B0y = B0 * np.cos(np.radians(Binc)) * np.cos(np.radians(Bdec))
+ B0z = -B0 * np.sin(np.radians(Binc))
# set observation grid
- z = 1. # x, y bounds and elevation
- radii = (2., 5.) # how many layers of field lines for plotting
- ymin=xmin = min(xStart,yStart,z-max(radii)*2)
- ymax=xmax = max(xEnd,yEnd,max(radii)*2)
- profile_x = 0. # x-coordinate of y-profile
- profile_y = 0. # y-coordinate of x-profile
- h = 0.2 # grid interval
- Naz = 10 # number of azimuth
+ z = 1.0 # x, y bounds and elevation
+ radii = (2.0, 5.0) # how many layers of field lines for plotting
+ ymin = xmin = min(xStart, yStart, z - max(radii) * 2)
+ ymax = xmax = max(xEnd, yEnd, max(radii) * 2)
+ profile_x = 0.0 # x-coordinate of y-profile
+ profile_y = 0.0 # y-coordinate of x-profile
+ h = 0.2 # grid interval
+ Naz = 10 # number of azimuth
# get field lines
- linex, liney, linez = MagneticLongDipoleLine(dipoleloc,dipoledec,dipoleinc,dipoleL,radii,Naz)
+ linex, liney, linez = MagneticLongDipoleLine(
+ dipoleloc, dipoledec, dipoleinc, dipoleL, radii, Naz
+ )
# get map
- xi, yi = np.meshgrid(np.r_[xStart:xEnd+h:h], np.r_[yStart:yEnd+h:h])
+ xi, yi = np.meshgrid(np.r_[xStart : xEnd + h : h], np.r_[yStart : yEnd + h : h])
x1, y1 = xi.flatten(), yi.flatten()
- z1 = np.full(x1.shape,z)
+ z1 = np.full(x1.shape, z)
Bx, By, Bz = np.zeros(len(x1)), np.zeros(len(x1)), np.zeros(len(x1))
for i in np.arange(len(x1)):
- Bx[i], By[i], Bz[i] = MagneticLongDipoleField(dipoleloc,dipoledec,dipoleinc,dipoleL,(x1[i],y1[i],z1[i]),dipolemoment)
- Ba1 = np.dot(np.r_[B0x,B0y,B0z], np.vstack((Bx,By,Bz)))
+ Bx[i], By[i], Bz[i] = MagneticLongDipoleField(
+ dipoleloc,
+ dipoledec,
+ dipoleinc,
+ dipoleL,
+ (x1[i], y1[i], z1[i]),
+ dipolemoment,
+ )
+ Ba1 = np.dot(np.r_[B0x, B0y, B0z], np.vstack((Bx, By, Bz)))
# get x-profile
- x2 = np.r_[xStart:xEnd+h:h]
- y2, z2 = np.full(x2.shape,profile_y), np.full(x2.shape,z)
+ x2 = np.r_[xStart : xEnd + h : h]
+ y2, z2 = np.full(x2.shape, profile_y), np.full(x2.shape, z)
Bx, By, Bz = np.zeros(len(x2)), np.zeros(len(x2)), np.zeros(len(x2))
for i in np.arange(len(x2)):
- Bx[i], By[i], Bz[i] = MagneticLongDipoleField(dipoleloc,dipoledec,dipoleinc,dipoleL,(x2[i],y2[i],z2[i]),dipolemoment)
- Ba2 = np.dot(np.r_[B0x,B0y,B0z], np.vstack((Bx,By,Bz)))
+ Bx[i], By[i], Bz[i] = MagneticLongDipoleField(
+ dipoleloc,
+ dipoledec,
+ dipoleinc,
+ dipoleL,
+ (x2[i], y2[i], z2[i]),
+ dipolemoment,
+ )
+ Ba2 = np.dot(np.r_[B0x, B0y, B0z], np.vstack((Bx, By, Bz)))
# get y-profile
- y3 = np.r_[yStart:yEnd+h:h]
- x3, z3 = np.full(y3.shape,profile_x), np.full(y3.shape,z)
+ y3 = np.r_[yStart : yEnd + h : h]
+ x3, z3 = np.full(y3.shape, profile_x), np.full(y3.shape, z)
Bx, By, Bz = np.zeros(len(x3)), np.zeros(len(x3)), np.zeros(len(x3))
for i in np.arange(len(x3)):
- Bx[i], By[i], Bz[i] = MagneticLongDipoleField(dipoleloc,dipoledec,dipoleinc,dipoleL,(x3[i],y3[i],z3[i]),dipolemoment)
- Ba3 = np.dot(np.r_[B0x,B0y,B0z], np.vstack((Bx,By,Bz)))
+ Bx[i], By[i], Bz[i] = MagneticLongDipoleField(
+ dipoleloc,
+ dipoledec,
+ dipoleinc,
+ dipoleL,
+ (x3[i], y3[i], z3[i]),
+ dipolemoment,
+ )
+ Ba3 = np.dot(np.r_[B0x, B0y, B0z], np.vstack((Bx, By, Bz)))
fig = plt.figure()
- ax = fig.gca(projection='3d')
+ ax = fig.gca(projection="3d")
if showField:
# plot field lines
- for lx,ly,lz in zip(linex,liney,linez):
- ax.plot(lx,ly,lz,'-',markersize=1, zorder=100)
+ for lx, ly, lz in zip(linex, liney, linez):
+ ax.plot(lx, ly, lz, "-", markersize=1, zorder=100)
if showLocation:
- ax.scatter(x1,y1,z1,s=2,alpha=0.3)
-
+ ax.scatter(x1, y1, z1, s=2, alpha=0.3)
+
if showStrength:
# plot map
- Bt = Ba1.reshape(xi.shape)*1e9 # contour and color scale in nT
- c = ax.contourf(xi,yi,Bt,alpha=1,zdir='z',offset=xmin,cmap='jet',
- levels=np.linspace(Bt.min(),Bt.max(),50,endpoint=True),zorder = 0)
+ Bt = Ba1.reshape(xi.shape) * 1e9 # contour and color scale in nT
+ c = ax.contourf(
+ xi,
+ yi,
+ Bt,
+ alpha=1,
+ zdir="z",
+ offset=xmin,
+ cmap="jet",
+ levels=np.linspace(Bt.min(), Bt.max(), 50, endpoint=True),
+ zorder=0,
+ )
fig.colorbar(c)
if showCurve:
- # auto-scaling for profile plot
- ptpmax = np.max((Ba2.ptp(),Ba3.ptp())) # dynamic range
+ # auto-scaling for profile plot
+ ptpmax = np.max((Ba2.ptp(), Ba3.ptp())) # dynamic range
autoscaling = np.max(radii) / ptpmax
# plot x-profile
- ax.scatter(x2,y2,z2,s=2,c='black',alpha=0.3)
- ax.plot(x2,Ba2*autoscaling,zs=ymax,c='black',zdir='y')
+ ax.scatter(x2, y2, z2, s=2, c="black", alpha=0.3)
+ ax.plot(x2, Ba2 * autoscaling, zs=ymax, c="black", zdir="y")
# plot y-profile
- ax.scatter(x3,y3,z3,s=2,c='black',alpha=0.3)
- ax.plot(y3,Ba3*autoscaling,zs=xmin,c='black',zdir='x')
+ ax.scatter(x3, y3, z3, s=2, c="black", alpha=0.3)
+ ax.plot(y3, Ba3 * autoscaling, zs=xmin, c="black", zdir="x")
- ax.set_xlabel('X')
- ax.set_ylabel('Y')
- ax.set_zlabel('Z')
+ ax.set_xlabel("X")
+ ax.set_ylabel("Y")
+ ax.set_zlabel("Z")
# ax.set_xlim(xmin, xmax)
# ax.set_ylim(ymin, ymax)
# ax.set_zlim(-(xmax-xmin)/2, (xmax-xmin)/2)
- ax.set_xlim(xmin,xmax)
- ax.set_ylim(xmin,xmax)
- ax.set_zlim(xmin,xmax)
-
+ ax.set_xlim(xmin, xmax)
+ ax.set_ylim(xmin, xmax)
+ ax.set_zlim(xmin, xmax)
+
# draw the widgets
def interact_pic():
- dipoleLoc_X=FloatText(
- value=0,
- description='DipoleX',
- disabled=False
- )
- dipoleLoc_Y=FloatText(
- value=0,
- description='DipoleY',
- disabled=False
- )
- dipoleLoc_Z=FloatText(
- value=-5.,
- description='DipoleZ',
- disabled=False
- )
- dipoleL=FloatText(
- value=1.,
- description='Length',
- disabled=False
- )
- dipoleDec=FloatText(
- value=0,
- description='dipoleDec',
- disabled=False
- )
- dipoleInc=FloatText(
- value=0.,
- description='dipoleInc',
- disabled=False
- )
- dipolemoment=FloatText(
- value=1.,
- description='Moment',
- disabled=False
- )
- B0 = FloatText(
- value=53600e-9,
- description=r"$B_0$",
- disabled=False
- )
- Binc = FloatText(
- value=90,
- description="Binc",
- disabled=False
- )
- Bdec = FloatText(
- value=0,
- description="Bdec",
- disabled=False
- )
+ dipoleLoc_X = FloatText(value=0, description="DipoleX", disabled=False)
+ dipoleLoc_Y = FloatText(value=0, description="DipoleY", disabled=False)
+ dipoleLoc_Z = FloatText(value=-5.0, description="DipoleZ", disabled=False)
+ dipoleL = FloatText(value=1.0, description="Length", disabled=False)
+ dipoleDec = FloatText(value=0, description="dipoleDec", disabled=False)
+ dipoleInc = FloatText(value=0.0, description="dipoleInc", disabled=False)
+ dipolemoment = FloatText(value=1.0, description="Moment", disabled=False)
+ B0 = FloatText(value=53600e-9, description=r"$B_0$", disabled=False)
+ Binc = FloatText(value=90, description="Binc", disabled=False)
+ Bdec = FloatText(value=0, description="Bdec", disabled=False)
- xStart = FloatText(
- value=-6,
- description="xStart",
- disabled=False
- )
- xEnd = FloatText(
- value=6,
- description="xEnd",
- disabled=False
- )
- yStart = FloatText(
- value=-6,
- description="yStart",
- disabled=False
- )
- yEnd = FloatText(
- value=6,
- description="yEnd",
- disabled=False
- )
+ xStart = FloatText(value=-6, description="xStart", disabled=False)
+ xEnd = FloatText(value=6, description="xEnd", disabled=False)
+ yStart = FloatText(value=-6, description="yStart", disabled=False)
+ yEnd = FloatText(value=6, description="yEnd", disabled=False)
- showField = Checkbox(
- value=True,
- description='Show the Field',
- disabled=False
- )
- showCurve = Checkbox(
- value=True,
- description='show the profiles',
- disabled=False
- )
+ showField = Checkbox(value=True, description="Show the Field", disabled=False)
+ showCurve = Checkbox(value=True, description="show the profiles", disabled=False)
showLocation = Checkbox(
- value=True,
- description='show the locations of measurement',
- disabled=False
+ value=True, description="show the locations of measurement", disabled=False
)
showStrength = Checkbox(
- value=True,
- description='Show the Field Strength Figure',
- disabled=False
- )
- ifUpdate = Checkbox(
- value=True,
- description='Update Fig Real Time',
- disabled=False
+ value=True, description="Show the Field Strength Figure", disabled=False
)
+ ifUpdate = Checkbox(value=True, description="Update Fig Real Time", disabled=False)
# ifUpdate = ToggleButton(
# value=True,
# description="UpdateRealTime",
@@ -304,38 +282,37 @@ def interact_pic():
# button_style="info", # 'success', 'info', 'warning', 'danger' or ''
# tooltip="Click me"
# )
-
- out1 = HBox([dipoleLoc_X,dipoleLoc_Y,dipoleLoc_Z])
+ out1 = HBox([dipoleLoc_X, dipoleLoc_Y, dipoleLoc_Z])
out2 = HBox([dipoleDec, dipoleInc])
out3 = HBox([dipoleL])
out4 = HBox([dipolemoment])
- out5 = HBox([B0,Binc,Bdec])
- out6 = HBox([xStart,xEnd])
- out7 = HBox([yStart,yEnd])
- out8 = VBox([showField,showCurve, showLocation, showStrength,ifUpdate])
+ out5 = HBox([B0, Binc, Bdec])
+ out6 = HBox([xStart, xEnd])
+ out7 = HBox([yStart, yEnd])
+ out8 = VBox([showField, showCurve, showLocation, showStrength, ifUpdate])
out = interactive_output(
DrawMagneticDipole3D,
{
- "dipoleLoc_X":dipoleLoc_X,
- "dipoleLoc_Y":dipoleLoc_Y,
- "dipoleLoc_Z":dipoleLoc_Z,
+ "dipoleLoc_X": dipoleLoc_X,
+ "dipoleLoc_Y": dipoleLoc_Y,
+ "dipoleLoc_Z": dipoleLoc_Z,
"dipoledec": dipoleDec,
"dipoleinc": dipoleInc,
"dipoleL": dipoleL,
"dipolemoment": dipolemoment,
- "B0":B0,
- "Binc":Binc,
- "Bdec":Bdec,
- "xStart":xStart,
- "xEnd":xEnd,
- "yStart":yStart,
- "yEnd":yEnd,
- "showField":showField,
- "showCurve":showCurve,
- "showLocation":showLocation,
- "showStrength":showStrength,
- "ifUpdate":ifUpdate
+ "B0": B0,
+ "Binc": Binc,
+ "Bdec": Bdec,
+ "xStart": xStart,
+ "xEnd": xEnd,
+ "yStart": yStart,
+ "yEnd": yEnd,
+ "showField": showField,
+ "showCurve": showCurve,
+ "showLocation": showLocation,
+ "showStrength": showStrength,
+ "ifUpdate": ifUpdate,
},
)
- return VBox([out1,out2,out3,out4,out5,out6,out7,HBox([out, out8])])
\ No newline at end of file
+ return VBox([out1, out2, out3, out4, out5, out6, out7, HBox([out, out8])])
From adb0f91befc13106f6b28105d103e4aa2ebeadb0 Mon Sep 17 00:00:00 2001
From: wwzzyyzzrr
Date: Wed, 3 Apr 2019 21:57:35 +0800
Subject: [PATCH 5/5] format the code
---
geoscilabs/mag/MagDipole.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/geoscilabs/mag/MagDipole.py b/geoscilabs/mag/MagDipole.py
index 9ce96511..515631c2 100644
--- a/geoscilabs/mag/MagDipole.py
+++ b/geoscilabs/mag/MagDipole.py
@@ -128,7 +128,7 @@ def DrawMagneticDipole3D(
showStrength=True,
ifUpdate=True,
):
- if ifUpdate == False:
+ if ifUpdate is False:
return 0
dipoleloc = (dipoleLoc_X, dipoleLoc_Y, dipoleLoc_Z)
B0x = B0 * np.cos(np.radians(Binc)) * np.sin(np.radians(Bdec))
@@ -138,8 +138,8 @@ def DrawMagneticDipole3D(
# set observation grid
z = 1.0 # x, y bounds and elevation
radii = (2.0, 5.0) # how many layers of field lines for plotting
- ymin = xmin = min(xStart, yStart, z - max(radii) * 2)
- ymax = xmax = max(xEnd, yEnd, max(radii) * 2)
+ xmin = min(xStart, yStart, z - max(radii) * 2)
+ xmax = max(xEnd, yEnd, max(radii) * 2)
profile_x = 0.0 # x-coordinate of y-profile
profile_y = 0.0 # y-coordinate of x-profile
h = 0.2 # grid interval
@@ -230,7 +230,7 @@ def DrawMagneticDipole3D(
autoscaling = np.max(radii) / ptpmax
# plot x-profile
ax.scatter(x2, y2, z2, s=2, c="black", alpha=0.3)
- ax.plot(x2, Ba2 * autoscaling, zs=ymax, c="black", zdir="y")
+ ax.plot(x2, Ba2 * autoscaling, zs=xmax, c="black", zdir="y")
# plot y-profile
ax.scatter(x3, y3, z3, s=2, c="black", alpha=0.3)