Merge 0adffcb into 2fdc2c0

scikit-hep · May 3, 2019 · 45dc6a0 · 45dc6a0
2 parents 2fdc2c0 + 0adffcb
commit 45dc6a0
Show file tree

Hide file tree

Showing 8 changed files with 1,133 additions and 62 deletions.
diff --git a/decaylanguage/__init__.py b/decaylanguage/__init__.py
@@ -1,6 +1,11 @@
+from __future__ import absolute_import
+
 
 __version__ = '0.2.0'
 
 version = __version__
 version_info = __version__.split('.')
 
+
+# Direct access to decay file parsing tools
+from .dec import DecFileParser
diff --git a/decaylanguage/data/decfile.lark b/decaylanguage/data/decfile.lark
@@ -44,7 +44,7 @@ model_options : (value | LABEL)+
 _NEWLINE: ( /\r?\n[\t ]*/ | COMMENT )+
 
 // We must set priorities here to use lalr - match model name above label, and label above something else
-MODEL_NAME.2 : "BaryonPCR"|"BTO3PI_CP"|"BTOSLLALI"|"BTOSLLBALL"|"BTOXSGAMMA"|"BTOXSLL"|"CB3PI-MPP"|"CB3PI-P00"|"D_DALITZ"|"ETA_DALITZ"|"GOITY_ROBERTS"|"HELAMP"|"HQET"|"ISGW2"|"OMEGA_DALITZ"|"PARTWAVE"|"PHSP"|"PI0_DALITZ"|"PYTHIA"|"SLN"|"STS"|"SVP_HELAMP"|"SVS"|"SVV_HELAMP"|"TAUHADNU"|"TAULNUNU"|"TAUSCALARNU"|"TAUVECTORNU"|"TSS"|"TVS_PWAVE"|"VLL"|"VSP_PWAVE"|"VSS"|"VSS_BMIX"|"VUB"|"VVP"|"VVPIPI"|"VVS_PWAVE"|"SSD_CP"
+MODEL_NAME.2 : "BaryonPCR"|"BTO3PI_CP"|"BTOSLLALI"|"BTOSLLBALL"|"BTOXSGAMMA"|"BTOXSLL"|"CB3PI-MPP"|"CB3PI-P00"|"D_DALITZ"|"ETA_DALITZ"|"GOITY_ROBERTS"|"HELAMP"|"HQET"|"ISGW2"|"LbAmpGen"|"OMEGA_DALITZ"|"PARTWAVE"|"PHSP"|"PI0_DALITZ"|"PYTHIA"|"SLN"|"STS"|"SVP_HELAMP"|"SVS"|"SVV_HELAMP"|"TAUHADNU"|"TAULNUNU"|"TAUSCALARNU"|"TAUVECTORNU"|"TSS"|"TVS_PWAVE"|"VLL"|"VSP_PWAVE"|"VSS"|"VSS_BMIX"|"VUB"|"VVP"|"VVPIPI"|"VVS_PWAVE"|"SSD_CP"
 
 LABEL : /[a-zA-Z0-9\/\-+*_()']+/
 COMMENT : /[;#][^\n]*/

diff --git a/decaylanguage/dec/__init__.py b/decaylanguage/dec/__init__.py
@@ -0,0 +1,3 @@
+from __future__ import absolute_import
+
+from .dec import DecFileParser