Commit 2b73f43b authored by Pavel Ondračka's avatar Pavel Ondračka Committed by Markus Scheidgen
Browse files

More cleanups from the separate complex parsers removal

This reverts commit cf6abfe7
and and just uses the x_wien2k_in2_* variables intead
parent cf6abfe7
......@@ -761,29 +761,5 @@ class section_method(public.section_method):
repeats=True,
a_legacy=LegacyDefinition(name='x_wien2k_section_XC'))
x_wien2k_in2c_switch = Quantity(
type=str,
a_legacy=LegacyDefinition(name='x_wien2k_in2c_switch'))
x_wien2k_in2c_emin = Quantity(
type=np.dtype(np.float64),
a_legacy=LegacyDefinition(name='x_wien2k_in2c_emin'))
x_wien2k_in2c_ne = Quantity(
type=np.dtype(np.float64),
a_legacy=LegacyDefinition(name='x_wien2k_in2c_ne'))
x_wien2k_in2c_espermin = Quantity(
type=np.dtype(np.float64),
a_legacy=LegacyDefinition(name='x_wien2k_in2c_espermin'))
x_wien2k_in2c_esper0 = Quantity(
type=np.dtype(np.float64),
a_legacy=LegacyDefinition(name='x_wien2k_in2c_esper0'))
x_wien2k_in2c_gmax = Quantity(
type=np.dtype(np.float64),
a_legacy=LegacyDefinition(name='x_wien2k_in2c_gmax'))
m_package.__init_metainfo__()
......@@ -56,10 +56,10 @@ def buildIn2Matchers():
subMatchers = [
# SM(name = 'systemName',
# startReStr = r"(?P<x_wien2k_system_nameIn>.*)"),
SM(r"\s*(?P<x_wien2k_in2c_switch>[A-Z]+)\s*.*"),
SM(r"\s*(?P<x_wien2k_in2c_emin>[-+0-9.]+)\s*(?P<x_wien2k_in2c_ne>[-+0-9.]+)\s*(?P<x_wien2k_in2c_espermin>[-+0-9.]+)\s*(?P<x_wien2k_in2c_esper0>[-+0-9.]+)\s*.*"),
SM(r"\s*(?P<x_wien2k_in2_switch>[A-Z]+)\s*.*"),
SM(r"\s*(?P<x_wien2k_in2_emin>[-+0-9.]+)\s*(?P<x_wien2k_in2_ne>[-+0-9.]+)\s*(?P<x_wien2k_in2_espermin>[-+0-9.]+)\s*(?P<x_wien2k_in2_esper0>[-+0-9.]+)\s*.*"),
SM(r"\s*(?P<x_wien2k_smearing_kind>[A-Z]+)\s*\s*(?P<smearing_width__rydberg>[-+0-9.]+)\s*.*"),
SM(r"\s*(?P<x_wien2k_in2c_gmax>[-+0-9.]+)\s*GMAX")
SM(r"\s*(?P<x_wien2k_in2_gmax>[-+0-9.]+)\s*GMAX")
])
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment