diff --git a/docs/source/masking/index.rst b/docs/source/masking/index.rst index 5238dc8..0e941a7 100644 --- a/docs/source/masking/index.rst +++ b/docs/source/masking/index.rst @@ -156,7 +156,7 @@ the desired particles include some that are not identified as members by the hal a modified approach is needed. For example, let's suppose that you want to select *all* simulation particles within a 1 Mpc aperture of a galaxy's centre, regardless of their membership status according to the halo catalogue. For illustration we'll take a galaxy -picked from a :class:`~swiftgalaxy.halo_finders.SOAP` catalogue. The first step is to +picked from a :class:`~swiftgalaxy.halo_catalogues.SOAP` catalogue. The first step is to override the default ``extra_mask="bound_only"`` behaviour with ``extra_mask=None``. We also need to override the default spatial selection from the simulation, because the 1 Mpc spherical region of interest might extend beyond the region occupied by member particles diff --git a/swiftgalaxy/reader.py b/swiftgalaxy/reader.py index cf90e9c..75223ba 100644 --- a/swiftgalaxy/reader.py +++ b/swiftgalaxy/reader.py @@ -71,16 +71,16 @@ def _apply_box_wrap( :class:`~swiftsimio.objects.cosmo_array` The coordinates wrapped to lie within the box dimensions. """ - rotation_is_identity = ( + _rotation_is_identity = ( True if current_transform is None else current_transform.rotation.approx_equal(Rotation.identity()) ) # in scipy 1.16 approx_equal returns bool, in 1.17 returns array of bool, so: rotation_is_identity = ( - rotation_is_identity.all() - if hasattr(rotation_is_identity, "all") - else rotation_is_identity + _rotation_is_identity.all() + if hasattr(_rotation_is_identity, "all") + else _rotation_is_identity ) if boxsize is None: return coords @@ -1690,8 +1690,8 @@ def _copyinit( coordinate_frame_from: Optional["SWIFTGalaxy"] = None, _spatial_mask: Optional[SWIFTMask] = None, _extra_mask: Optional[MaskCollection] = None, - _coordinate_like_transform: Optional[np.ndarray] = None, - _velocity_like_transform: Optional[np.ndarray] = None, + _coordinate_like_transform: Optional[RigidTransform] = None, + _velocity_like_transform: Optional[RigidTransform] = None, _data_server: Optional["SWIFTGalaxy"] = None, ) -> "SWIFTGalaxy": """