From 1b7338737ac5ab13cbc0ae0a23c069693bf905ca Mon Sep 17 00:00:00 2001
From: pinyili2 <pinyili2@illinois.edu>
Date: Wed, 21 Aug 2024 15:55:56 -0500
Subject: [PATCH] a
---
mrdna/readers/segmentmodel_from_oxdna_pinyi.py | 2 +-
mrdna/readers/segmentmodel_from_scadnano.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mrdna/readers/segmentmodel_from_oxdna_pinyi.py b/mrdna/readers/segmentmodel_from_oxdna_pinyi.py
index 9dcbbd1..2f03024 100644
--- a/mrdna/readers/segmentmodel_from_oxdna_pinyi.py
+++ b/mrdna/readers/segmentmodel_from_oxdna_pinyi.py
@@ -127,7 +127,7 @@ def mrdna_model_from_oxdna(coordinate_file, topology_file,virt2nuc=None,get_nt_p
non_stack_ind,=np.where(nt_prop["stack"]==-1)
for i in non_stack_ind:
- zid=int(nt_prop.loc[i][zid])+int(nt_prop.loc[i]["fwd"])*2-1
+ zid=int(nt_prop.loc[i]["zid"])+int(nt_prop.loc[i]["fwd"])*2-1
try:
nt_prop["stack"][i]=bp_map[(nt_prop.loc[i]["vh"],str(zid),nt_prop.loc[i]["fwd"])]
except:
diff --git a/mrdna/readers/segmentmodel_from_scadnano.py b/mrdna/readers/segmentmodel_from_scadnano.py
index 863a61b..f47b9d3 100644
--- a/mrdna/readers/segmentmodel_from_scadnano.py
+++ b/mrdna/readers/segmentmodel_from_scadnano.py
@@ -122,7 +122,7 @@ def gen_prop_table(fname):
nt_prop["bp"]=bp
non_stack_ind,=np.where(nt_prop["stack"]==-1)
for i in non_stack_ind:
- zid=int(nt_prop.loc[i][zid])+int(nt_prop.loc[i]["fwd"])*2-1
+ zid=int(nt_prop.loc[i]["zid"])+int(nt_prop.loc[i]["fwd"])*2-1
try:
nt_prop["stack"][i]=bp_map[(nt_prop.loc[i]["vh"],str(zid),nt_prop.loc[i]["fwd"])]
except:
--
GitLab