remake py examples

dhidas · dhidas · commit 614d9d14dc8e · 2017-10-11T17:22:01.000-04:00
diff --git a/examples/Example_001_DipoleTrajectory.py b/examples/Example_001_DipoleTrajectory.py
@@ -53,6 +53,3 @@
 plot_trajectory_position(trajectory)
 plot_trajectory_velocity(trajectory)
 
-
-
-
diff --git a/examples/Example_002_UndulatorTrajectory.py b/examples/Example_002_UndulatorTrajectory.py
@@ -33,6 +33,3 @@
 plot_trajectory_position(trajectory)
 plot_trajectory_velocity(trajectory)
 
-
-
-
diff --git a/examples/Example_003_EPUTrajectory.py b/examples/Example_003_EPUTrajectory.py
@@ -36,6 +36,3 @@
 plot_trajectory_position(trajectory)
 plot_trajectory_velocity(trajectory)
 
-
-
-
diff --git a/examples/Example_004_UndulatorPlusBMTrajectory.py b/examples/Example_004_UndulatorPlusBMTrajectory.py
@@ -55,6 +55,3 @@
 plot_trajectory_position(trajectory)
 plot_trajectory_velocity(trajectory)
 
-
-
-
diff --git a/examples/Example_005_CantedStraightTrajectory.py b/examples/Example_005_CantedStraightTrajectory.py
@@ -55,6 +55,3 @@
 plot_trajectory_position(trajectory)
 plot_trajectory_velocity(trajectory)
 
-
-
-
diff --git a/examples/Example_006_ImportedFieldTrajectory.py b/examples/Example_006_ImportedFieldTrajectory.py
@@ -52,6 +52,3 @@
 plot_trajectory_position(trajectory)
 plot_trajectory_velocity(trajectory)
 
-
-
-
diff --git a/examples/Example_022_UndulatorSpectrum.py b/examples/Example_022_UndulatorSpectrum.py
@@ -42,6 +42,3 @@
 spectrum = osr.calculate_spectrum(obs=[0, 0, 30], energy_range_eV=[100, 200], npoints=200)
 plot_spectrum(spectrum)
 
-
-
-
diff --git a/examples/Example_023_EPUSpectrum.py b/examples/Example_023_EPUSpectrum.py
@@ -46,6 +46,3 @@
 spectrum = osr.calculate_spectrum(obs=[0, 0, 30], energy_range_eV=[100, 200], npoints=200)
 plot_spectrum(spectrum)
 
-
-
-
diff --git a/examples/Example_032_UndulatorFlux.py b/examples/Example_032_UndulatorFlux.py
@@ -48,6 +48,3 @@
 
 plot_flux(flux)
 
-
-
-
diff --git a/examples/Example_033_EPUFlux.py b/examples/Example_033_EPUFlux.py
@@ -53,6 +53,3 @@
 
 plot_flux(flux)
 
-
-
-
diff --git a/examples/Example_042_UndulatorPowerDensity.py b/examples/Example_042_UndulatorPowerDensity.py
@@ -42,6 +42,3 @@
 
 plot_power_density(power_density)
 
-
-
-
diff --git a/examples/Example_043_EPUPowerDensity.py b/examples/Example_043_EPUPowerDensity.py
@@ -47,6 +47,3 @@
 
 plot_power_density(power_densty)
 
-
-
-
diff --git a/examples/Example_122_UndulatorSpectrum_MultiParticle.py b/examples/Example_122_UndulatorSpectrum_MultiParticle.py
@@ -64,6 +64,3 @@
     ofile='UndulatorSpectrum.png'
 )
 
-
-
-
diff --git a/examples/Example_122_UndulatorSpectrum_MultiParticle_MPI.py b/examples/Example_122_UndulatorSpectrum_MultiParticle_MPI.py
@@ -1,9 +1,3 @@
-# How to run this code:
-#   mpiexec -n 5 python Example_122_UndulatorSpectrum_MultiParticle_MPI.py
-
-
-# In this example MPI is used to calculate the spectrum in a multi-particle
-# simulation.  The rank 0 process calculates the ideal single-particle
 # spectrum and then waits for the other processes to return their data.
 # When a process returns the results are added to the others.  The results
 # are then plotted together and saved as a png.  If you want the plot to
diff --git a/examples/Example_123_EPUSpectrum_MultiParticle.py b/examples/Example_123_EPUSpectrum_MultiParticle.py
@@ -69,6 +69,3 @@
 # Combine the ideal and multi-particle spectra in one plot
 plot_spectra([spectrum_ideal, spectrum_multi], ['ideal', 'multi'])
 
-
-
-
diff --git a/examples/Example_123_EPUSpectrum_MultiParticle_MPI.py b/examples/Example_123_EPUSpectrum_MultiParticle_MPI.py
@@ -1,9 +1,3 @@
-# How to run this code:
-#   mpiexec -n 5 python Example_123_EPUSpectrum_MultiParticle_MPI.py
-
-
-# In this example MPI is used to calculate the spectrum in a multi-particle
-# simulation.  The rank 0 process calculates the ideal single-particle
 # spectrum and then waits for the other processes to return their data.
 # When a process returns the results are added to the others.  The results
 # are then plotted together and saved as a png.  If you want the plot to
diff --git a/examples/Example_132_UndulatorFlux_MultiParticle.py b/examples/Example_132_UndulatorFlux_MultiParticle.py
@@ -58,6 +58,3 @@
 
 plot_flux(flux_multi, ofile='UndulatorFlux_MultiParticle.png')
 
-
-
-
diff --git a/examples/Example_132_UndulatorFlux_MultiParticle_MPI.py b/examples/Example_132_UndulatorFlux_MultiParticle_MPI.py
@@ -1,9 +1,3 @@
-# How to run this code:
-#   mpiexec -n 5 python Example_132_UndulatorFlux_MultiParticle_MPI.py
-
-
-# In this example MPI is used to calculate the flux in a multi-particle
-# simulation.  The rank 0 process calculates the ideal single-particle
 # flux and then waits for the other processes to return their data.
 # When a process returns the results are added to the others.  The results
 # are then plotted together and saved as a png.  If you want the plot to
diff --git a/examples/Example_133_EPUFlux_MultiParticle.py b/examples/Example_133_EPUFlux_MultiParticle.py
@@ -68,6 +68,3 @@
 
 plot_flux(flux)
 
-
-
-
diff --git a/examples/Example_133_EPUFlux_MultiParticle_MPI.py b/examples/Example_133_EPUFlux_MultiParticle_MPI.py
@@ -1,9 +1,3 @@
-# How to run this code:
-#   mpiexec -n 5 python Example_133_EPUFlux_MultiParticle_MPI.py
-
-
-# In this example MPI is used to calculate the flux in a multi-particle
-# simulation.  The rank 0 process calculates the ideal single-particle
 # flux and then waits for the other processes to return their data.
 # When a process returns the results are added to the others.  The results
 # are then plotted together and saved as a png.  If you want the plot to
diff --git a/examples/Example_142_UndulatorPowerDensity_MultiParticle.py b/examples/Example_142_UndulatorPowerDensity_MultiParticle.py
@@ -50,6 +50,3 @@
 
 plot_power_density(pd_multi, ofile='UndulatorPowerDensity_MultiParticle.png')
 
-
-
-
diff --git a/examples/Example_142_UndulatorPowerDensity_MultiParticle_MPI.py b/examples/Example_142_UndulatorPowerDensity_MultiParticle_MPI.py
@@ -1,9 +1,3 @@
-# How to run this code:
-#   mpiexec -n 5 python Example_142_UndulatorPowerDensity_MultiParticle_MPI.py
-
-
-# In this example MPI is used to calculate the power density in a multi-particle
-# simulation.  The rank 0 process calculates the ideal single-particle
 # power density and then waits for the other processes to return their data.
 # When a process returns the results are added to the others.  The results
 # are then plotted together and saved as a png.  If you want the plot to
diff --git a/examples/Example_143_EPUPowerDensity_MultiParticle.py b/examples/Example_143_EPUPowerDensity_MultiParticle.py
@@ -58,6 +58,3 @@
 
 plot_power_density(pd)
 
-
-
-
diff --git a/examples/Example_143_EPUPowerDensity_MultiParticle_MPI.py b/examples/Example_143_EPUPowerDensity_MultiParticle_MPI.py
@@ -1,9 +1,3 @@
-# How to run this code:
-#   mpiexec -n 5 python Example_143_EPUPowerDensity_MultiParticle_MPI.py
-
-
-# In this example MPI is used to calculate the power density in a multi-particle
-# simulation.  The rank 0 process calculates the ideal single-particle
 # power density and then waits for the other processes to return their data.
 # When a process returns the results are added to the others.  The results
 # are then plotted together and saved as a png.  If you want the plot to
diff --git a/examples/Example_342_UndulatorPowerDensity_Sphere.py b/examples/Example_342_UndulatorPowerDensity_Sphere.py
@@ -44,8 +44,5 @@
 sphere = PSSphere(R=0.01, nu=51, nv=51)
 
 # Next run the calclation and plot
-power_density_3d(osr, sphere, translation=[0, 0, 30])
-
-
-
+pd = power_density_3d(osr, sphere, translation=[0, 0, 30], figsize=[15, 15])
 
diff --git a/examples/GettingStarted_ImportingFieldData.py b/examples/GettingStarted_ImportingFieldData.py
@@ -2,7 +2,7 @@
 # coding: utf-8
 
 # matplotlib plots inline
-get_ipython().magic('matplotlib inline')
+get_ipython().run_line_magic('matplotlib', 'inline')
 
 # Import the OSCARS SR module
 import oscars.sr
@@ -64,6 +64,3 @@
 
 plot_bfield(osr)
 
-
-
-
diff --git a/examples/GettingStarted_Undulator3DPowerDensity.py b/examples/GettingStarted_Undulator3DPowerDensity.py
@@ -2,7 +2,7 @@
 # coding: utf-8
 
 # Plots inline for notebook
-get_ipython().magic('matplotlib inline')
+get_ipython().run_line_magic('matplotlib', 'inline')
 
 # Import the OSCARS SR module
 import oscars.sr
@@ -32,8 +32,5 @@
 cylinder = PSCylinder(R=0.020, L=0.010, nu=101, nv=101)
 
 # Run calculation and plotting
-power_density_3d(osr, cylinder, rotations=[osr.pi()/2, 0, 0], translation=[0, 0, 30])
-
-
-
+pd = power_density_3d(osr, cylinder, rotations=[osr.pi()/2, 0, 0], translation=[0, 0, 30])
 
diff --git a/examples/GettingStarted_Undulator3DPowerDensity_CAD.py b/examples/GettingStarted_Undulator3DPowerDensity_CAD.py
@@ -0,0 +1,41 @@
+
+# coding: utf-8
+
+# Plots inline for notebook
+get_ipython().run_line_magic('matplotlib', 'inline')
+
+# Import the OSCARS SR module
+import oscars.sr
+
+# Import the 3D and parametric surfaces utilities
+from oscars.plots3d_mpl import *
+
+
+# Create a new OSCARS object.  Default to 8 threads and always use the GPU if available
+osr = oscars.sr.sr(nthreads=8, gpu=1)
+
+
+# Clear all existing fields and create an undulator field
+osr.clear_bfields()
+osr.add_bfield_undulator(bfield=[0, 1, 0], period=[0, 0, 0.050], nperiods=31)
+
+
+# Define simple electron beam
+osr.set_particle_beam(energy_GeV=3, x0=[0, 0, -1], current=0.5)
+
+# Define the start and stop times for the calculation
+osr.set_ctstartstop(0, 2)
+
+
+# Clculate power density on CAD surface from STL file.
+# Here 'scale' is used since the input file units are in mm
+# while OSCARS expects m (there is no STL standard so you must
+# keep track of this yourself)
+pd = osr.calculate_power_density_stl(
+    ifile='sphere.stl',
+    scale=0.001,
+    translation=[0, 0, 5]
+)
+
+plot_power_density_stl(pd)
+
diff --git a/examples/GettingStarted_UndulatorFlux.py b/examples/GettingStarted_UndulatorFlux.py
@@ -2,7 +2,7 @@
 # coding: utf-8
 
 # Plots inline for notebook
-get_ipython().magic('matplotlib inline')
+get_ipython().run_line_magic('matplotlib', 'inline')
 
 # Import the OSCARS SR module
 import oscars.sr
@@ -40,6 +40,3 @@
 # Plot flux
 plot_flux(flux)
 
-
-
-
diff --git a/examples/GettingStarted_UndulatorPowerDensity.py b/examples/GettingStarted_UndulatorPowerDensity.py
@@ -2,7 +2,7 @@
 # coding: utf-8
 
 # Plots inline for notebook
-get_ipython().magic('matplotlib inline')
+get_ipython().run_line_magic('matplotlib', 'inline')
 
 # Import the OSCARS SR module
 import oscars.sr
@@ -39,6 +39,3 @@
 # Plot power density
 plot_power_density(power_density)
 
-
-
-
diff --git a/examples/GettingStarted_UndulatorSpectrum.py b/examples/GettingStarted_UndulatorSpectrum.py
@@ -2,7 +2,7 @@
 # coding: utf-8
 
 # Plots inline for notebook
-get_ipython().magic('matplotlib inline')
+get_ipython().run_line_magic('matplotlib', 'inline')
 
 # Import the OSCARS SR module
 import oscars.sr
@@ -34,6 +34,3 @@
 # Plot spectrum
 plot_spectrum(spectrum)
 
-
-
-

-Original file line number
+Diff line change
 plot_flux(flux)
+-
+-
+-