datastock 0.0.36__py3-none-any.whl → 0.0.37__py3-none-any.whl

datastock/_class1.py

@@ -450,6 +450,7 @@ class DataStock1(DataStock0):
         inc_allrefs=None,
         # output
         coll2=None,
+        inplace=None,
         return_keys=None,
     ):
         """ Extract some selected data and return as new instance
@@ -478,6 +479,7 @@ class DataStock1(DataStock0):
             inc_allrefs=inc_allrefs,
             # output
             coll2=coll2,
+            inplace=inplace,
             return_keys=return_keys,
         )
 

datastock/_class1_compute.py

@@ -718,6 +718,7 @@ def _extract_instance(
     inc_allrefs=None,
     # output
     coll2=None,
+    inplace=None,
     return_keys=None,
 ):
 
@@ -728,7 +729,7 @@ def _extract_instance(
     (
         keys,
         inc_monot, inc_vectors, inc_allrefs,
-        return_keys,
+        inplace, return_keys,
     ) = _extract_check(**locals())
 
     # -----------------
@@ -749,7 +750,11 @@ def _extract_instance(
     # -------------------
 
     if coll2 is None:
-        coll2 = coll.__class__()
+        if inplace is True:
+            coll2 = coll
+        else:
+            coll2 = coll.__class__()
+
 
     # ------------------------
     # Populate
@@ -803,6 +808,7 @@ def _extract_check(
     vectors=None,
     # output
     coll2=None,
+    inplace=None,
     return_keys=None,
 ):
 
@@ -859,6 +865,13 @@ def _extract_check(
         default=False,
     )
 
+    # inplace
+    inplace = _generic_check._check_var(
+        inplace, 'inplace',
+        types=bool,
+        default=False,
+    )
+
     # coll2
     if coll2 is not None:
         c0 = (
@@ -872,7 +885,7 @@ def _extract_check(
     return (
         keys,
         inc_monot, inc_vectors, inc_allrefs,
-        return_keys,
+        inplace, return_keys,
     )
 
 

datastock/_plot_as_array.py

@@ -97,6 +97,7 @@ def plot_as_array(
         inc_vectors=False,
         inc_allrefs=False,
         return_keys=True,
+        inplace=inplace,
     )
     key = [kk for kk in key if kk not in lk][0]
     ndim = coll2.ddata[key]['data'].ndim
@@ -325,7 +326,8 @@ def _check_keyXYZ(
                         islog = _check_uniform_log(k0=keyX, ddata=coll._ddata)
                         msg += f"\t- uniform linear: {islin}\n"
                         msg += f"\t- uniform log:    {islog}\n"
-                    msg += f"Provided: '{keyX}'\nAllowed values: {lok}\n"
+                    msg += f"Allowed values: {lok}\nProvided: '{keyX}'\n"
+                    msg += f"Value:\n{coll.ddata[keyX]['data']}\n"
                     err.args = (msg,)
                     raise err
 

datastock/version.py

@@ -1,2 +1,2 @@
 # Do not edit, pipeline versioning governed by git tags!
-__version__ = '0.0.36'
+__version__ = '0.0.37'

{datastock-0.0.36.dist-info → datastock-0.0.37.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: datastock
-Version: 0.0.36
+Version: 0.0.37
 Summary: A python library for generic class and data handling
 Home-page: https://github.com/ToFuProject/datastock
 Author: Didier VEZINET

{datastock-0.0.36.dist-info → datastock-0.0.37.dist-info}/RECORD

@@ -3,10 +3,10 @@ datastock/_DataCollection_utils.py,sha256=hHf6HvGKMmM-psx3fj9QcY1TEmKrAtTdkRokH7
 datastock/__init__.py,sha256=i_Ijl-AM07n4zN52frWfbeGN1iB6v4e5oLzTuVIh_oM,217
 datastock/_class.py,sha256=Az9PS3aSskiPMb1ekt78Y2ynBujYVc_cDjJxW9xH9g4,47
 datastock/_class0.py,sha256=QULjNJke13jJrGLIeM7SWHZVziorDK_KCIlqq8LgS9U,5883
-datastock/_class1.py,sha256=KeSZ4RBJA-m7mRoxucm-SQfqiuFYupri5wnb5s8RR9s,27540
+datastock/_class1.py,sha256=PVlY3_kZQk_Nm4RL-GcdAGWoR7O4_h60NCveg2zAYgI,27591
 datastock/_class1_binning.py,sha256=LWHv2LIfgZfSFWYwqdcN0DKpNe6q7Go3sxfcJqmzTrI,28085
 datastock/_class1_check.py,sha256=UrbNtikISmNiIT96NQmjfVbhyxXrFmEJrjB8Yq5XvvI,49956
-datastock/_class1_compute.py,sha256=mbc2r1Gz-EKpi-0dCdfAqwYDTsltffR69nU-FMx8lu0,31412
+datastock/_class1_compute.py,sha256=yHdG0afYc_YtjpR6RvMh7SeRtWEyuHZ5y9VOPRIYVDo,31671
 datastock/_class1_domain.py,sha256=bkuCl29QO7C3RchC8qZyreU90QxmdDYNVYDmzuCLCUY,6252
 datastock/_class1_interpolate.py,sha256=-nuljuZfu6VxC40ydZ3JcRBkjOswQfFd7I_Od9iTwjI,37543
 datastock/_class1_show.py,sha256=J_CVhfxIYaicqtBoub6NvXwRHNmKHPnFTUt2cYb7I6M,9490
@@ -22,7 +22,7 @@ datastock/_generic_utils.py,sha256=iBsEQcVEoyN11-R5lMCZJzZUAksROkVD_gzKNvWXLvA,2
 datastock/_generic_utils_plot.py,sha256=xrWzeZFtdTAs-RO2DfpCRveJPqw_p4lRFtQuuAn1pD8,3709
 datastock/_plot_BvsA_as_distribution.py,sha256=fpRhlbv3Bk96buANC46Brc9hdLxkOAsoKpE5A9pohG0,15389
 datastock/_plot_BvsA_as_distribution_check.py,sha256=2LoM3mGHtPu87_qf37hLcFuknWfeSydU8WDqpVo1Sco,13086
-datastock/_plot_as_array.py,sha256=TOZNXQcx18A0c-5yNST8m61UtypIIK_Df2XsgjA4Nnw,22615
+datastock/_plot_as_array.py,sha256=DwumZrzfKmAUeUF_y6v33mVBH1mVDBAlIbZ-wHnvn5E,22707
 datastock/_plot_as_array_1d.py,sha256=6J-95zRTH2RPn_3g8GzDLX8HAGiLU39awNYi-EB2t7o,6611
 datastock/_plot_as_array_234d.py,sha256=k1AcKyseuObcte8yPm-FSn2g01rK-m_-japUA738IbA,21999
 datastock/_plot_as_mobile_lines.py,sha256=QSmJZUMKrNa__SzUCJO96KpnQPoNB_qpjK_ZRJt11oY,23289
@@ -31,12 +31,12 @@ 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=NdOykvmeCaPhpk0EF5WQezYzpuZM2Ul101Nqc4I3dnY,11729
-datastock/version.py,sha256=XTE-nxrX99wP7T7SB8VDgwm2KUAQjrI7Rg16nS04Yjs,80
+datastock/version.py,sha256=Nn5V6g5Fni_GmDG2991HOKltYIl-MPDURNj8ze_u6oQ,80
 datastock/tests/__init__.py,sha256=teOo2xP0IO7PQMuMDmum61XVHe2TuxW3BiHiL73X8jQ,35
 datastock/tests/test_01_DataStock.py,sha256=QJSmrVXD6wX-plfrFdLyZou20IYZGAKzartSi84BfC0,16982
 datastock/tests/output/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-datastock-0.0.36.dist-info/LICENSE,sha256=V1uXqi3vxR0QhB4QdFyjkynl6jpN4wZmlB5EMYJk0NM,1068
-datastock-0.0.36.dist-info/METADATA,sha256=qrw1MCErgjeWc9QDtqt0V-YZYbbGHQ2Q-1lVUsg_CMc,8666
-datastock-0.0.36.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-datastock-0.0.36.dist-info/top_level.txt,sha256=BzJsLLK_zZw13WQCoMhC74qWVKalnVCjBxdPXvJn7HQ,25
-datastock-0.0.36.dist-info/RECORD,,
+datastock-0.0.37.dist-info/LICENSE,sha256=V1uXqi3vxR0QhB4QdFyjkynl6jpN4wZmlB5EMYJk0NM,1068
+datastock-0.0.37.dist-info/METADATA,sha256=QXFNu5BxSKujUX1jgwp84hVt3PnkpWP22OyEOUkbKf8,8666
+datastock-0.0.37.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+datastock-0.0.37.dist-info/top_level.txt,sha256=BzJsLLK_zZw13WQCoMhC74qWVKalnVCjBxdPXvJn7HQ,25
+datastock-0.0.37.dist-info/RECORD,,