decaylanguage 0.3.2__tar.gz → 0.4.0__tar.gz

{decaylanguage-0.3.2 → decaylanguage-0.4.0}/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## Version 0.4.0 (2019-09-02)
+
+* Package dependent on ``Particle`` version 0.6.0.
+  Otherwise identical to version 0.3.2.
+
+
 ## Version 0.3.2 (2019-08-29)
 
 * Parsing of decay files (aka .dec files):

{decaylanguage-0.3.2 → decaylanguage-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: decaylanguage
-Version: 0.3.2
+Version: 0.4.0
 Summary: A language to describe particle decays, and tools to work with them.
 Home-page: https://github.com/scikit-hep/decaylanguage
 Author: Henry Fredrick Schreiner III
@@ -125,7 +125,7 @@ Description:
         DecayChainViewer(d)  # works in a notebook
         ```
         
-        ![DecayChain D*](images/DecayChain_Dst_stable-D0-and-D+.png)
+        ![DecayChain D*](https://raw.githubusercontent.com/scikit-hep/decaylanguage/master/images/DecayChain_Dst_stable-D0-and-D+.png)
         
         The actual graph is available as
         
@@ -195,6 +195,12 @@ Description:
         
         # Changelog
         
+        ## Version 0.4.0 (2019-09-02)
+        
+        * Package dependent on ``Particle`` version 0.6.0.
+          Otherwise identical to version 0.3.2.
+        
+        
         ## Version 0.3.2 (2019-08-29)
         
         * Parsing of decay files (aka .dec files):

{decaylanguage-0.3.2 → decaylanguage-0.4.0}/README.md

@@ -1,4 +1,4 @@
-[![DecayLanguage](https://raw.githubusercontent.com/scikit-hep/decaylanguage/master/images/DecayLanguage.png)](http://decaylanguage.readthedocs.io/en/latest/)
+[![DecayLanguage](https://raw.githubusercontent.com/scikit-hep/decaylanguage/master/images/DecayLanguage.png)](https://decaylanguage.readthedocs.io/en/latest/)
 
 ## DecayLanguage: describe, manipulate and convert particle decays
 
@@ -127,7 +127,7 @@ d = parser.build_decay_chain('D*+', stable_particles=['D+', 'D0'])
 DecayChainViewer(d)  # works in a notebook
 ```
 
-![DecayChain D*](images/DecayChain_Dst_stable-D0-and-D+.png)
+![DecayChain D*](https://raw.githubusercontent.com/scikit-hep/decaylanguage/master/images/DecayChain_Dst_stable-D0-and-D+.png)
 
 The actual graph is available as
 

{decaylanguage-0.3.2 → decaylanguage-0.4.0}/decaylanguage/_version.py

@@ -4,7 +4,7 @@
 # or https://github.com/scikit-hep/decaylanguage for details.
 
 
-__version__ = '0.3.2'
+__version__ = '0.4.0'
 
 version = __version__
 version_info = __version__.split('.')

{decaylanguage-0.3.2 → decaylanguage-0.4.0}/decaylanguage/dec/dec.py

@@ -1140,16 +1140,30 @@ def get_jetset_definitions(parsed_file):
      \( (?P<pnumber>    \d+         ) \)  # parameter number in ()
     """, re.VERBOSE)
 
+    def to_int_or_float(n):
+        """
+        Trivial helper function to convert the parsed (as strings)
+        JETSET parameters into what they are, namely integers or floats.
+        """
+        try:
+            return int(n)
+        except ValueError:
+            try:
+                return float(n)
+            except:
+                # pass though non-numbers unchanged
+                return n
+
     try:
         dict_params = {}
         for tree in parsed_file.find_data('jetset_def'):
             param = get_jetsetpar.match(tree.children[0].value).groupdict()
             try:
                 dict_params[param['pname']].update(
-                    {int(param['pnumber']):tree.children[1].value})
+                    {int(param['pnumber']):to_int_or_float(tree.children[1].value)})
             except KeyError:
                 dict_params[param['pname']] =\
-                    {int(param['pnumber']):tree.children[1].value}
+                    {int(param['pnumber']):to_int_or_float(tree.children[1].value)}
         return dict_params
     except:
         RuntimeError("Input parsed file does not seem to have the expected structure.")

{decaylanguage-0.3.2 → decaylanguage-0.4.0}/decaylanguage.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: decaylanguage
-Version: 0.3.2
+Version: 0.4.0
 Summary: A language to describe particle decays, and tools to work with them.
 Home-page: https://github.com/scikit-hep/decaylanguage
 Author: Henry Fredrick Schreiner III
@@ -125,7 +125,7 @@ Description:
         DecayChainViewer(d)  # works in a notebook
         ```
         
-        ![DecayChain D*](images/DecayChain_Dst_stable-D0-and-D+.png)
+        ![DecayChain D*](https://raw.githubusercontent.com/scikit-hep/decaylanguage/master/images/DecayChain_Dst_stable-D0-and-D+.png)
         
         The actual graph is available as
         
@@ -195,6 +195,12 @@ Description:
         
         # Changelog
         
+        ## Version 0.4.0 (2019-09-02)
+        
+        * Package dependent on ``Particle`` version 0.6.0.
+          Otherwise identical to version 0.3.2.
+        
+        
         ## Version 0.3.2 (2019-08-29)
         
         * Parsing of decay files (aka .dec files):

{decaylanguage-0.3.2 → decaylanguage-0.4.0}/decaylanguage.egg-info/requires.txt

@@ -4,7 +4,7 @@ numpy>=1.12
 pandas>=0.22
 six>=1.11
 lark-parser>=0.6.3
-particle>=0.5.0
+particle>=0.6.0
 
 [:python_version < "3.3"]
 cachetools

{decaylanguage-0.3.2 → decaylanguage-0.4.0}/setup.py

@@ -84,7 +84,7 @@ setup(
         'enum34>=1.1; python_version<"3.4"',
         'importlib_resources>=1.0; python_version<"3.7"',
         'cachetools; python_version<"3.3"',
-        'particle>=0.5.0'
+        'particle>=0.6.0'
     ],
     extras_require=extras,
     setup_requires=[] + pytest_runner,

{decaylanguage-0.3.2 → decaylanguage-0.4.0}/tests/dec/test_dec.py

@@ -143,10 +143,10 @@ def test_jetset_definitions_parsing():
     p = DecFileParser(DIR / '../data/defs-aliases-chargeconj.dec')
     p.parse()
 
-    assert p.dict_jetset_definitions() == {'MSTU': {1: '0', 2: '0'},
-                                           'PARU': {11: '0.001'},
-                                           'MSTJ': {26: '0'},
-                                           'PARJ': {21: '0.36'}}
+    assert p.dict_jetset_definitions() == {'MSTU': {1: 0, 2: 0},
+                                           'PARU': {11: 0.001},
+                                           'MSTJ': {26: 0},
+                                           'PARJ': {21: 0.36}}
 
 
 def test_list_lineshape_definitions():