diffpy.utils 3.6.1rc0__py3-none-any.whl → 3.6.1rc1__py3-none-any.whl

diffpy/utils/diffraction_objects.py

@@ -409,17 +409,17 @@ class DiffractionObject:
     def uuid(self, _):
         raise AttributeError(_setter_wmsg("uuid"))
 
-    def get_array_index(self, xtype, xvalue):
-        """Return the index of the closest value in the array associated with
+    def get_array_index(self, xvalue, xtype=None):
+        f"""Return the index of the closest value in the array associated with
         the specified xtype and the value provided.
 
         Parameters
         ----------
-        xtype : str
-            The type of the independent variable in `xarray`. Must be one
-            of {*XQUANTITIES}.
         xvalue : float
             The value of the xtype to find the closest index for.
+        xtype : str, optional
+            The type of the independent variable in `xarray`. Must be one
+            of {*XQUANTITIES, }. Default is {self._input_xtype}
 
         Returns
         -------
@@ -427,8 +427,11 @@ class DiffractionObject:
             The index of the closest value in the array associated with the
             specified xtype and the value provided.
         """
-
-        xtype = self._input_xtype
+        if xtype is None:
+            xtype = self._input_xtype
+        else:
+            if xtype not in XQUANTITIES:
+                raise ValueError(_xtype_wmsg(xtype))
         xarray = self.on_xtype(xtype)[0]
         if len(xarray) == 0:
             raise ValueError(

{diffpy_utils-3.6.1rc0.dist-info → diffpy_utils-3.6.1rc1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: diffpy.utils
-Version: 3.6.1rc0
+Version: 3.6.1rc1
 Summary: General utilities for analyzing diffraction data
 Author-email: Simon Billinge <sb2896@columbia.edu>
 Maintainer-email: Simon Billinge <sb2896@columbia.edu>
@@ -169,7 +169,7 @@ trying to commit again.
 
 Improvements and fixes are always appreciated.
 
-Before contributing, please read our `Code of Conduct <https://github.com/diffpy/diffpy.utils/blob/main/CODE_OF_CONDUCT.rst>`_.
+Before contributing, please read our `Code of Conduct <https://github.com/diffpy/diffpy.utils/blob/main/CODE-OF-CONDUCT.rst>`_.
 
 Contact
 -------

{diffpy_utils-3.6.1rc0.dist-info → diffpy_utils-3.6.1rc1.dist-info}/RECORD

@@ -1,6 +1,6 @@
 diffpy/__init__.py,sha256=PLQx_UmkmhCTu5bPeYdp9nQBx-OJGP0s4Pz-lLQhKsU,926
 diffpy/utils/__init__.py,sha256=CtxZ5VpVDjhWlvoGLIEjkBGtXn1Pnb4lrdhpIfzmYYc,704
-diffpy/utils/diffraction_objects.py,sha256=DbAEC7r9taK78Ct_f4DTMwCfn-GhqJCTqZEr06h2ExM,23108
+diffpy/utils/diffraction_objects.py,sha256=Qj3ka5DE-XswAo1jI3FhRYwyFrfCOWvkhBhrcBdrgj8,23294
 diffpy/utils/resampler.py,sha256=7M5VfH9Wddpy4j3SzSiCp1txUQwLPfwC1GcdYLdjyzE,5948
 diffpy/utils/tools.py,sha256=rAxjUrcnkQReT6uSu2X7GzqqLiEsaNArKkr-cfdkCTA,15161
 diffpy/utils/transforms.py,sha256=FW8vJB8Ft8TM4_vwRPMwTLZBiTxgZnLn9sbW8Nz0Ef4,6145
@@ -12,10 +12,10 @@ diffpy/utils/parsers/loaddata.py,sha256=YQ7bAMHx0sGuE123BYNpg8npfruNEd4P8ZBma7Jm
 diffpy/utils/parsers/serialization.py,sha256=6huTN8R4zkF2V30DeQxs-knHn7ZwotKaVN5kaEM-h9c,6851
 diffpy/utils/wx/__init__.py,sha256=dyVlLVVqqn3pBhCTyWr3zvvIcmQjqzUCOjWAaZ2lkX4,586
 diffpy/utils/wx/gridutils.py,sha256=940h1kN5yClQwLrWLhQ6QlBvf7hVHBLqOfaDJ2QZZoc,5158
-diffpy_utils-3.6.1rc0.dist-info/licenses/AUTHORS.rst,sha256=vSJE4eFlrvgzwe0UiB5nnuqWVi7HO1aTzavOgqH1ngE,181
-diffpy_utils-3.6.1rc0.dist-info/licenses/LICENSE.rst,sha256=Fic68qk6_MHLTR4fTua4ufK3iZH7ioQJ0x9STJAjkyk,6011
-diffpy_utils-3.6.1rc0.dist-info/licenses/LICENSE_DANSE.txt,sha256=mPt7YHs0xQgff18u_MPvAFqHRTTF0x9ecqubGy6Fxjs,2160
-diffpy_utils-3.6.1rc0.dist-info/METADATA,sha256=f99gPVXAUtSH-eH9LyCZ0-Pc9SdmNYEAp-JBdx1ZFP4,7563
-diffpy_utils-3.6.1rc0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-diffpy_utils-3.6.1rc0.dist-info/top_level.txt,sha256=34qLZyi9mxikpHepVDTMHrrNbe8VoOuz3ShYeiWA7KA,7
-diffpy_utils-3.6.1rc0.dist-info/RECORD,,
+diffpy_utils-3.6.1rc1.dist-info/licenses/AUTHORS.rst,sha256=vSJE4eFlrvgzwe0UiB5nnuqWVi7HO1aTzavOgqH1ngE,181
+diffpy_utils-3.6.1rc1.dist-info/licenses/LICENSE.rst,sha256=Fic68qk6_MHLTR4fTua4ufK3iZH7ioQJ0x9STJAjkyk,6011
+diffpy_utils-3.6.1rc1.dist-info/licenses/LICENSE_DANSE.txt,sha256=mPt7YHs0xQgff18u_MPvAFqHRTTF0x9ecqubGy6Fxjs,2160
+diffpy_utils-3.6.1rc1.dist-info/METADATA,sha256=f_OJxDgSo9k87Txtxq0zHHj4gL4iNg9K4-i89vJGaVw,7563
+diffpy_utils-3.6.1rc1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+diffpy_utils-3.6.1rc1.dist-info/top_level.txt,sha256=34qLZyi9mxikpHepVDTMHrrNbe8VoOuz3ShYeiWA7KA,7
+diffpy_utils-3.6.1rc1.dist-info/RECORD,,