Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
BluePyMM
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
BlueBrain
BluePyMM
Commits
baef477b
Commit
baef477b
authored
8 years ago
by
Werner Alfons Hilda Van Geit
Browse files
Options
Downloads
Patches
Plain Diff
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
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
bluepymm/parse_files.py
+2
-2
2 additions, 2 deletions
bluepymm/parse_files.py
bluepymm/tests/examples/simple1/data/emodels_dir/subdir/emodel_etype_map.json
+2
-2
2 additions, 2 deletions
...les/simple1/data/emodels_dir/subdir/emodel_etype_map.json
with
4 additions
and
4 deletions
bluepymm/parse_files.py
+
2
−
2
View file @
baef477b
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
bluepymm/tests/examples/simple1/data/emodels_dir/subdir/emodel_etype_map.json
+
2
−
2
View file @
baef477b
...
@@ -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"
]
}
}
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment