fakecbed 0.1.0__py3-none-any.whl → 0.2.1__py3-none-any.whl

fakecbed/discretized.py

@@ -21,12 +21,6 @@
 ## Load libraries/packages/modules ##
 #####################################
 
-# For accessing attributes of functions.
-import inspect
-
-# For randomly selecting items in dictionaries.
-import random
-
 # For performing deep copies.
 import copy
 
@@ -74,9 +68,7 @@ __all__ = ["CBEDPattern"]
 
 
 def _check_and_convert_undistorted_tds_model(params):
-    current_func_name = inspect.stack()[0][3]
-    char_idx = 19
-    obj_name = current_func_name[char_idx:]
+    obj_name = "undistorted_tds_model"
     obj = params[obj_name]
 
     accepted_types = (fakecbed.tds.Model, type(None))
@@ -95,7 +87,7 @@ def _check_and_convert_undistorted_tds_model(params):
 
 
 def _pre_serialize_undistorted_tds_model(undistorted_tds_model):
-    obj_to_pre_serialize = random.choice(list(locals().values()))
+    obj_to_pre_serialize = undistorted_tds_model
     serializable_rep = obj_to_pre_serialize.pre_serialize()
     
     return serializable_rep
@@ -111,11 +103,11 @@ def _de_pre_serialize_undistorted_tds_model(serializable_rep):
 
 
 def _check_and_convert_undistorted_disks(params):
-    current_func_name = inspect.stack()[0][3]
-    char_idx = 19
-    obj_name = current_func_name[char_idx:]
+    obj_name = "undistorted_disks"
     obj = params[obj_name]
 
+    current_func_name = "_check_and_convert_undistorted_disks"
+
     try:
         for undistorted_disk in obj:
             accepted_types = (fakecbed.shapes.NonuniformBoundedShape,)
@@ -147,7 +139,7 @@ def _check_and_convert_undistorted_disks(params):
 
 
 def _pre_serialize_undistorted_disks(undistorted_disks):
-    obj_to_pre_serialize = random.choice(list(locals().values()))
+    obj_to_pre_serialize = undistorted_disks
     serializable_rep = tuple()
     for elem in obj_to_pre_serialize:
         serializable_rep += (elem.pre_serialize(),)
@@ -172,9 +164,7 @@ def _de_pre_serialize_undistorted_disks(serializable_rep):
 
 
 def _check_and_convert_undistorted_misc_shapes(params):
-    current_func_name = inspect.stack()[0][3]
-    char_idx = 19
-    obj_name = current_func_name[char_idx:]
+    obj_name = "undistorted_misc_shapes"
     obj = params[obj_name]
 
     accepted_types = (fakecbed.shapes.Circle,
@@ -188,6 +178,8 @@ def _check_and_convert_undistorted_misc_shapes(params):
                       fakecbed.shapes.Lune,
                       fakecbed.shapes.NonuniformBoundedShape)
 
+    current_func_name = "_check_and_convert_undistorted_misc_shapes"
+
     try:
         for undistorted_misc_shape in obj:
             kwargs = {"obj": undistorted_misc_shape,
@@ -205,7 +197,7 @@ def _check_and_convert_undistorted_misc_shapes(params):
 
 
 def _pre_serialize_undistorted_misc_shapes(undistorted_misc_shapes):
-    obj_to_pre_serialize = random.choice(list(locals().values()))
+    obj_to_pre_serialize = undistorted_misc_shapes
     serializable_rep = tuple()
     for elem in obj_to_pre_serialize:
         serializable_rep += (elem.pre_serialize(),)
@@ -249,9 +241,7 @@ def _de_pre_serialize_undistorted_misc_shapes(serializable_rep):
 
 
 def _check_and_convert_undistorted_outer_illumination_shape(params):
-    current_func_name = inspect.stack()[0][3]
-    char_idx = 19
-    obj_name = current_func_name[char_idx:]
+    obj_name = "undistorted_outer_illumination_shape"
     obj = params[obj_name]
 
     accepted_types = (fakecbed.shapes.Circle,
@@ -275,7 +265,7 @@ def _check_and_convert_undistorted_outer_illumination_shape(params):
 
 def _pre_serialize_undistorted_outer_illumination_shape(
         undistorted_outer_illumination_shape):
-    obj_to_pre_serialize = random.choice(list(locals().values()))
+    obj_to_pre_serialize = undistorted_outer_illumination_shape
     serializable_rep = obj_to_pre_serialize.pre_serialize()
     
     return serializable_rep
@@ -298,8 +288,7 @@ def _de_pre_serialize_undistorted_outer_illumination_shape(serializable_rep):
 
 
 def _check_and_convert_gaussian_filter_std_dev(params):
-    current_func_name = inspect.stack()[0][3]
-    obj_name = current_func_name[19:]
+    obj_name = "gaussian_filter_std_dev"
     func_alias = czekitout.convert.to_nonnegative_float
     kwargs = {"obj": params[obj_name], "obj_name": obj_name}
     gaussian_filter_std_dev = func_alias(**kwargs)
@@ -308,9 +297,8 @@ def _check_and_convert_gaussian_filter_std_dev(params):
 
 
 
-def _pre_serialize_gaussian_filter_std_dev(
-        gaussian_filter_std_dev):
-    obj_to_pre_serialize = random.choice(list(locals().values()))
+def _pre_serialize_gaussian_filter_std_dev(gaussian_filter_std_dev):
+    obj_to_pre_serialize = gaussian_filter_std_dev
     serializable_rep = obj_to_pre_serialize
     
     return serializable_rep
@@ -325,9 +313,7 @@ def _de_pre_serialize_gaussian_filter_std_dev(serializable_rep):
 
 
 def _check_and_convert_distortion_model(params):
-    current_func_name = inspect.stack()[0][3]
-    char_idx = 19
-    obj_name = current_func_name[char_idx:]
+    obj_name = "distortion_model"
     obj = params[obj_name]
 
     num_pixels_across_pattern = \
@@ -351,6 +337,8 @@ def _check_and_convert_distortion_model(params):
     sampling_grid_dims_in_pixels = \
         distortion_model_core_attrs["sampling_grid_dims_in_pixels"]
 
+    current_func_name = "_check_and_convert_distortion_model"
+
     if ((sampling_grid_dims_in_pixels[0]%num_pixels_across_pattern != 0)
         or (sampling_grid_dims_in_pixels[1]%num_pixels_across_pattern != 0)):
         err_msg = globals()[current_func_name+"_err_msg_1"]
@@ -361,7 +349,7 @@ def _check_and_convert_distortion_model(params):
 
 
 def _pre_serialize_distortion_model(distortion_model):
-    obj_to_pre_serialize = random.choice(list(locals().values()))
+    obj_to_pre_serialize = distortion_model
     serializable_rep = obj_to_pre_serialize.pre_serialize()
     
     return serializable_rep
@@ -377,8 +365,7 @@ def _de_pre_serialize_distortion_model(serializable_rep):
 
 
 def _check_and_convert_num_pixels_across_pattern(params):
-    current_func_name = inspect.stack()[0][3]
-    obj_name = current_func_name[19:]
+    obj_name = "num_pixels_across_pattern"
     kwargs = {"obj": params[obj_name], "obj_name": obj_name}
     num_pixels_across_pattern = czekitout.convert.to_positive_int(**kwargs)
 
@@ -387,7 +374,7 @@ def _check_and_convert_num_pixels_across_pattern(params):
 
 
 def _pre_serialize_num_pixels_across_pattern(num_pixels_across_pattern):
-    obj_to_pre_serialize = random.choice(list(locals().values()))
+    obj_to_pre_serialize = num_pixels_across_pattern
     serializable_rep = obj_to_pre_serialize
     
     return serializable_rep
@@ -402,8 +389,7 @@ def _de_pre_serialize_num_pixels_across_pattern(serializable_rep):
 
 
 def _check_and_convert_apply_shot_noise(params):
-    current_func_name = inspect.stack()[0][3]
-    obj_name = current_func_name[19:]
+    obj_name = "apply_shot_noise"
     kwargs = {"obj": params[obj_name], "obj_name": obj_name}
     apply_shot_noise = czekitout.convert.to_bool(**kwargs)
 
@@ -412,7 +398,7 @@ def _check_and_convert_apply_shot_noise(params):
 
 
 def _pre_serialize_apply_shot_noise(apply_shot_noise):
-    obj_to_pre_serialize = random.choice(list(locals().values()))
+    obj_to_pre_serialize = apply_shot_noise
     serializable_rep = obj_to_pre_serialize
     
     return serializable_rep
@@ -427,8 +413,7 @@ def _de_pre_serialize_apply_shot_noise(serializable_rep):
 
 
 def _check_and_convert_detector_partition_width_in_pixels(params):
-    current_func_name = inspect.stack()[0][3]
-    obj_name = current_func_name[19:]
+    obj_name = "detector_partition_width_in_pixels"
     func_alias = czekitout.convert.to_nonnegative_int
     kwargs = {"obj": params[obj_name], "obj_name": obj_name}
     detector_partition_width_in_pixels = func_alias(**kwargs)
@@ -439,7 +424,7 @@ def _check_and_convert_detector_partition_width_in_pixels(params):
 
 def _pre_serialize_detector_partition_width_in_pixels(
         detector_partition_width_in_pixels):
-    obj_to_pre_serialize = random.choice(list(locals().values()))
+    obj_to_pre_serialize = detector_partition_width_in_pixels
     serializable_rep = obj_to_pre_serialize
     
     return serializable_rep
@@ -454,14 +439,15 @@ def _de_pre_serialize_detector_partition_width_in_pixels(serializable_rep):
 
 
 def _check_and_convert_cold_pixels(params):
-    current_func_name = inspect.stack()[0][3]
-    obj_name = current_func_name[19:]
+    obj_name = "cold_pixels"
     kwargs = {"obj": params[obj_name], "obj_name": obj_name}
     cold_pixels = czekitout.convert.to_pairs_of_ints(**kwargs)
 
     num_pixels_across_pattern = \
         _check_and_convert_num_pixels_across_pattern(params)
 
+    current_func_name = "_check_and_convert_cold_pixels"
+
     coords_of_cold_pixels = cold_pixels
     for coords_of_cold_pixel in coords_of_cold_pixels:
         row, col = coords_of_cold_pixel
@@ -491,8 +477,7 @@ def _de_pre_serialize_cold_pixels(serializable_rep):
 
 
 def _check_and_convert_mask_frame(params):
-    current_func_name = inspect.stack()[0][3]
-    obj_name = current_func_name[19:]
+    obj_name = "mask_frame"
     kwargs = {"obj": params[obj_name], "obj_name": obj_name}
     mask_frame = czekitout.convert.to_quadruplet_of_nonnegative_ints(**kwargs)
 
@@ -501,7 +486,7 @@ def _check_and_convert_mask_frame(params):
 
 
 def _pre_serialize_mask_frame(mask_frame):
-    obj_to_pre_serialize = random.choice(list(locals().values()))
+    obj_to_pre_serialize = mask_frame
     serializable_rep = obj_to_pre_serialize
     
     return serializable_rep
@@ -516,8 +501,7 @@ def _de_pre_serialize_mask_frame(serializable_rep):
 
 
 def _check_and_convert_deep_copy(params):
-    current_func_name = inspect.stack()[0][3]
-    obj_name = current_func_name[19:]
+    obj_name = "deep_copy"
     kwargs = {"obj": params[obj_name], "obj_name": obj_name}
     deep_copy = czekitout.convert.to_bool(**kwargs)
 
@@ -526,9 +510,7 @@ def _check_and_convert_deep_copy(params):
 
 
 def _check_and_convert_overriding_image(params):
-    current_func_name = inspect.stack()[0][3]
-    char_idx = 19
-    obj_name = current_func_name[char_idx:]
+    obj_name = "overriding_image"
     obj = params[obj_name]
 
     func_alias = fakecbed.shapes._check_and_convert_real_torch_matrix
@@ -542,6 +524,8 @@ def _check_and_convert_overriding_image(params):
     num_pixels_across_pattern = params["num_pixels_across_pattern"]
     expected_image_dims_in_pixels = 2*(num_pixels_across_pattern,)
 
+    current_func_name = "_check_and_convert_overriding_image"
+
     if overriding_image.shape != expected_image_dims_in_pixels:
         unformatted_err_msg = globals()[current_func_name+"_err_msg_1"]
         args = expected_image_dims_in_pixels
@@ -908,7 +892,7 @@ class CBEDPattern(fancytypes.PreSerializableAndUpdatable):
         \text{det}\left(\mathbf{J}_{\square}\left(
         q_{\mathring{\mathcal{I}};x;j},
         q_{\mathring{\mathcal{I}};y;i}\right)\right)
-        \mathring{\mathcal{I}}_{\text{CBED};⌑;i,j}.
+        \left|\mathring{\mathcal{I}}_{\text{CBED};⌑;i,j}\right|.
         :label: HD_I_CBED__3
 
     8. Apply average pooling to
@@ -1178,8 +1162,12 @@ class CBEDPattern(fancytypes.PreSerializableAndUpdatable):
 
 
 
-    def update(self, new_core_attr_subset_candidate):
-        super().update(new_core_attr_subset_candidate)
+    def update(self,
+               new_core_attr_subset_candidate,
+               skip_validation_and_conversion=\
+               _default_skip_validation_and_conversion):
+        super().update(new_core_attr_subset_candidate,
+                       skip_validation_and_conversion)
         self.execute_post_core_attrs_update_actions()
 
         return None
@@ -1666,21 +1654,20 @@ class CBEDPattern(fancytypes.PreSerializableAndUpdatable):
         method_name = ("_calc_maskless_and_noiseless_image"
                        "_and_cache_select_intermediates")
         method_alias = getattr(self, method_name)
-        maskless_and_noiseless_image = method_alias(u_x, u_y)
+        image = method_alias(u_x, u_y)
+
+        apply_shot_noise = self._apply_shot_noise
+        image = torch.poisson(image) if (apply_shot_noise == True) else image
 
+        image = self._apply_detector_partition_inpainting(input_image=image)
+            
         if self._illumination_support is None:
             method_name = "_calc_illumination_support"
             method_alias = getattr(self, method_name)
             self._illumination_support = method_alias(u_x, u_y)
         illumination_support = self._illumination_support
 
-        noiseless_image = maskless_and_noiseless_image*illumination_support
-
-        apply_shot_noise = self._apply_shot_noise
-
-        image = (torch.poisson(noiseless_image)
-                 if (apply_shot_noise == True)
-                 else noiseless_image)
+        image = image*illumination_support        
 
         coords_of_cold_pixels = self._cold_pixels
         L, R, B, T = self._mask_frame
@@ -1694,8 +1681,6 @@ class CBEDPattern(fancytypes.PreSerializableAndUpdatable):
         for coords_of_cold_pixel in coords_of_cold_pixels:
             image[coords_of_cold_pixel] = 0
 
-        image = self._apply_detector_partition_inpainting(input_image=image)
-            
         image = self._normalize_matrix(input_matrix=image)
 
         image = torch.clip(image, min=0)
@@ -1728,6 +1713,8 @@ class CBEDPattern(fancytypes.PreSerializableAndUpdatable):
                                         + (disk_supports
                                            * intra_disk_shapes).sum(dim=0))
 
+        maskless_and_noiseless_image = torch.abs(maskless_and_noiseless_image)
+
         kwargs = {"input_matrix": maskless_and_noiseless_image,
                   "truncate": 4}
         maskless_and_noiseless_image = self._apply_2d_guassian_filter(**kwargs)

fakecbed/shapes.py

@@ -58,12 +58,6 @@ coordinate transformation that maps a coordinate pair
 ## Load libraries/packages/modules ##
 #####################################
 
-# For accessing attributes of functions.
-import inspect
-
-# For randomly selecting items in dictionaries.
-import random
-
 # For performing deep copies.
 import copy
 
@@ -109,9 +103,7 @@ __all__ = ["BaseShape",
 
 
 def _check_and_convert_cartesian_coords(params):
-    current_func_name = inspect.stack()[0][3]
-    char_idx = 19
-    obj_name = current_func_name[char_idx:]
+    obj_name = "cartesian_coords"
     obj = params[obj_name]
 
     u_x, u_y = obj
@@ -127,6 +119,8 @@ def _check_and_convert_cartesian_coords(params):
     del params["real_torch_matrix"]
     del params["name_of_alias_of_real_torch_matrix"]
 
+    current_func_name = "_check_and_convert_cartesian_coords"
+
     if u_x.shape != u_y.shape:
         unformatted_err_msg = globals()[current_func_name+"_err_msg_1"]
         err_msg = unformatted_err_msg.format("u_x", "u_y")
@@ -139,14 +133,14 @@ def _check_and_convert_cartesian_coords(params):
 
 
 def _check_and_convert_real_torch_matrix(params):
-    current_func_name = inspect.stack()[0][3]
-    char_idx = 19
-    obj_name = current_func_name[char_idx:]
+    obj_name = "real_torch_matrix"
     obj = params[obj_name]
     
     name_of_alias_of_real_torch_matrix = \
         params["name_of_alias_of_real_torch_matrix"]
 
+    current_func_name = "_check_and_convert_real_torch_matrix"
+
     try:
         if not isinstance(obj, torch.Tensor):
             kwargs = {"obj": obj,
@@ -201,8 +195,7 @@ def _check_and_convert_torch_device_obj(params):
 
 
 def _check_and_convert_skip_validation_and_conversion(params):
-    current_func_name = inspect.stack()[0][3]
-    obj_name = current_func_name[19:]
+    obj_name = "skip_validation_and_conversion"
     kwargs = {"obj": params[obj_name], "obj_name": obj_name}
     skip_validation_and_conversion = czekitout.convert.to_bool(**kwargs)
 
@@ -346,8 +339,7 @@ class BaseShape(fancytypes.PreSerializableAndUpdatable):
 
 
 def _check_and_convert_center(params):
-    current_func_name = inspect.stack()[0][3]
-    obj_name = current_func_name[19:]
+    obj_name = "center"
 
     cls_alias = \
         distoptica.CoordTransformParams
@@ -363,9 +355,8 @@ def _check_and_convert_center(params):
 
 
 def _pre_serialize_center(center):
-    obj_to_pre_serialize = random.choice(list(locals().values()))
-    current_func_name = inspect.stack()[0][3]
-    obj_name = current_func_name[15:]
+    obj_to_pre_serialize = center
+    obj_name = "center"
 
     cls_alias = \
         distoptica.CoordTransformParams
@@ -381,8 +372,7 @@ def _pre_serialize_center(center):
 
 
 def _de_pre_serialize_center(serializable_rep):
-    current_func_name = inspect.stack()[0][3]
-    obj_name = current_func_name[18:]
+    obj_name = "center"
 
     cls_alias = \
         distoptica.CoordTransformParams
@@ -398,8 +388,7 @@ def _de_pre_serialize_center(serializable_rep):
 
 
 def _check_and_convert_radius(params):
-    current_func_name = inspect.stack()[0][3]
-    obj_name = current_func_name[19:]
+    obj_name = "radius"
     kwargs = {"obj": params[obj_name], "obj_name": obj_name}
     radius = czekitout.convert.to_positive_float(**kwargs)
 
@@ -408,7 +397,7 @@ def _check_and_convert_radius(params):
 
 
 def _pre_serialize_radius(radius):
-    obj_to_pre_serialize = random.choice(list(locals().values()))
+    obj_to_pre_serialize = radius
     serializable_rep = obj_to_pre_serialize
     
     return serializable_rep
@@ -423,8 +412,7 @@ def _de_pre_serialize_radius(serializable_rep):
 
 
 def _check_and_convert_intra_shape_val(params):
-    current_func_name = inspect.stack()[0][3]
-    obj_name = current_func_name[19:]
+    obj_name = "intra_shape_val"
     kwargs = {"obj": params[obj_name], "obj_name": obj_name}
     intra_shape_val = czekitout.convert.to_float(**kwargs)
 
@@ -433,7 +421,7 @@ def _check_and_convert_intra_shape_val(params):
 
 
 def _pre_serialize_intra_shape_val(intra_shape_val):
-    obj_to_pre_serialize = random.choice(list(locals().values()))
+    obj_to_pre_serialize = intra_shape_val
     serializable_rep = obj_to_pre_serialize
     
     return serializable_rep
@@ -558,8 +546,12 @@ class Circle(BaseShape):
 
 
 
-    def update(self, new_core_attr_subset_candidate):
-        super().update(new_core_attr_subset_candidate)
+    def update(self,
+               new_core_attr_subset_candidate,
+               skip_validation_and_conversion=\
+               _default_skip_validation_and_conversion):
+        super().update(new_core_attr_subset_candidate,
+                       skip_validation_and_conversion)
         self.execute_post_core_attrs_update_actions()
 
         return None
@@ -583,8 +575,7 @@ class Circle(BaseShape):
 
 
 def _check_and_convert_semi_major_axis(params):
-    current_func_name = inspect.stack()[0][3]
-    obj_name = current_func_name[19:]
+    obj_name = "semi_major_axis"
     kwargs = {"obj": params[obj_name], "obj_name": obj_name}
     semi_major_axis = czekitout.convert.to_positive_float(**kwargs)
 
@@ -593,7 +584,7 @@ def _check_and_convert_semi_major_axis(params):
 
 
 def _pre_serialize_semi_major_axis(semi_major_axis):
-    obj_to_pre_serialize = random.choice(list(locals().values()))
+    obj_to_pre_serialize = semi_major_axis
     serializable_rep = obj_to_pre_serialize
     
     return serializable_rep
@@ -608,11 +599,12 @@ def _de_pre_serialize_semi_major_axis(serializable_rep):
 
 
 def _check_and_convert_eccentricity(params):
-    current_func_name = inspect.stack()[0][3]
-    obj_name = current_func_name[19:]
+    obj_name = "eccentricity"
     kwargs = {"obj": params[obj_name], "obj_name": obj_name}
     eccentricity = czekitout.convert.to_nonnegative_float(**kwargs)
 
+    current_func_name = "_check_and_convert_eccentricity"
+    
     if eccentricity > 1:
         err_msg = globals()[current_func_name+"_err_msg_1"]
         raise ValueError(err_msg)
@@ -622,7 +614,7 @@ def _check_and_convert_eccentricity(params):
 
 
 def _pre_serialize_eccentricity(eccentricity):
-    obj_to_pre_serialize = random.choice(list(locals().values()))
+    obj_to_pre_serialize = eccentricity
     serializable_rep = obj_to_pre_serialize
     
     return serializable_rep
@@ -637,8 +629,7 @@ def _de_pre_serialize_eccentricity(serializable_rep):
 
 
 def _check_and_convert_rotation_angle(params):
-    current_func_name = inspect.stack()[0][3]
-    obj_name = current_func_name[19:]
+    obj_name = "rotation_angle"
     kwargs = {"obj": params[obj_name], "obj_name": obj_name}
     rotation_angle = czekitout.convert.to_float(**kwargs) % (2*np.pi)
 
@@ -647,7 +638,7 @@ def _check_and_convert_rotation_angle(params):
 
 
 def _pre_serialize_rotation_angle(rotation_angle):
-    obj_to_pre_serialize = random.choice(list(locals().values()))
+    obj_to_pre_serialize = rotation_angle
     serializable_rep = obj_to_pre_serialize
     
     return serializable_rep
@@ -798,8 +789,12 @@ class Ellipse(BaseShape):
 
 
 
-    def update(self, new_core_attr_subset_candidate):
-        super().update(new_core_attr_subset_candidate)
+    def update(self,
+               new_core_attr_subset_candidate,
+               skip_validation_and_conversion=\
+               _default_skip_validation_and_conversion):
+        super().update(new_core_attr_subset_candidate,
+                       skip_validation_and_conversion)
         self.execute_post_core_attrs_update_actions()
 
         return None
@@ -847,8 +842,7 @@ class Ellipse(BaseShape):
 
 
 def _check_and_convert_widths(params):
-    current_func_name = inspect.stack()[0][3]
-    obj_name = current_func_name[19:]
+    obj_name = "widths"
     kwargs = {"obj": params[obj_name], "obj_name": obj_name}
     widths = czekitout.convert.to_quadruplet_of_positive_floats(**kwargs)
 
@@ -857,7 +851,7 @@ def _check_and_convert_widths(params):
 
 
 def _pre_serialize_widths(widths):
-    obj_to_pre_serialize = random.choice(list(locals().values()))
+    obj_to_pre_serialize = widths
     serializable_rep = obj_to_pre_serialize
     
     return serializable_rep
@@ -872,8 +866,7 @@ def _de_pre_serialize_widths(serializable_rep):
 
 
 def _check_and_convert_val_at_center(params):
-    current_func_name = inspect.stack()[0][3]
-    obj_name = current_func_name[19:]
+    obj_name = "val_at_center"
     kwargs = {"obj": params[obj_name], "obj_name": obj_name}
     val_at_center = czekitout.convert.to_float(**kwargs)
 
@@ -882,7 +875,7 @@ def _check_and_convert_val_at_center(params):
 
 
 def _pre_serialize_val_at_center(val_at_center):
-    obj_to_pre_serialize = random.choice(list(locals().values()))
+    obj_to_pre_serialize = val_at_center
     serializable_rep = obj_to_pre_serialize
     
     return serializable_rep
@@ -897,8 +890,7 @@ def _de_pre_serialize_val_at_center(serializable_rep):
 
 
 def _check_and_convert_functional_form(params):
-    current_func_name = inspect.stack()[0][3]
-    obj_name = current_func_name[19:]
+    obj_name = "functional_form"
     kwargs = {"obj": params[obj_name], "obj_name": obj_name}
     functional_form = czekitout.convert.to_str_from_str_like(**kwargs)
 
@@ -913,7 +905,7 @@ def _check_and_convert_functional_form(params):
 
 
 def _pre_serialize_functional_form(functional_form):
-    obj_to_pre_serialize = random.choice(list(locals().values()))
+    obj_to_pre_serialize = functional_form
     serializable_rep = obj_to_pre_serialize
     
     return serializable_rep
@@ -1110,8 +1102,12 @@ class Peak(BaseShape):
 
 
 
-    def update(self, new_core_attr_subset_candidate):
-        super().update(new_core_attr_subset_candidate)
+    def update(self,
+               new_core_attr_subset_candidate,
+               skip_validation_and_conversion=\
+               _default_skip_validation_and_conversion):
+        super().update(new_core_attr_subset_candidate,
+                       skip_validation_and_conversion)
         self.execute_post_core_attrs_update_actions()
 
         return None
@@ -1206,8 +1202,7 @@ class Peak(BaseShape):
 
 
 def _check_and_convert_end_pt_1(params):
-    current_func_name = inspect.stack()[0][3]
-    obj_name = current_func_name[19:]
+    obj_name = "end_pt_1"
     kwargs = {"obj": params[obj_name], "obj_name": obj_name}
     end_pt_1 = czekitout.convert.to_pair_of_floats(**kwargs)
 
@@ -1216,7 +1211,7 @@ def _check_and_convert_end_pt_1(params):
 
 
 def _pre_serialize_end_pt_1(end_pt_1):
-    obj_to_pre_serialize = random.choice(list(locals().values()))
+    obj_to_pre_serialize = end_pt_1
     serializable_rep = obj_to_pre_serialize
     
     return serializable_rep
@@ -1231,8 +1226,7 @@ def _de_pre_serialize_end_pt_1(serializable_rep):
 
 
 def _check_and_convert_end_pt_2(params):
-    current_func_name = inspect.stack()[0][3]
-    obj_name = current_func_name[19:]
+    obj_name = "end_pt_2"
     kwargs = {"obj": params[obj_name], "obj_name": obj_name}
     end_pt_2 = czekitout.convert.to_pair_of_floats(**kwargs)
 
@@ -1241,7 +1235,7 @@ def _check_and_convert_end_pt_2(params):
 
 
 def _pre_serialize_end_pt_2(end_pt_2):
-    obj_to_pre_serialize = random.choice(list(locals().values()))
+    obj_to_pre_serialize = end_pt_2
     serializable_rep = obj_to_pre_serialize
     
     return serializable_rep
@@ -1256,8 +1250,7 @@ def _de_pre_serialize_end_pt_2(serializable_rep):
 
 
 def _check_and_convert_width(params):
-    current_func_name = inspect.stack()[0][3]
-    obj_name = current_func_name[19:]
+    obj_name = "width"
     kwargs = {"obj": params[obj_name], "obj_name": obj_name}
     width = czekitout.convert.to_positive_float(**kwargs)
 
@@ -1266,7 +1259,7 @@ def _check_and_convert_width(params):
 
 
 def _pre_serialize_width(width):
-    obj_to_pre_serialize = random.choice(list(locals().values()))
+    obj_to_pre_serialize = width
     serializable_rep = obj_to_pre_serialize
     
     return serializable_rep
@@ -1530,8 +1523,12 @@ class Band(BaseShape):
 
 
 
-    def update(self, new_core_attr_subset_candidate):
-        super().update(new_core_attr_subset_candidate)
+    def update(self,
+               new_core_attr_subset_candidate,
+               skip_validation_and_conversion=\
+               _default_skip_validation_and_conversion):
+        super().update(new_core_attr_subset_candidate,
+                       skip_validation_and_conversion)
         self.execute_post_core_attrs_update_actions()
 
         return None
@@ -1581,8 +1578,7 @@ class Band(BaseShape):
 
 
 def _check_and_convert_amplitude(params):
-    current_func_name = inspect.stack()[0][3]
-    obj_name = current_func_name[19:]
+    obj_name = "amplitude"
     kwargs = {"obj": params[obj_name], "obj_name": obj_name}
     amplitude = czekitout.convert.to_float(**kwargs)
 
@@ -1591,7 +1587,7 @@ def _check_and_convert_amplitude(params):
 
 
 def _pre_serialize_amplitude(amplitude):
-    obj_to_pre_serialize = random.choice(list(locals().values()))
+    obj_to_pre_serialize = amplitude
     serializable_rep = obj_to_pre_serialize
     
     return serializable_rep
@@ -1606,8 +1602,7 @@ def _de_pre_serialize_amplitude(serializable_rep):
 
 
 def _check_and_convert_wavelength(params):
-    current_func_name = inspect.stack()[0][3]
-    obj_name = current_func_name[19:]
+    obj_name = "wavelength"
     kwargs = {"obj": params[obj_name], "obj_name": obj_name}
     wavelength = czekitout.convert.to_positive_float(**kwargs)
 
@@ -1616,7 +1611,7 @@ def _check_and_convert_wavelength(params):
 
 
 def _pre_serialize_wavelength(wavelength):
-    obj_to_pre_serialize = random.choice(list(locals().values()))
+    obj_to_pre_serialize = wavelength
     serializable_rep = obj_to_pre_serialize
     
     return serializable_rep
@@ -1631,8 +1626,7 @@ def _de_pre_serialize_wavelength(serializable_rep):
 
 
 def _check_and_convert_propagation_direction(params):
-    current_func_name = inspect.stack()[0][3]
-    obj_name = current_func_name[19:]
+    obj_name = "propagation_direction"
     kwargs = {"obj": params[obj_name], "obj_name": obj_name}
     propagation_direction = czekitout.convert.to_float(**kwargs) % (2*np.pi)
 
@@ -1641,7 +1635,7 @@ def _check_and_convert_propagation_direction(params):
 
 
 def _pre_serialize_propagation_direction(propagation_direction):
-    obj_to_pre_serialize = random.choice(list(locals().values()))
+    obj_to_pre_serialize = propagation_direction
     serializable_rep = obj_to_pre_serialize
     
     return serializable_rep
@@ -1656,8 +1650,7 @@ def _de_pre_serialize_propagation_direction(serializable_rep):
 
 
 def _check_and_convert_phase(params):
-    current_func_name = inspect.stack()[0][3]
-    obj_name = current_func_name[19:]
+    obj_name = "phase"
     kwargs = {"obj": params[obj_name], "obj_name": obj_name}
     phase = czekitout.convert.to_float(**kwargs)
 
@@ -1666,7 +1659,7 @@ def _check_and_convert_phase(params):
 
 
 def _pre_serialize_phase(phase):
-    obj_to_pre_serialize = random.choice(list(locals().values()))
+    obj_to_pre_serialize = phase
     serializable_rep = obj_to_pre_serialize
     
     return serializable_rep
@@ -1814,8 +1807,12 @@ class PlaneWave(BaseShape):
 
 
 
-    def update(self, new_core_attr_subset_candidate):
-        super().update(new_core_attr_subset_candidate)
+    def update(self,
+               new_core_attr_subset_candidate,
+               skip_validation_and_conversion=\
+               _default_skip_validation_and_conversion):
+        super().update(new_core_attr_subset_candidate,
+                       skip_validation_and_conversion)
         self.execute_post_core_attrs_update_actions()
 
         return None
@@ -1835,8 +1832,7 @@ class PlaneWave(BaseShape):
 
 
 def _check_and_convert_midpoint_angle(params):
-    current_func_name = inspect.stack()[0][3]
-    obj_name = current_func_name[19:]
+    obj_name = "midpoint_angle"
     kwargs = {"obj": params[obj_name], "obj_name": obj_name}
     midpoint_angle = czekitout.convert.to_float(**kwargs) % (2*np.pi)
 
@@ -1845,7 +1841,7 @@ def _check_and_convert_midpoint_angle(params):
 
 
 def _pre_serialize_midpoint_angle(midpoint_angle):
-    obj_to_pre_serialize = random.choice(list(locals().values()))
+    obj_to_pre_serialize = midpoint_angle
     serializable_rep = obj_to_pre_serialize
     
     return serializable_rep
@@ -1860,8 +1856,7 @@ def _de_pre_serialize_midpoint_angle(serializable_rep):
 
 
 def _check_and_convert_subtending_angle(params):
-    current_func_name = inspect.stack()[0][3]
-    obj_name = current_func_name[19:]
+    obj_name = "subtending_angle"
     kwargs = {"obj": params[obj_name], "obj_name": obj_name}
     subtending_angle = min(abs(czekitout.convert.to_float(**kwargs)), (2*np.pi))
 
@@ -1870,7 +1865,7 @@ def _check_and_convert_subtending_angle(params):
 
 
 def _pre_serialize_subtending_angle(subtending_angle):
-    obj_to_pre_serialize = random.choice(list(locals().values()))
+    obj_to_pre_serialize = subtending_angle
     serializable_rep = obj_to_pre_serialize
     
     return serializable_rep
@@ -1885,15 +1880,15 @@ def _de_pre_serialize_subtending_angle(serializable_rep):
 
 
 def _check_and_convert_radial_range(params):
-    current_func_name = inspect.stack()[0][3]
-    char_idx = 19
-    obj_name = current_func_name[char_idx:]
+    obj_name = "radial_range"
     obj = params[obj_name]
 
     func_alias = czekitout.convert.to_pair_of_positive_floats
     kwargs = {"obj": obj, "obj_name": obj_name}
     radial_range = func_alias(**kwargs)
 
+    current_func_name = "_check_and_convert_radial_range"
+
     if radial_range[0] >= radial_range[1]:
         err_msg = globals()[current_func_name+"_err_msg_1"]
         raise ValueError(err_msg)
@@ -1903,7 +1898,7 @@ def _check_and_convert_radial_range(params):
 
 
 def _pre_serialize_radial_range(radial_range):
-    obj_to_pre_serialize = random.choice(list(locals().values()))
+    obj_to_pre_serialize = radial_range
     serializable_rep = obj_to_pre_serialize
     
     return serializable_rep
@@ -2064,8 +2059,12 @@ class Arc(BaseShape):
 
 
 
-    def update(self, new_core_attr_subset_candidate):
-        super().update(new_core_attr_subset_candidate)
+    def update(self,
+               new_core_attr_subset_candidate,
+               skip_validation_and_conversion=\
+               _default_skip_validation_and_conversion):
+        super().update(new_core_attr_subset_candidate,
+                       skip_validation_and_conversion)
         self.execute_post_core_attrs_update_actions()
 
         return None
@@ -2100,8 +2099,7 @@ class Arc(BaseShape):
 
 
 def _check_and_convert_radial_reference_pt(params):
-    current_func_name = inspect.stack()[0][3]
-    obj_name = current_func_name[19:]
+    obj_name = "radial_reference_pt"
     kwargs = {"obj": params[obj_name], "obj_name": obj_name}
     radial_reference_pt = czekitout.convert.to_pair_of_floats(**kwargs)
 
@@ -2110,7 +2108,7 @@ def _check_and_convert_radial_reference_pt(params):
 
 
 def _pre_serialize_radial_reference_pt(radial_reference_pt):
-    obj_to_pre_serialize = random.choice(list(locals().values()))
+    obj_to_pre_serialize = radial_reference_pt
     serializable_rep = obj_to_pre_serialize
     
     return serializable_rep
@@ -2125,12 +2123,13 @@ def _de_pre_serialize_radial_reference_pt(serializable_rep):
 
 
 def _check_and_convert_radial_amplitudes(params):
-    current_func_name = inspect.stack()[0][3]
-    obj_name = current_func_name[19:]
+    obj_name = "radial_amplitudes"
     kwargs = {"obj": params[obj_name], "obj_name": obj_name}
     func_alias = czekitout.convert.to_tuple_of_nonnegative_floats
     radial_amplitudes = func_alias(**kwargs)
 
+    current_func_name = "_check_and_convert_radial_amplitudes"
+    
     num_radial_amplitudes = len(radial_amplitudes)
     if num_radial_amplitudes == 0:
         err_msg = globals()[current_func_name+"_err_msg_1"]
@@ -2146,7 +2145,7 @@ def _check_and_convert_radial_amplitudes(params):
 
 
 def _pre_serialize_radial_amplitudes(radial_amplitudes):
-    obj_to_pre_serialize = random.choice(list(locals().values()))
+    obj_to_pre_serialize = radial_amplitudes
     serializable_rep = obj_to_pre_serialize
     
     return serializable_rep
@@ -2161,8 +2160,7 @@ def _de_pre_serialize_radial_amplitudes(serializable_rep):
 
 
 def _check_and_convert_radial_phases(params):
-    current_func_name = inspect.stack()[0][3]
-    obj_name = current_func_name[19:]
+    obj_name = "radial_phases"
     kwargs = {"obj": params[obj_name], "obj_name": obj_name}
     radial_phases = czekitout.convert.to_tuple_of_floats(**kwargs)
     radial_phases = tuple(radial_phase%(2*np.pi)
@@ -2174,6 +2172,8 @@ def _check_and_convert_radial_phases(params):
     num_radial_phases = len(radial_phases)
     num_radial_amplitudes = len(radial_amplitudes)
 
+    current_func_name = "_check_and_convert_radial_phases"
+
     if num_radial_phases+1 != num_radial_amplitudes:
         err_msg = globals()[current_func_name+"_err_msg_1"]
         raise ValueError(err_msg)
@@ -2183,7 +2183,7 @@ def _check_and_convert_radial_phases(params):
 
 
 def _pre_serialize_radial_phases(radial_phases):
-    obj_to_pre_serialize = random.choice(list(locals().values()))
+    obj_to_pre_serialize = radial_phases
     serializable_rep = obj_to_pre_serialize
     
     return serializable_rep
@@ -2264,7 +2264,7 @@ class GenericBlob(BaseShape):
     radial_reference_pt : `array_like` (`float`, shape=(``2``,)), optional
         The radial reference point, :math:`\left(u_{x;c;\text{GB}},
         u_{y;c;\text{GB}}\right)`.
-    radial_amplitudes : `array_like` (`float`, shape=(``2``,)), optional
+    radial_amplitudes : `array_like` (`float`, ndim=1), optional
         The radial amplitudes, 
         :math:`\left\{ D_{\text{GB};n}\right\} _{n=0}^{N_{\text{GB}}}`.
     radial_phases : `array_like` (`float`, shape=(``len(radial_amplitudes)-1``,)), optional
@@ -2351,8 +2351,12 @@ class GenericBlob(BaseShape):
 
 
 
-    def update(self, new_core_attr_subset_candidate):
-        super().update(new_core_attr_subset_candidate)
+    def update(self,
+               new_core_attr_subset_candidate,
+               skip_validation_and_conversion=\
+               _default_skip_validation_and_conversion):
+        super().update(new_core_attr_subset_candidate,
+                       skip_validation_and_conversion)
         self.execute_post_core_attrs_update_actions()
 
         return None
@@ -2386,8 +2390,7 @@ class GenericBlob(BaseShape):
 
 
 def _check_and_convert_principal_quantum_number(params):
-    current_func_name = inspect.stack()[0][3]
-    obj_name = current_func_name[19:]
+    obj_name = "principal_quantum_number"
     kwargs = {"obj": params[obj_name], "obj_name": obj_name}
     principal_quantum_number = czekitout.convert.to_positive_int(**kwargs)
 
@@ -2396,7 +2399,7 @@ def _check_and_convert_principal_quantum_number(params):
 
 
 def _pre_serialize_principal_quantum_number(principal_quantum_number):
-    obj_to_pre_serialize = random.choice(list(locals().values()))
+    obj_to_pre_serialize = principal_quantum_number
     serializable_rep = obj_to_pre_serialize
     
     return serializable_rep
@@ -2411,14 +2414,15 @@ def _de_pre_serialize_principal_quantum_number(serializable_rep):
 
 
 def _check_and_convert_azimuthal_quantum_number(params):
-    current_func_name = inspect.stack()[0][3]
-    obj_name = current_func_name[19:]
+    obj_name = "azimuthal_quantum_number"
     kwargs = {"obj": params[obj_name], "obj_name": obj_name}
     azimuthal_quantum_number = czekitout.convert.to_nonnegative_int(**kwargs)
 
     principal_quantum_number = \
         _check_and_convert_principal_quantum_number(params)
 
+    current_func_name = "_check_and_convert_azimuthal_quantum_number"
+
     if azimuthal_quantum_number >= principal_quantum_number:
         err_msg = globals()[current_func_name+"_err_msg_1"]
         raise ValueError(err_msg)
@@ -2428,7 +2432,7 @@ def _check_and_convert_azimuthal_quantum_number(params):
 
 
 def _pre_serialize_azimuthal_quantum_number(azimuthal_quantum_number):
-    obj_to_pre_serialize = random.choice(list(locals().values()))
+    obj_to_pre_serialize = azimuthal_quantum_number
     serializable_rep = obj_to_pre_serialize
     
     return serializable_rep
@@ -2443,14 +2447,15 @@ def _de_pre_serialize_azimuthal_quantum_number(serializable_rep):
 
 
 def _check_and_convert_magnetic_quantum_number(params):
-    current_func_name = inspect.stack()[0][3]
-    obj_name = current_func_name[19:]
+    obj_name = "magnetic_quantum_number"
     kwargs = {"obj": params[obj_name], "obj_name": obj_name}
     magnetic_quantum_number = czekitout.convert.to_int(**kwargs)
 
     azimuthal_quantum_number = \
         _check_and_convert_azimuthal_quantum_number(params)
 
+    current_func_name = "_check_and_convert_magnetic_quantum_number"
+
     if abs(magnetic_quantum_number) > azimuthal_quantum_number:
         err_msg = globals()[current_func_name+"_err_msg_1"]
         raise ValueError(err_msg)
@@ -2460,7 +2465,7 @@ def _check_and_convert_magnetic_quantum_number(params):
 
 
 def _pre_serialize_magnetic_quantum_number(magnetic_quantum_number):
-    obj_to_pre_serialize = random.choice(list(locals().values()))
+    obj_to_pre_serialize = magnetic_quantum_number
     serializable_rep = obj_to_pre_serialize
     
     return serializable_rep
@@ -2475,8 +2480,7 @@ def _de_pre_serialize_magnetic_quantum_number(serializable_rep):
 
 
 def _check_and_convert_effective_size(params):
-    current_func_name = inspect.stack()[0][3]
-    obj_name = current_func_name[19:]
+    obj_name = "effective_size"
     kwargs = {"obj": params[obj_name], "obj_name": obj_name}
     effective_size = czekitout.convert.to_positive_float(**kwargs)
 
@@ -2485,7 +2489,7 @@ def _check_and_convert_effective_size(params):
 
 
 def _pre_serialize_effective_size(effective_size):
-    obj_to_pre_serialize = random.choice(list(locals().values()))
+    obj_to_pre_serialize = effective_size
     serializable_rep = obj_to_pre_serialize
     
     return serializable_rep
@@ -2500,8 +2504,7 @@ def _de_pre_serialize_effective_size(serializable_rep):
 
 
 def _check_and_convert_renormalization_factor(params):
-    current_func_name = inspect.stack()[0][3]
-    obj_name = current_func_name[19:]
+    obj_name = "renormalization_factor"
     kwargs = {"obj": params[obj_name], "obj_name": obj_name}
     renormalization_factor = czekitout.convert.to_float(**kwargs)
 
@@ -2510,7 +2513,7 @@ def _check_and_convert_renormalization_factor(params):
 
 
 def _pre_serialize_renormalization_factor(renormalization_factor):
-    obj_to_pre_serialize = random.choice(list(locals().values()))
+    obj_to_pre_serialize = renormalization_factor
     serializable_rep = obj_to_pre_serialize
     
     return serializable_rep
@@ -2809,8 +2812,12 @@ class Orbital(BaseShape):
 
 
 
-    def update(self, new_core_attr_subset_candidate):
-        super().update(new_core_attr_subset_candidate)
+    def update(self,
+               new_core_attr_subset_candidate,
+               skip_validation_and_conversion=\
+               _default_skip_validation_and_conversion):
+        super().update(new_core_attr_subset_candidate,
+                       skip_validation_and_conversion)
         self.execute_post_core_attrs_update_actions()
 
         return None
@@ -2932,9 +2939,7 @@ class Orbital(BaseShape):
 
 
 def _check_and_convert_bg_ellipse(params):
-    current_func_name = inspect.stack()[0][3]
-    char_idx = 19
-    obj_name = current_func_name[char_idx:]
+    obj_name = "bg_ellipse"
     obj = params[obj_name]
 
     accepted_types = (Ellipse, Circle, type(None))
@@ -2953,7 +2958,7 @@ def _check_and_convert_bg_ellipse(params):
 
 
 def _pre_serialize_bg_ellipse(bg_ellipse):
-    obj_to_pre_serialize = random.choice(list(locals().values()))
+    obj_to_pre_serialize = bg_ellipse
     serializable_rep = obj_to_pre_serialize.pre_serialize()
     
     return serializable_rep
@@ -2971,9 +2976,7 @@ def _de_pre_serialize_bg_ellipse(serializable_rep):
 
 
 def _check_and_convert_fg_ellipse(params):
-    current_func_name = inspect.stack()[0][3]
-    char_idx = 19
-    obj_name = current_func_name[char_idx:]
+    obj_name = "fg_ellipse"
     obj = params[obj_name]
 
     accepted_types = (Ellipse, Circle, type(None))
@@ -2992,7 +2995,7 @@ def _check_and_convert_fg_ellipse(params):
 
 
 def _pre_serialize_fg_ellipse(fg_ellipse):
-    obj_to_pre_serialize = random.choice(list(locals().values()))
+    obj_to_pre_serialize = fg_ellipse
     serializable_rep = obj_to_pre_serialize.pre_serialize()
     
     return serializable_rep
@@ -3119,8 +3122,12 @@ class Lune(BaseShape):
 
 
 
-    def update(self, new_core_attr_subset_candidate):
-        super().update(new_core_attr_subset_candidate)
+    def update(self,
+               new_core_attr_subset_candidate,
+               skip_validation_and_conversion=\
+               _default_skip_validation_and_conversion):
+        super().update(new_core_attr_subset_candidate,
+                       skip_validation_and_conversion)
         self.execute_post_core_attrs_update_actions()
 
         return None
@@ -3137,9 +3144,7 @@ class Lune(BaseShape):
 
 
 def _check_and_convert_support(params):
-    current_func_name = inspect.stack()[0][3]
-    char_idx = 19
-    obj_name = current_func_name[char_idx:]
+    obj_name = "support"
     obj = params[obj_name]
 
     accepted_types = (Circle, Ellipse, Band, Arc, GenericBlob, Lune, type(None))
@@ -3158,7 +3163,7 @@ def _check_and_convert_support(params):
 
 
 def _pre_serialize_support(support):
-    obj_to_pre_serialize = random.choice(list(locals().values()))
+    obj_to_pre_serialize = support
     serializable_rep = obj_to_pre_serialize.pre_serialize()
     
     return serializable_rep
@@ -3184,9 +3189,7 @@ def _de_pre_serialize_support(serializable_rep):
 
 
 def _check_and_convert_intra_support_shapes(params):
-    current_func_name = inspect.stack()[0][3]
-    char_idx = 19
-    obj_name = current_func_name[char_idx:]
+    obj_name = "intra_support_shapes"
     obj = params[obj_name]
 
     accepted_types = (Circle,
@@ -3200,6 +3203,8 @@ def _check_and_convert_intra_support_shapes(params):
                       Lune,
                       NonuniformBoundedShape)
 
+    current_func_name = "_check_and_convert_intra_support_shapes"
+
     try:
         for intra_support_shape in obj:
             kwargs = {"obj": intra_support_shape,
@@ -3217,7 +3222,7 @@ def _check_and_convert_intra_support_shapes(params):
 
 
 def _pre_serialize_intra_support_shapes(intra_support_shapes):
-    obj_to_pre_serialize = random.choice(list(locals().values()))
+    obj_to_pre_serialize = intra_support_shapes
     serializable_rep = tuple()
     for elem in obj_to_pre_serialize:
         serializable_rep += (elem.pre_serialize(),)
@@ -3375,8 +3380,12 @@ class NonuniformBoundedShape(BaseShape):
 
 
 
-    def update(self, new_core_attr_subset_candidate):
-        super().update(new_core_attr_subset_candidate)
+    def update(self,
+               new_core_attr_subset_candidate,
+               skip_validation_and_conversion=\
+               _default_skip_validation_and_conversion):
+        super().update(new_core_attr_subset_candidate,
+                       skip_validation_and_conversion)
         self.execute_post_core_attrs_update_actions()
 
         return None

fakecbed/tds.py

@@ -8,12 +8,6 @@
 ## Load libraries/packages/modules ##
 #####################################
 
-# For accessing attributes of functions.
-import inspect
-
-# For randomly selecting items in dictionaries.
-import random
-
 # For performing deep copies.
 import copy
 
@@ -50,13 +44,13 @@ __all__ = ["Model"]
 
 
 def _check_and_convert_peaks(params):
-    current_func_name = inspect.stack()[0][3]
-    char_idx = 19
-    obj_name = current_func_name[char_idx:]
+    obj_name = "peaks"
     obj = params[obj_name]
 
     accepted_types = (fakecbed.shapes.Peak,)
 
+    current_func_name = "_check_and_convert_peaks"
+
     try:
         for peak in obj:
             kwargs = {"obj": peak,
@@ -74,7 +68,7 @@ def _check_and_convert_peaks(params):
 
 
 def _pre_serialize_peaks(peaks):
-    obj_to_pre_serialize = random.choice(list(locals().values()))
+    obj_to_pre_serialize = peaks
     serializable_rep = tuple()
     for elem in obj_to_pre_serialize:
         serializable_rep += (elem.pre_serialize(),)
@@ -94,8 +88,7 @@ def _de_pre_serialize_peaks(serializable_rep):
 
 
 def _check_and_convert_constant_bg(params):
-    current_func_name = inspect.stack()[0][3]
-    obj_name = current_func_name[19:]
+    obj_name = "constant_bg"
     kwargs = {"obj": params[obj_name], "obj_name": obj_name}
     constant_bg = czekitout.convert.to_nonnegative_float(**kwargs)
 
@@ -104,7 +97,7 @@ def _check_and_convert_constant_bg(params):
 
 
 def _pre_serialize_constant_bg(constant_bg):
-    obj_to_pre_serialize = random.choice(list(locals().values()))
+    obj_to_pre_serialize = constant_bg
     serializable_rep = obj_to_pre_serialize
     
     return serializable_rep
@@ -234,8 +227,12 @@ class Model(fakecbed.shapes.BaseShape):
 
 
 
-    def update(self, new_core_attr_subset_candidate):
-        super().update(new_core_attr_subset_candidate)
+    def update(self,
+               new_core_attr_subset_candidate,
+               skip_validation_and_conversion=\
+               _default_skip_validation_and_conversion):
+        super().update(new_core_attr_subset_candidate,
+                       skip_validation_and_conversion)
         self.execute_post_core_attrs_update_actions()
 
         return None

fakecbed/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.1.0'
-__version_tuple__ = version_tuple = (0, 1, 0)
+__version__ = version = '0.2.1'
+__version_tuple__ = version_tuple = (0, 2, 1)

{fakecbed-0.1.0.dist-info → fakecbed-0.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: fakecbed
-Version: 0.1.0
+Version: 0.2.1
 Summary: A Python library for generating quickly images that imitate convergent beam electron diffraction patterns.
 Author-email: Matthew Fitzpatrick <matthew.rc.fitzpatrick@gmail.com>
 Project-URL: Homepage, https://mrfitzpa.github.io/fakecbed
@@ -21,7 +21,7 @@ Classifier: Natural Language :: English
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: distoptica>=0.1.1
+Requires-Dist: distoptica>=0.3.0
 Requires-Dist: hyperspy[all]
 Provides-Extra: tests
 Requires-Dist: pytest-cov; extra == "tests"

fakecbed-0.2.1.dist-info/RECORD

@@ -0,0 +1,10 @@
+fakecbed/__init__.py,sha256=iP73WNV_HZgxiVUVdesbJqlrhDGESooh1hlBs8kox9M,1342
+fakecbed/discretized.py,sha256=bM_K0VJtSTxlIUdbsbPl2eiC6jJjoLn2y2iYy1XvBZE,97939
+fakecbed/shapes.py,sha256=TiqJBZI4JZib0Q6zfO0e-dh7ACjYhvAYUvEtIedoo74,116471
+fakecbed/tds.py,sha256=mk5359ErIhdpCoTdHq9r1-foKb8t3qCOHqNoabx3bQw,8066
+fakecbed/version.py,sha256=MxUhzLJIZQfEpDTTcKSxciTGrMLd5v2VmMlHa2HGeo0,411
+fakecbed-0.2.1.dist-info/LICENSE,sha256=N0P3pKtRMvfb64jmgJdlerg3TnS0a2QC776AzPsbZIg,35128
+fakecbed-0.2.1.dist-info/METADATA,sha256=Oee7NOEdAU8tX0G00o0EiVf-ldtnubLkivCBYCq_2RY,3006
+fakecbed-0.2.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+fakecbed-0.2.1.dist-info/top_level.txt,sha256=l0jL8P0CjRiCSznYLnq7riaAnOmYaV3zjjjIJx9vjSQ,9
+fakecbed-0.2.1.dist-info/RECORD,,

{fakecbed-0.1.0.dist-info → fakecbed-0.2.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.6.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

fakecbed-0.1.0.dist-info/RECORD

@@ -1,10 +0,0 @@
-fakecbed/__init__.py,sha256=iP73WNV_HZgxiVUVdesbJqlrhDGESooh1hlBs8kox9M,1342
-fakecbed/discretized.py,sha256=h2V_TtBIIvLMi7mp1uNKym3Dzuu8a-_tM0TJGB_-sng,98492
-fakecbed/shapes.py,sha256=T7XXbEDR7k9ue0pZmruEjDVHjR6jR28bOyg_BrxtK_I,117095
-fakecbed/tds.py,sha256=YlY0GPp-LlosZprs4S7YW1VJVpuJRPkDsCjDSv5julI,8160
-fakecbed/version.py,sha256=IMl2Pr_Sy4LVRKy_Sm4CdwUl1Gryous6ncL96EMYsnM,411
-fakecbed-0.1.0.dist-info/LICENSE,sha256=N0P3pKtRMvfb64jmgJdlerg3TnS0a2QC776AzPsbZIg,35128
-fakecbed-0.1.0.dist-info/METADATA,sha256=wMET77_MGYFIKmn-lgxE88x9K8npvVqLxXjx18rlH7I,3006
-fakecbed-0.1.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-fakecbed-0.1.0.dist-info/top_level.txt,sha256=l0jL8P0CjRiCSznYLnq7riaAnOmYaV3zjjjIJx9vjSQ,9
-fakecbed-0.1.0.dist-info/RECORD,,