datastock 0.0.50__py3-none-any.whl → 0.0.52__py3-none-any.whl

datastock/_generic_check.py

@@ -420,7 +420,20 @@ def _check_vectbasis(
     e2=None,
     dim=None,
     tol=None,
+    direct=None,
 ):
+    """ Check a 2d or 3d set of unit vectors
+
+    Check that:
+        - vectors are defined (if None, they can be inferred)
+
+    Normalizes vectorto be unit vectors
+    Optionally (default) check the vectors forma direct basis
+    """
+
+    # ----------------
+    # check inputs
+    # ----------------
 
     # dim
     dim = _check_var(dim, 'dim', types=int, default=3, allowed=[2, 3])
@@ -428,6 +441,13 @@ def _check_vectbasis(
     # tol
     tol = _check_var(tol, 'tol', types=float, default=1.e-14, sign='>0.')
 
+    # direct
+    direct = _check_var(direct, 'direct', types=bool, default=True)
+
+    # ----------------------
+    # check what's provided
+    # ----------------------
+
     # check is provided
     if e0 is not None:
         e0 = _check_flat1darray(e0, 'e0', size=dim, dtype=float, norm=True)
@@ -436,13 +456,23 @@ def _check_vectbasis(
     if e2 is not None:
         e2 = _check_flat1darray(e2, 'e2', size=dim, dtype=float, norm=True)
 
+    # preliminary
+    allnone = all([ee is None for ee in [e0, e1, e2][:dim]])
+    if allnone is True:
+        lstr = [f"\t- {ee}" for ee in ['e0', 'e1', 'e2'][:dim]]
+        msg = (
+            f"For a basis f dimension {dim}, provide at least one of:\n"
+            + "\n".join(lstr)
+        )
+        raise Exception(msg)
+
+    # ----------------------
+    # dim = 2
+    # ----------------------
+
     # vectors
     if dim == 2:
 
-        if e0 is None and e1 is None:
-            msg = "Please provide e0 and/or e1!"
-            raise Exception(msg)
-
         # complete if missing
         if e0 is None:
             e0 = np.r_[e1[1], -e1[0]]
@@ -455,16 +485,18 @@ def _check_vectbasis(
             raise Exception(msg)
 
         # direct
-        if np.abs(np.cross(e0, e1).tolist() - 1.) < tol:
-            msg = "Non-direct basis"
-            raise Exception(msg)
+        if direct is True:
+            if np.abs(np.cross(e0, e1).tolist() - 1.) < tol:
+                msg = "Non-direct basis"
+                raise Exception(msg)
 
         return e0, e1
 
+    # ----------------------
+    # dim = 3
+    # ----------------------
+
     else:
-        if e0 is None and e1 is None and e2 is None:
-            msg = "Please provide at least e0, e1 or e2!"
-            raise Exception(msg)
 
         # complete if 2 missing
         if e0 is None and e1 is None:
@@ -472,7 +504,7 @@ def _check_vectbasis(
         elif e0 is None and e2 is None:
             e2 = _get_vertical_unitvect(ee=e1)
         elif e1 is None and e2 is None:
-            e2 = _get_vertical_unitvect(ee=e0)
+            e2 = _get_horizontal_unitvect(ee=e0)
 
         # complete if 1 missing
         if e0 is None:
@@ -502,9 +534,10 @@ def _check_vectbasis(
             raise Exception(msg)
 
         # direct
-        if not np.allclose(np.cross(e0, e1), e2, atol=tol, rtol=1e-6):
-            msg = "Non-direct basis"
-            raise Exception(msg)
+        if direct is True:
+            if not np.allclose(np.cross(e0, e1), e2, atol=tol, rtol=1e-6):
+                msg = "Non-direct basis"
+                raise Exception(msg)
 
         return e0, e1, e2
 

datastock/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.0.50'
-__version_tuple__ = version_tuple = (0, 0, 50)
+__version__ = version = '0.0.52'
+__version_tuple__ = version_tuple = (0, 0, 52)

{datastock-0.0.50.dist-info → datastock-0.0.52.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datastock
-Version: 0.0.50
+Version: 0.0.52
 Summary: Generic handler for multiple heterogenous numpy arrays and subclasses
 Author-email: Didier VEZINET <didier.vezinet@gmail.com>
 Maintainer-email: Didier VEZINET <didier.vezinet@gmail.com>
@@ -24,7 +24,6 @@ License-File: LICENSE.txt
 Requires-Dist: numpy
 Requires-Dist: scipy
 Requires-Dist: matplotlib
-Requires-Dist: PyQt5; platform_system != "Windows"
 Requires-Dist: astropy
 Provides-Extra: linting
 Requires-Dist: ruff; extra == "linting"

{datastock-0.0.50.dist-info → datastock-0.0.52.dist-info}/RECORD

@@ -17,7 +17,7 @@ datastock/_class3.py,sha256=CH1oD_lTfVlcDp29L_iwzSfP78vX6_edDmZG9aSb1Ks,10848
 datastock/_direct_calls.py,sha256=EHFwI2mGMDqGz8_Bv2BseMBX4J8dSdE_RcNX3pt0ZYY,1801
 datastock/_export_dataframe.py,sha256=fy-uJR3EhDlHvd9ls1EQna_C8fyha1jCJLu1DTKTkdo,1576
 datastock/_find_plateau.py,sha256=sqnAuy0361DXkqBb_Lo1MmIGjn35tnKFvcv6MW6hifs,2685
-datastock/_generic_check.py,sha256=4NmG7iPa02bxOC5K-6qw63UahQ2FNDbeKu_AGBpNMtc,26717
+datastock/_generic_check.py,sha256=g_SNSCSvE-HMX1WWrNKgUaHe5j14k_d0Xv1QZNkmvTg,27491
 datastock/_generic_utils.py,sha256=_iV51SiujEmQfAlvyIEW4BvzIXdhPCD-vumV5DmUL44,23421
 datastock/_generic_utils_plot.py,sha256=xrWzeZFtdTAs-RO2DfpCRveJPqw_p4lRFtQuuAn1pD8,3709
 datastock/_plot_BvsA_as_distribution.py,sha256=fpRhlbv3Bk96buANC46Brc9hdLxkOAsoKpE5A9pohG0,15389
@@ -31,15 +31,15 @@ datastock/_plot_correlations.py,sha256=ITOypu_AEoKl0ihxocV-JVTXIHqut6p9TfG-xZmQy
 datastock/_plot_old_backup.py,sha256=XixTi2CiihKjtQP0TRycH0b25caWN1m35DgpsDeiWZE,21729
 datastock/_plot_text.py,sha256=wQPqjfpLyIioS2JeOt3E9C9HgYUJ49YEoOgRuKYvAR8,3143
 datastock/_saveload.py,sha256=1vAMp27KfqXbo5b_Pi8hJux0stsHq6dO5vy8k1d4_iA,14141
-datastock/_version.py,sha256=E35Bq14aHx0dG_mA8HPiJoVRTCMU_V3unyyjRET8Kww,513
+datastock/_version.py,sha256=izwNZww8rRWqWXOrmNbMsAI1WrglfNORIf-8tNcGeG4,513
 datastock/version.py,sha256=VJcnSK0zygwEhh_p6KIoC9yiMkp0bs-SJgLCbyubs9o,91
 datastock/tests/__init__.py,sha256=teOo2xP0IO7PQMuMDmum61XVHe2TuxW3BiHiL73X8jQ,35
 datastock/tests/prepublish.py,sha256=3gSr3nRhEl5qsmhxJ-nEoePvbINYq0EvcZCfxfUVHBM,83
 datastock/tests/test_01_DataStock.py,sha256=aUseXH2zYnFtNDJSCuEROgPxfKKNeLCkCQSR--_Fheg,19176
 datastock/tests/output/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-datastock-0.0.50.dist-info/licenses/LICENSE.txt,sha256=SM-QOA3JwR1e0RVBGb1HhPmc5yD1Gsl1CRPnMSKJhH8,1068
-datastock-0.0.50.dist-info/METADATA,sha256=FLc5tLiMeT7uqPs9_kNV3tZNALar_DErqHZeO0uql68,8893
-datastock-0.0.50.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-datastock-0.0.50.dist-info/entry_points.txt,sha256=GqmxVVp9G2ulEDaS9gLpwSVOBLF_FEBlj8k5Z6TJKsc,42
-datastock-0.0.50.dist-info/top_level.txt,sha256=0HeA0gZ4G1IKtkPhmqijZRYH9hID6LKLQskeSjAna8g,10
-datastock-0.0.50.dist-info/RECORD,,
+datastock-0.0.52.dist-info/licenses/LICENSE.txt,sha256=SM-QOA3JwR1e0RVBGb1HhPmc5yD1Gsl1CRPnMSKJhH8,1068
+datastock-0.0.52.dist-info/METADATA,sha256=uv0ceVieQT6vaC1guDDYmcApD0jjrBeQcoqdPilwV4I,8842
+datastock-0.0.52.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+datastock-0.0.52.dist-info/entry_points.txt,sha256=GqmxVVp9G2ulEDaS9gLpwSVOBLF_FEBlj8k5Z6TJKsc,42
+datastock-0.0.52.dist-info/top_level.txt,sha256=0HeA0gZ4G1IKtkPhmqijZRYH9hID6LKLQskeSjAna8g,10
+datastock-0.0.52.dist-info/RECORD,,