doku

Author: OrtnerMichael

docs/_pages/0_documentation.rst

@@ -396,8 +396,6 @@ The following example code shows how to use `displaySystem()`:
 
   **Figure:** Several magnet and sensor object are created and manipulated. Using `displaySystem()` they are displayed in a 3D plot together with some markers which allows one to quickly check if the system geometry is ok.
 
-:download:`displaySys.py <../pyplots/doku/displaySys.py>`
-
 
 Math Package
 ###############

docs/_pages/2_guideExamples.rst

@@ -110,7 +110,7 @@ The superposition principle allows us to calculate complex magnet shapes by 'add
 :download:`04_ComplexShape.py <../pyplots/examples/04_ComplexShape.py>`
 
 
-Using vectorized code with rotations
+Vectorized vs Classical Code
 ######################################
 
 Description coming up tomorrow :)

docs/pyplots/doku/thorsHammerSensor.py

@@ -3,39 +3,37 @@
 from magpylib.source.magnet import Cylinder
 import magpylib as magpy
 
-#create collection of four magnets
+# create collection of two magnets
 s1 = Cylinder(mag=[0,0,1000], dim=[5,5])
 s2 = Cylinder(mag=[0,0,-1000], dim=[2,6])
 c = magpy.Collection(s1,s2)
 
-#create positions
+# create positions
 xs = np.linspace(-8,8,100)
 zs = np.linspace(-6,6,100)
 posis = [[x,0,z] for z in zs for x in xs]
 
-#calculate fields
-#Bs = c.getBsweep(posis)
+# calculate field and amplitude
+B = [c.getB(pos) for pos in posis]
+Bs = np.array(B).reshape([100,100,3]) #reshape
+Bamp = np.linalg.norm(Bs,axis=2)
 
-#reshape array and calculate amplitude
-#Bs = np.array(Bs).reshape([100,100,3])
-#Bamp = np.linalg.norm(Bs,axis=2)
-
-##define figure with 2d and 3d axes
+# define figure with a 2d and a 3d axis
 fig = plt.figure(figsize=(8,4))
 ax1 = fig.add_subplot(121,projection='3d')
 ax2 = fig.add_subplot(122)
 
-#add displaySystem on ax1
+# add displaySystem on ax1
 magpy.displaySystem(c,subplotAx=ax1,suppress=True)
 ax1.view_init(elev=75)
 
-##amplitude plot on ax2
-#X,Z = np.meshgrid(xs,zs)
-#ax2.pcolor(xs,zs,Bamp,cmap='jet',vmin=-200)
+# amplitude plot on ax2
+X,Z = np.meshgrid(xs,zs)
+ax2.pcolor(xs,zs,Bamp,cmap='jet',vmin=-200)
 
-#plot field lines on ax2
-#U,V = Bs[:,:,0], Bs[:,:,2]
-#ax2.streamplot(X,Z,U,V,color='k',density=2)
+# plot field lines on ax2
+U,V = Bs[:,:,0], Bs[:,:,2]
+ax2.streamplot(X,Z,U,V,color='k',density=2)
 
 #display
 plt.show()

docs/pyplots/examples/04_ComplexShape.py

@@ -1,7 +1,6 @@
 import magpylib as magpy
 import numpy as np
 import matplotlib.pyplot as plt
-import time
 
 # vector size: we calculate the field N times with different inputs
 N = 10000  
@@ -17,27 +16,6 @@
 # different angles for each evaluation
 angs = np.linspace(-20,20,N) 
 
-
-# magpylib classic ---------------------------
-T0 = time.perf_counter()
-
-B = []
-for a in angs:
-    s = magpy.source.magnet.Box(mag,dim,posm)
-    s.rotate(a,axis,anch)
-    B += [s.getB(poso)]
-Bc = np.array(B)
-
-T1 = time.perf_counter()
-print('Evaluation time (classic): ' + str(T1-T0))
-
-plt.plot(Bc[:,0])
-plt.plot(Bc[:,1])
-plt.plot(Bc[:,2])
-
-# magpylib vector ---------------------------
-T0 = time.perf_counter()
-
 # Vectorizing input using numpy native instead of python loops
 MAG = np.tile(mag,(N,1))        
 DIM = np.tile(dim,(N,1))        
@@ -49,11 +27,8 @@
 # N-times evalulation of the field with different inputs
 Bv = magpy.vector.getBv_magnet('box',MAG,DIM,POSo,POSm,[angs],[AXIS],[ANCH])
 
-T1 = time.perf_counter()
-print('Evaluation time (vector): ' + str(T1-T0))
-
-plt.plot(Bv[:,0],ls='--')
-plt.plot(Bv[:,1],ls='--')
-plt.plot(Bv[:,2],ls='--')
+plt.plot(Bv[:,0])
+plt.plot(Bv[:,1])
+plt.plot(Bv[:,2])
 
 plt.show()