Skip to content
Snippets Groups Projects
Commit baef477b authored by Werner Alfons Hilda Van Geit's avatar Werner Alfons Hilda Van Geit
Browse files

Allow for string layers. This commit breaks old config files !

parent 6fb33f01
No related branches found
No related tags found
No related merge requests found
...@@ -57,7 +57,7 @@ def read_mm_recipe(recipe_filename): ...@@ -57,7 +57,7 @@ def read_mm_recipe(recipe_filename):
'in recipe, script cant to ' 'in recipe, script cant to '
'handle this case') 'handle this case')
yield (int(layer.attrib['id']), yield (layer.attrib['id'],
structural_type.attrib['id'], structural_type.attrib['id'],
electro_type.attrib['id']) electro_type.attrib['id'])
...@@ -75,7 +75,7 @@ def xmlmorphinfo_from_xml(xml_morph): ...@@ -75,7 +75,7 @@ def xmlmorphinfo_from_xml(xml_morph):
mtype = xml_morph.findtext('mtype') mtype = xml_morph.findtext('mtype')
msubtype = xml_morph.findtext('msubtype') msubtype = xml_morph.findtext('msubtype')
fullmtype = '%s:%s' % (mtype, msubtype) if msubtype != '' else mtype fullmtype = '%s:%s' % (mtype, msubtype) if msubtype != '' else mtype
layer = int(xml_morph.findtext('layer')) layer = xml_morph.findtext('layer')
return (name, fullmtype, mtype, msubtype, layer) return (name, fullmtype, mtype, msubtype, layer)
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
"emodel1": { "emodel1": {
"mm_recipe": "emodel1", "mm_recipe": "emodel1",
"etype": "etype1", "etype": "etype1",
"layer": [1,2] "layer": ["1","str1"]
}, },
"emodel2": { "emodel2": {
"mm_recipe": "emodel2", "mm_recipe": "emodel2",
"etype": "etype2", "etype": "etype2",
"layer": [1,2] "layer": ["1","2"]
} }
} }
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