metrolopy 0.6.5__py3-none-any.whl → 1.0.0__py3-none-any.whl

metrolopy/constant.py

@@ -2,7 +2,7 @@
 
 # module constant
 
-# Copyright (C) 2019 National Research Council Canada
+# Copyright (C) 2025 National Research Council Canada
 # Author:  Harold Parks
 
 # This file is part of MetroloPy.
@@ -28,16 +28,17 @@ from .indexed import Indexed
 from .gummy import gummy,jummy
 from .unitutils import _mrtxt
 from importlib import import_module
-from .printing import PrettyPrinter,print_markdown,print_html,ipython_installed
+from .printing import PrettyPrinter
 from .exceptions import ConstantNotFoundError
 from .printing import _latex_math
 
 class GummyConstant(gummy,Indexed):
     
+    _case_sensitive = False
     return_toummy = False
     return_splonk = False
     
-    _builtins_to_import = ['..codata2018']
+    _builtins_to_import = ['..builtin_constants']
     
     _builtin_lib = {}
     _lib = {}
@@ -92,7 +93,7 @@ class GummyConstant(gummy,Indexed):
             from the unicode representation of the symbol.
             
         description:  `str` or `None`, optional
-            a description of the unit
+            a description of the constant
         """
         if name is None:
             name = symbol
@@ -133,7 +134,7 @@ class GummyConstant(gummy,Indexed):
         self.name = name
     
 class JummyConstant(jummy,Indexed):
-    _builtins_to_import = ['..codata2018']
+    _builtins_to_import = ['..builtin_constants']
     
     _builtin_lib = {}
     _lib = {}
@@ -221,16 +222,85 @@ def constant(name,toummy=None,splonk=None):
         
     return ret
 
-class _search_display(PrettyPrinter):
-    def __init__(self,search,constants):
-        self.search = search
+class search_constants_result(PrettyPrinter):
+    """
+    A `search_constants_result` instance emulates a list of constants returned 
+    from a 'search_constants` function call, and pretty-prints the results to 
+    the output
+    """
+    
+    def __init__(self,constants):
         self.constants = constants
         
     def tostring(self,fmt='unicode',**kwds):
-        return search_constants(self.search,fmt=fmt,constants=self.constants,
-                                prnt=False)
+        if fmt == 'latex':
+            txt = "<ul style=\"font-family: 'Times New Roman', Times, serif;font-size:1.2em\">\n"
+        elif fmt == 'html':
+            txt = "<ul>\n"
+        else:
+            txt = ''
+        for u in self.constants:
+            if fmt in ['latex','html']:
+                txt += "<li>"
+            try:
+                txt += u.name + ' '
+                
+                if fmt == 'latex':
+                    txt += _latex_math(u.tostring(fmt=fmt,show_name=True))
+                else:
+                    txt += u.tostring(fmt=fmt,show_name=True)
+                    
+                aliases = u.aliases
+                if len(aliases) == 1:
+                    txt += ', alias: ' + _mrtxt(aliases.pop(),fmt)
+                if len(aliases) > 1:
+                    txt += ', aliases: '
+                    if u.short_name in aliases:
+                        txt += _mrtxt(u.short_name,fmt) + ', '
+                        aliases.remove(u.short_name)
+                    txt += _mrtxt(', '.join(sorted(aliases,key=str.lower)),fmt)
+                    
+                saliases = u.shadowed_aliases
+                if len(saliases) > 0:
+                    if len(aliases) > 0:
+                        txt += '; '
+                    else:
+                        txt += ', '
+                    if len(saliases) == 1:
+                        txt += 'shadowed alias: ' + _mrtxt(saliases.pop(),fmt)
+                    else:
+                        txt += 'shadowed aliases: ' + _mrtxt(', '.join(sorted(saliases,key=str.lower)),fmt)
+            except:
+                raise
+                txt += '??'
+                    
+            if fmt == 'html' or fmt == 'latex':
+                txt += '</li>\n'
+            else:
+                txt += '\n'
+                
+        txt = txt[:-1]
+        if fmt in ['latex','html']:
+            txt += '</ul>'
+        
+        return txt
+    
+    def __len__(self):
+        return len(self.constants)
+    
+    def __getitem__(self,i):
+        return self.constants[i]
+    
+    def __iter__(self):
+        return iter(self.constants)
+    
+    def __reversed__(self):
+        return reversed(self.constants)
+    
+    def __contains__(self,item):
+        return item in self.constants
 
-def search_constants(search=None,fmt=None,constants=None,prnt=True):
+def search_constants(search=None,fmt=None,constants=None):
     """
     Prints a list of all loaded constant or all constants that match the search 
     terms.
@@ -250,39 +320,38 @@ def search_constants(search=None,fmt=None,constants=None,prnt=True):
     constants: `list` of `str`,optional
         A list of constants to print.  If this parameter is specified the values
         of the search and `show_all` parameters are ignored.
-
-    prnt: `bool`, optional
-        If this is `True`, the results are printed.  If it is `False` the results
-        are returned as a string.  The default is `True`.
+        
+    Returns
+    -------
+    A `search_constants_result` instance which emulates a list of the returned
+    constants and pretty-prints the results to the output or `None` if no
+    constants are found.
     """
     
-    if fmt is None and prnt:
-        return _search_display(search,constants)
-
-    fmt = fmt.lower().strip()
-    if fmt == 'utf-8':
-        fmt = 'unicode'
+    if fmt is not None:
+        fmt = fmt.lower().strip()
+        if fmt == 'utf-8':
+            fmt = 'unicode'
     
     if constants is None:
         while len(GummyConstant._builtins_to_import) > 0:
             import_module(GummyConstant._builtins_to_import.pop(),
                           GummyConstant.__module__)
             
-        constants = {id(c):c for c in GummyConstant._builtin_lib.values()}
-        constants.update({id(c):c for c in GummyConstant._lib.values()})
-        constants.update({id(c):c for c in JummyConstant._builtin_lib.values()})
-        constants.update({id(c):c for c in JummyConstant._lib.values()})
-        constants = constants.values()
+        iconstants = {id(c):c for c in GummyConstant._builtin_lib.values()}
+        iconstants.update({id(c):c for c in GummyConstant._lib.values()})
+        iconstants.update({id(c):c for c in JummyConstant._builtin_lib.values()})
+        iconstants.update({id(c):c for c in JummyConstant._lib.values()})
+        iconstants = iconstants.values()
         
         if search is None:
+            constants = iconstants
             if len(constants) == 0:
-                if prnt:
-                    print('no constants are loaded')
-                    return
-                return ''
+                print('no constants are loaded')
+                return None
         else:
-            uf = set()
-            for u in constants:
+            constants = []
+            for u in iconstants:
                 s = set()
                 for a in u.aliases:
                     s = s.union(set(a.lower().split()))
@@ -300,19 +369,17 @@ def search_constants(search=None,fmt=None,constants=None,prnt=True):
                 
                 srch = search.lower().split()
                 ad = True
+                
                 for a in srch:
                     if a.strip(',.;') not in s:
                         ad = False
                         break
                 if ad:
-                    uf.add(u)
+                    constants.append(u)
                     
-            constants = uf
             if len(constants) == 0:
-                if prnt:
-                    print('no constants found matching "' + search + '"')
-                    return
-                return ''
+                print('no constants found matching "' + search + '"')
+                return None
             
         uf = []
         for u in constants:
@@ -328,73 +395,14 @@ def search_constants(search=None,fmt=None,constants=None,prnt=True):
 
     constants = sorted(constants,key=lambda u:u[0].lower())
         
-    if fmt == 'latex':
-        txt = "<ul style=\"font-family: 'Times New Roman', Times, serif;font-size:1.2em\">\n"
-    elif fmt == 'html':
-        txt = "<ul>\n"
-    else:
-        txt = ''
-    for u in constants:
-        if fmt in ['latex','html']:
-            txt += "<li>"
-        try:
-            u = u[1]
-            txt += u.name + ' '
-            
-            if fmt == 'latex':
-                txt += _latex_math(u.tostring(fmt=fmt,show_name=True))
-            else:
-                txt += u.tostring(fmt=fmt,show_name=True)
-                
-            aliases = u.aliases
-            if len(aliases) == 1:
-                txt += ', alias: ' + _mrtxt(aliases.pop(),fmt)
-            if len(aliases) > 1:
-                txt += ', aliases: '
-                if u.short_name in aliases:
-                    txt += _mrtxt(u.short_name,fmt) + ', '
-                    aliases.remove(u.short_name)
-                txt += _mrtxt(', '.join(sorted(aliases,key=str.lower)),fmt)
-                
-            saliases = u.shadowed_aliases
-            if len(saliases) > 0:
-                if len(aliases) > 0:
-                    txt += '; '
-                else:
-                    txt += ', '
-                if len(saliases) == 1:
-                    txt += 'shadowed alias: ' + _mrtxt(saliases.pop(),fmt)
-                else:
-                    txt += 'shadowed aliases: ' + _mrtxt(', '.join(sorted(saliases,key=str.lower)),fmt)
-        except:
-            raise
-            txt += '??'
-                
-        if fmt == 'html' or fmt == 'latex':
-            txt += '</li>\n'
-        else:
-            txt += '\n'
-            
-    txt = txt[:-1]
-    if fmt in ['latex','html']:
-        txt += '</ul>'
-    
-    if not prnt:
-        return txt
-    
-    if fmt == 'latex' and ipython_installed:
-            print_markdown(txt)
-    elif fmt == 'html' and ipython_installed:
-            print_html(txt)
-    else:
-        print(txt)
+    return search_constants_result([u[1] for u in constants])
         
         
 def shadowed_constants(fmt=None,prnt=True):
     """
     Lists any constants which have a shadowed name or alias.  Constants may be 
-    shadowed if the user has defined a new unit with the same name or alias as 
-    an existing unit.
+    shadowed if the user has defined a new constant with the same name or alias
+    as an existing constant.
     
     Parameters
     ---------
@@ -402,10 +410,6 @@ def shadowed_constants(fmt=None,prnt=True):
         The output format.  If `None`, then the `gummy.printer` value is used.
         If latex output is selected, Markdown is actually used with the unit
         symbols and conversion displayed using inline LaTeX.
-
-    prnt: `bool`, optional
-        If this is `True`, the results are printed.  If it is `False` the results
-        are returned as a string.  The default is `True`.
     """
     constants = {id(c):c for c in GummyConstant._builtin_lib.values()}
     constants.update({id(c):c for c in GummyConstant._lib.values()})

metrolopy/constcom.py

@@ -28,7 +28,8 @@ are from CODATA 2018
 import numpy as np
 from warnings import warn
 from .gummy import gummy
-from .ummy import ummy,MFraction,_getfinfo,_iinfo
+from .ummy import ummy,_getfinfo,_iinfo
+from .unit import MFraction
 
 
 def _rounding_u(x):
@@ -49,89 +50,89 @@ euler = _rounding_u(np.e)
 sqrt2 = _rounding_u(np.sqrt(2))
 
 
-# constants from CODATA 2018:
+# constants from CODATA 2022:
     
 (
-alph,
-aral,
-ryd,
-are,
-mpsme,
-ae,
-rd,
-ghn,
-arh,
-sigmah,
-mmu,
-amu,
-arn,
-gnn,
-ard,
-gdn,
-gp,
-sigmapp,
-mtu,
-gtn
-) = gummy.create([0.0072973525693,
-           4.001506179127,
-           10973731.56816,
-           0.000548579909065,
-           1836.15267343,
-           0.00115965218128,
-           2.12799e-15,
-           -4.255250615,
-           3.014932247175,
-           5.996743000000001e-05,
-           1.8835316269999999e-28,
-           0.00116592089,
-           1.00866491595,
-           -3.82608545,
-           2.013553212745,
-           0.8574382338,
-           5.5856946893,
-           2.5689000000000004e-05,
-           3.01550071621,
-           5.957924931],
-           u=[1.1e-12,
-              6.3e-11,
-              2.1e-05,
-              1.6e-14,
-              1.1e-07,
-              1.8e-13,
-              7.4e-19,
-              5e-08,
-              9.7e-11,
-              1.0e-10,
-              4.2e-36,
-              6.3e-10,
-              4.9e-10,
-              9e-07,
-              4e-11,
-              2.2e-09,
-              1.6e-09,
-              1.1e-08,
-              1.2e-10,
-              1.2e-08],
-           correlation_matrix=[[       1, 0.00003, 0.00207,-0.05927, 0.03103, 0.99492, 0.00320,-0.00017, 0.00147, 0.00000,-0.00013, 0.00055, 0.00003,-0.00001, 0.00002, 0.00005, 0.00001,-0.00019, 0.00117, 0.00000],
-                               [ 0.00003,       1,-0.00000,-0.00050, 0.00024, 0.00003,-0.00000,-0.00000, 0.00000, 0.00000, 0.00000,-0.00000, 0.00000,-0.00000, 0.00000, 0.00000, 0.00000,-0.00000, 0.00000, 0.00000],
-                               [ 0.00207,-0.00000,       1, 0.00704,-0.01206, 0.00206, 0.90366, 0.00006,-0.00578, 0.00000, 0.00017, 0.00001, 0.00044, 0.00000,-0.00093,-0.00002,-0.00000, 0.00007,-0.00463,-0.00000],
-                               [-0.05927,-0.00050, 0.00704,       1,-0.48443,-0.05896, 0.00317, 0.00249,-0.00044, 0.00000,-0.00001, 0.00002,-0.00003, 0.00012,-0.00040,-0.00067,-0.00016, 0.00267,-0.00022,-0.00002],
-                               [ 0.03103, 0.00024,-0.01206,-0.48443,       1, 0.03087,-0.01113,-0.00513, 0.47743, 0.00000, 0.00003,-0.00009,-0.03920,-0.00026, 0.00020, 0.00137, 0.00032,-0.00551, 0.38235, 0.00005],
-                               [ 0.99492, 0.00003, 0.00206,-0.05896, 0.03087,       1, 0.00319,-0.00017, 0.00146, 0.00000,-0.00013, 0.00055, 0.00003,-0.00001, 0.00002, 0.00005, 0.00001,-0.00019, 0.00116, 0.00000],
-                               [ 0.00320,-0.00000, 0.90366, 0.00317,-0.01113, 0.00319,       1, 0.00006,-0.00511, 0.00000, 0.00016, 0.00001, 0.00049, 0.00000, 0.00209,-0.00002,-0.00000, 0.00006,-0.00410,-0.00000],
-                               [-0.00017,-0.00000, 0.00006, 0.00249,-0.00513,-0.00017, 0.00006,       1,-0.00245,-0.00854,-0.00000, 0.00000, 0.00020, 0.04291,-0.00000,-0.00001,-0.00000, 0.92869,-0.00196,-0.00000],
-                               [ 0.00147, 0.00000,-0.00578,-0.00044, 0.47743, 0.00146,-0.00511,-0.00245,       1, 0.00000, 0.00001,-0.00005,-0.02445,-0.00012, 0.41560, 0.00066, 0.00015,-0.00263, 0.80098, 0.00002],
-                               [ 0.00000, 0.00000, 0.00000, 0.00000, 0.00000, 0.00000, 0.00000,-0.00854, 0.00000,       1, 0.00000, 0.00000, 0.00000, 0.00000, 0.00000, 0.00000, 0.00000, 0.00000, 0.00000, 0.00000],
-                               [-0.00013, 0.00000, 0.00017,-0.00001, 0.00003,-0.00013, 0.00016,-0.00000, 0.00001, 0.00000,       1, 0.06971,-0.00000,-0.00000,-0.00000,-0.00002,-0.00016,-0.00000, 0.00001,-0.00002],
-                               [ 0.00055,-0.00000, 0.00001, 0.00002,-0.00009, 0.00055, 0.00001, 0.00000,-0.00005, 0.00000, 0.06971,       1, 0.00000, 0.00000,-0.00000, 0.00006, 0.00054, 0.00002,-0.00004, 0.00008],
-                               [ 0.00003, 0.00000, 0.00044,-0.00003,-0.03920, 0.00003, 0.00049, 0.00020,-0.02445, 0.00000,-0.00000, 0.00000,       1, 0.00001,-0.00000,-0.00005,-0.00001, 0.00022,-0.01959,-0.00000],
-                               [-0.00001,-0.00000, 0.00000, 0.00012,-0.00026,-0.00001, 0.00000, 0.04291,-0.00012, 0.00000,-0.00000, 0.00000, 0.00001,       1,-0.00000,-0.00000,-0.00000, 0.04618,-0.00010,-0.00000],
-                               [ 0.00002, 0.00000,-0.00093,-0.00040, 0.00020, 0.00002, 0.00209,-0.00000, 0.41560, 0.00000,-0.00000,-0.00000,-0.00000,-0.00000,       1, 0.00000, 0.00000,-0.00000, 0.33288, 0.00000],
-                               [ 0.00005, 0.00000,-0.00002,-0.00067, 0.00137, 0.00005,-0.00002,-0.00001, 0.00066, 0.00000,-0.00002, 0.00006,-0.00005,-0.00000, 0.00000,       1, 0.10706, 0.00289, 0.00053, 0.01581],
-                               [ 0.00001, 0.00000,-0.00000,-0.00016, 0.00032, 0.00001,-0.00000,-0.00000, 0.00015, 0.00000,-0.00016, 0.00054,-0.00001,-0.00000, 0.00000, 0.10706,       1, 0.02707, 0.00012, 0.14766],
-                               [-0.00019,-0.00000, 0.00007, 0.00267,-0.00551,-0.00019, 0.00006, 0.92869,-0.00263, 0.00000,-0.00000, 0.00002, 0.00022, 0.04618,-0.00000, 0.00289, 0.02707,       1,-0.00211, 0.00400],
-                               [ 0.00117, 0.00000,-0.00463,-0.00022, 0.38235, 0.00116,-0.00410,-0.00196, 0.80098, 0.00000, 0.00001,-0.00004,-0.01959,-0.00010, 0.33288, 0.00053, 0.00012,-0.00211,       1, 0.00002],
-                               [ 0.00000, 0.00000,-0.00000,-0.00002, 0.00005, 0.00000,-0.00000,-0.00000, 0.00002, 0.00000,-0.00002, 0.00008,-0.00000,-0.00000, 0.00000, 0.01581, 0.14766, 0.00400, 0.00002,       1]]
+alph, # fine structure constant
+aral,  # alpha particle mass in u
+ryd, # Rydberg constant (1/m)
+are, # electron mass in u
+mpsme, # proton-electron mass ratio
+ae, # electron mag. mom. anomaly
+rd, # deuteron rms charge radius (m)
+ghn, # helion g factor
+arh, # helion relative atomic mass
+sigmah, # helion shielding shift
+mmu, # muon mass (kg)
+amu, # muon mag. mom. anomaly
+arn, # neutron mass in u
+gnn, # neutron g factor
+ard, # deuteron relative atomic mass
+gdn, # deuteron g factor
+gp, # proton g factor
+sigmapp, # proton sheilding factor
+mtu, # triton relative atomic mass
+gtn # triton g factor
+) = gummy.create([7.2973525643e-3,       
+           4.001506179129,        
+           10973731.568157,      
+           5.485799090441e-4,    
+           1836.152673426,         
+           1.15965218046e-3,    
+           2.12778e-15,            
+           -4.2552506995,          
+           3.014932246932,        
+           5.9967029e-5,           
+           1.883531627e-28,       
+           1.16592062e-3,         
+           1.00866491606,         
+           -3.82608552,            
+           2.013553212544,        
+           0.8574382335,           
+           5.5856946893,           
+           2.56715e-5,             
+           3.01550071597,         
+           5.957924930],
+           u=[0.0000000011e-3,
+              0.000000000062,
+              0.000012,
+              0.000000000097e-4,
+              0.000000032,
+              0.00000000018e-3,
+              0.00027e-15 ,
+              0.0000000034,
+              0.000000000074,
+              0.0000023e-5,
+              0.000000042e-28,
+              0.00000041e-3,
+              0.00000000040,
+              0.00000090,
+              0.000000000015,
+              0.000000002,
+              0.0000000016,
+              0.00041e-5,
+              0.00000000010,
+              0.000000012],
+           correlation_matrix=[[       1, 0.00001, 0.00125,-0.03972, 0.03527, 0.97556, 0.00036, 0.00000,-0.00332, 0.00000,-0.00014, 0.00087, 0.00168, 0.00000,-0.01036, 0.00002, 0.00000,-0.00003,-0.00237, 0.00000],
+                               [ 0.00001,       1, 0.00001,-0.00031, 0.00028, 0.00001,-0.00001, 0.00000,-0.00002, 0.00000, 0.00000,-0.00000, 0.00000,-0.00007, 0.00000, 0.00000, 0.00000, 0.00000,-0.00002, 0.00000],
+                               [ 0.00125, 0.00001,       1,-0.03754,-0.04138, 0.00225, 0.60917, 0.00000, 0.00203, 0.00000, 0.00010, 0.00000, 0.00010, 0.00000, 0.00645, 0.00002, 0.00000,-0.00002, 0.00145, 0.00000],
+                               [-0.03972,-0.00031,-0.03754,       1,-0.88879,-0.03875, 0.02306, 0.00009, 0.08307, 0.00000,-0.00001, 0.00000, 0.00397, 0.00001, 0.25967,-0.00035,-0.00008, 0.00052, 0.05946,-0.00001],
+                               [ 0.03527, 0.00028,-0.04138,-0.88879,       1, 0.03441,-0.02598,-0.00010, 0.05140, 0.00000, 0.00001,-0.00001, 0.00130,-0.00001, 0.14561, 0.00040, 0.00009,-0.00059,-0.00232, 0.00000],
+                               [ 0.97556, 0.00001, 0.00225,-0.03875, 0.03441,       1, 0.00035, 0.00000,-0.00323, 0.00000,-0.00013, 0.00085, 0.00164, 0.00000,-0.01011, 0.00002, 0.00000,-0.00003, 0.00116, 0.00000],
+                               [ 0.00036,-0.00001, 0.60917, 0.02306,-0.02598, 0.00035,       1, 0.00000,-0.00134, 0.00000, 0.00006, 0.00000,-0.00003, 0.00000,-0.00375,-0.00001, 0.00000, 0.00002,-0.00095, 0.00000],
+                               [ 0.00000, 0.00000, 0.00000, 0.00009,-0.00010, 0.00000, 0.00000,       1,-0.00001,-0.02844,-0.00004,-0.00199, 0.00000, 0.00296,-0.00001, 0.00000, 0.00000, 0.17032, 0.00000, 0.00000],
+                               [-0.00332,-0.00002, 0.00203, 0.08307, 0.05140,-0.00323,-0.00134,-0.00001,       1, 0.00000, 0.00000,-0.00001, 0.00513, 0.00000, 0.29794, 0.00002, 0.00000,-0.00003, 0.71472, 0.00000],
+                               [ 0.00000, 0.00000, 0.00000, 0.00000, 0.00000, 0.00000, 0.00000,-0.02844, 0.00000,       1, 0.00000, 0.00000, 0.00000, 0.00000, 0.00000, 0.00000, 0.00000, 0.00000, 0.00000, 0.00000],
+                               [-0.00014, 0.00000, 0.00010,-0.00001, 0.00001,-0.00013, 0.00006,-0.00004, 0.00000, 0.00000,       1, 0.08172, 0.00000, 0.00000, 0.00000,-0.00002,-0.00018,-0.00023, 0.00000,-0.00003],
+                               [ 0.00087,-0.00000, 0.00000, 0.00000,-0.00001, 0.00085, 0.00000,-0.00199,-0.00001, 0.00000, 0.08172,       1, 0.00000,-0.00020,-0.00002, 0.00000,-0.00001,-0.01160, 0.00000, 0.00000],
+                               [ 0.00168, 0.00000, 0.00010, 0.00397, 0.00130, 0.00164,-0.00003, 0.00000, 0.00513, 0.00000, 0.00000, 0.00000,       1, 0.00000, 0.01921, 0.00000, 0.00000, 0.00000, 0.00366, 0.00000],
+                               [ 0.00000,-0.00007, 0.00000, 0.00001,-0.00001, 0.00000, 0.00000, 0.00296, 0.00000, 0.00000, 0.00000,-0.00020, 0.00000,       1, 0.00000, 0.00000, 0.00000, 0.01731, 0.00000, 0.00000],
+                               [-0.01036, 0.00000, 0.00645, 0.25967, 0.14561,-0.01011,-0.00375,-0.00001, 0.29794, 0.00000, 0.00000,-0.00002, 0.01921, 0.00000,       1, 0.00006, 0.00001,-0.00009, 0.21297, 0.00000],
+                               [ 0.00002, 0.00000, 0.00002,-0.00035, 0.00040, 0.00002,-0.00001, 0.00000, 0.00002, 0.00000,-0.00002, 0.00000, 0.00000, 0.00000, 0.00006,       1, 0.10706, 0.00770, 0.00001, 0.01581],
+                               [ 0.00000, 0.00000, 0.00000,-0.00008, 0.00009, 0.00000, 0.00000, 0.00000, 0.00000, 0.00000,-0.00018,-0.00001, 0.00000, 0.00000, 0.00001, 0.10706,       1, 0.07194, 0.00000, 0.14767],
+                               [-0.00003, 0.00000,-0.00002, 0.00052,-0.00059,-0.00003, 0.00002, 0.17032,-0.00003, 0.00000,-0.00023,-0.01160, 0.00000, 0.01731,-0.00009, 0.00770, 0.07194,       1,-0.00002, 0.01062],
+                               [-0.00237,-0.00002, 0.00145, 0.05946,-0.00232, 0.00116,-0.00095, 0.00000, 0.71472, 0.00000, 0.00000, 0.00000, 0.00366, 0.00000, 0.21297, 0.00001, 0.00000,-0.00002,       1, 0.00000],
+                               [ 0.00000, 0.00000, 0.00000,-0.00001, 0.00000, 0.00000, 0.00000, 0.00000, 0.00000, 0.00000,-0.00003, 0.00000, 0.00000, 0.00000, 0.00000, 0.01581, 0.14767, 0.01062, 0.00000,       1]]
 )
 
 
@@ -148,7 +149,7 @@ RK = h/e**2
 KJ90 = MFraction('483597.9e9') # Josephson constant Hz/V, 1990 conventional value
 RK90 = MFraction('25812.807') # Von Klitzing constant in ohm, 1990 conventional value
     
-G = ummy(6.67430e-11,0.00015e-11) # gravitational constant in m**3/kg s**2
+G = ummy(6.67430e-11,0.00015e-11) # gravitational constant in m**3/kg s**2, CODATA 2022
 
 dalton = 2*ryd*h/(are*c*alph**2)
 me = 2*ryd*h/(c*alph**2) #electron mass in kg