Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
tbgl
tools
mrdna
Commits
3c9c0217
Commit
3c9c0217
authored
May 20, 2021
by
cmaffeo2
Browse files
Exposed fill_sequence in read_cadnano
parent
1707caf7
Changes
2
Hide whitespace changes
Inline
Side-by-side
mrdna/readers/__init__.py
View file @
3c9c0217
## TODO: make module this package conform to a single style for input/output
## TODO: make module this package conform to a single style for input/output
def
read_cadnano
(
json_file
,
**
model_parameters
):
def
read_cadnano
(
json_file
,
sequence
=
None
,
fill_sequence
=
'T'
,
**
model_parameters
):
from
.cadnano_segments
import
read_json_file
from
.cadnano_segments
import
read_json_file
from
.cadnano_segments
import
read_model
as
model_from_cadnano_json
from
.cadnano_segments
import
read_model
as
model_from_cadnano_json
data
=
read_json_file
(
json_file
)
data
=
read_json_file
(
json_file
)
return
model_from_cadnano_json
(
data
,
**
model_parameters
)
return
model_from_cadnano_json
(
data
,
sequence
,
fill_sequence
,
**
model_parameters
)
def
read_vhelix
(
maya_file
,
**
model_parameters
):
def
read_vhelix
(
maya_file
,
**
model_parameters
):
from
.polygon_mesh
import
parse_maya_file
,
convert_maya_bases_to_segment_model
from
.polygon_mesh
import
parse_maya_file
,
convert_maya_bases_to_segment_model
from
..model.dna_sequence
import
m13
as
m13seq
maya_bases
=
parse_maya_file
(
maya_file
)
maya_bases
=
parse_maya_file
(
maya_file
)
model
=
convert_maya_bases_to_segment_model
(
maya_bases
,
**
model_parameters
)
model
=
convert_maya_bases_to_segment_model
(
maya_bases
,
**
model_parameters
)
...
...
mrdna/readers/cadnano_segments.py
View file @
3c9c0217
...
@@ -673,7 +673,7 @@ def _get_lattice(part):
...
@@ -673,7 +673,7 @@ def _get_lattice(part):
def
package_archive
(
name
,
directory
):
def
package_archive
(
name
,
directory
):
...
...
def
read_model
(
json_data
,
sequence
=
None
,
**
kwargs
):
def
read_model
(
json_data
,
sequence
=
None
,
fill_sequence
=
'T'
,
**
kwargs
):
""" Read in data """
""" Read in data """
part
=
decode_cadnano_part
(
json_data
)
part
=
decode_cadnano_part
(
json_data
)
model
=
cadnano_part
(
part
,
model
=
cadnano_part
(
part
,
...
@@ -689,9 +689,9 @@ def read_model(json_data, sequence=None, **kwargs):
...
@@ -689,9 +689,9 @@ def read_model(json_data, sequence=None, **kwargs):
if
sequence
is
None
or
len
(
sequence
)
==
0
:
if
sequence
is
None
or
len
(
sequence
)
==
0
:
## default m13mp18
## default m13mp18
model
.
set_sequence
(
m13seq
,
force
=
False
)
model
.
set_sequence
(
m13seq
,
force
=
False
,
fill_sequence
=
fill_sequence
)
else
:
else
:
model
.
set_sequence
(
sequence
)
model
.
set_sequence
(
sequence
,
fill_sequence
=
fill_sequence
)
return
model
return
model
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment