From 6b6c43a0c4f21af49c92fd6d7a7ed51bdd6d7366 Mon Sep 17 00:00:00 2001 From: maclariz Date: Mon, 2 Sep 2024 16:24:03 +0100 Subject: [PATCH 1/4] Update digital_dark_field.py --- py4DSTEM/process/diffraction/digital_dark_field.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/py4DSTEM/process/diffraction/digital_dark_field.py b/py4DSTEM/process/diffraction/digital_dark_field.py index cf91bfb22..841e9e1ba 100644 --- a/py4DSTEM/process/diffraction/digital_dark_field.py +++ b/py4DSTEM/process/diffraction/digital_dark_field.py @@ -28,6 +28,7 @@ def aperture_array_generator( plot_image=None, plot_marker_size=100, plot_marker_radius_pixels=None, + plot_marker_color='g', figsize=(6, 6), returnfig=False, **kwargs, @@ -102,7 +103,9 @@ def aperture_array_generator( plot_marker_size: float Marker size in points (standard matplotlib) plot_marker_radius_pixels: float - Marker radius in pixels. + Marker radius in pixels + plot_marker_color: 3-tuple or string + Any sensible python color definition figsize: (float, float) Figure size. returnfig: bool @@ -188,8 +191,8 @@ def aperture_array_generator( heights=2.0 * plot_marker_radius_pixels, angles=0, units="xy", - facecolors=(0.0, 1.0, 0.0, 0.3), - # facecolors=plt.cm.hsv(color), + facecolors=plot_marker_color, + alpha=0.3, offsets=offsets, transOffset=ax.transData, ), From 87c340be4dfadcf1a1cf34fbb06f73de5a1581ef Mon Sep 17 00:00:00 2001 From: maclariz Date: Mon, 2 Sep 2024 16:30:08 +0100 Subject: [PATCH 2/4] Update digital_dark_field.py --- py4DSTEM/process/diffraction/digital_dark_field.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/py4DSTEM/process/diffraction/digital_dark_field.py b/py4DSTEM/process/diffraction/digital_dark_field.py index 841e9e1ba..40f4cb1eb 100644 --- a/py4DSTEM/process/diffraction/digital_dark_field.py +++ b/py4DSTEM/process/diffraction/digital_dark_field.py @@ -28,7 +28,7 @@ def aperture_array_generator( plot_image=None, plot_marker_size=100, plot_marker_radius_pixels=None, - plot_marker_color='g', + plot_marker_color="g", figsize=(6, 6), returnfig=False, **kwargs, @@ -103,8 +103,8 @@ def aperture_array_generator( plot_marker_size: float Marker size in points (standard matplotlib) plot_marker_radius_pixels: float - Marker radius in pixels - plot_marker_color: 3-tuple or string + Marker radius in pixels + plot_marker_color: 3-tuple or string Any sensible python color definition figsize: (float, float) Figure size. From 1d8bc2d1ba0376da7ac11b577f6dc3993006a382 Mon Sep 17 00:00:00 2001 From: maclariz Date: Mon, 2 Sep 2024 16:32:39 +0100 Subject: [PATCH 3/4] Update digital_dark_field.py Allowed changes to overlay color in aperture_array_generator --- py4DSTEM/process/diffraction/digital_dark_field.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/py4DSTEM/process/diffraction/digital_dark_field.py b/py4DSTEM/process/diffraction/digital_dark_field.py index 40f4cb1eb..cd4748277 100644 --- a/py4DSTEM/process/diffraction/digital_dark_field.py +++ b/py4DSTEM/process/diffraction/digital_dark_field.py @@ -103,9 +103,9 @@ def aperture_array_generator( plot_marker_size: float Marker size in points (standard matplotlib) plot_marker_radius_pixels: float - Marker radius in pixels - plot_marker_color: 3-tuple or string - Any sensible python color definition + Marker radius in pixels + plot_marker_color: 3-tuple or string + Any sensible python color definition figsize: (float, float) Figure size. returnfig: bool From 0baebf16bc3ca558ca51afee98f086e047e756f7 Mon Sep 17 00:00:00 2001 From: Stephanie Ribet Date: Mon, 2 Sep 2024 09:00:57 -0700 Subject: [PATCH 4/4] black format --- py4DSTEM/process/diffraction/digital_dark_field.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/py4DSTEM/process/diffraction/digital_dark_field.py b/py4DSTEM/process/diffraction/digital_dark_field.py index cd4748277..f482e8398 100644 --- a/py4DSTEM/process/diffraction/digital_dark_field.py +++ b/py4DSTEM/process/diffraction/digital_dark_field.py @@ -105,7 +105,7 @@ def aperture_array_generator( plot_marker_radius_pixels: float Marker radius in pixels plot_marker_color: 3-tuple or string - Any sensible python color definition + Any sensible python color definition figsize: (float, float) Figure size. returnfig: bool