Corrected minor bugs

Marcraven · Apr 30, 2024 · 516af6f · 516af6f
1 parent d3143a2
commit 516af6f
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
diff --git a/docs/source/examples/example_readme.py b/docs/source/examples/example_readme.py
@@ -96,6 +96,5 @@
 polycrystal.diffract(beam, detector, motion)
 ##example:
 
-import os
 path = os.path.join( os.path.dirname(__file__), "..", 'images', "diffraction_pattern.png")
 fig.savefig(os.path.abspath(path), bbox_inches='tight', transparent=True)
diff --git a/xrd_simulator/beam.py b/xrd_simulator/beam.py
@@ -20,7 +20,6 @@ class Beam():
 
     The beam is described in the laboratory coordinate system.
 
->>>>>>> vectorization
     Args:
         beam_vertices (:obj:`numpy array`): Vertices of the xray beam in units of microns, ``shape=(N,3)``.
         xray_propagation_direction (:obj:`numpy array`): Propagation direction of xrays, ``shape=(3,)``.