From cc444b68c490347e7a53369b4686dc8b7aef486b Mon Sep 17 00:00:00 2001
From: Chris Maffeo <cmaffeo2@illinois.edu>
Date: Thu, 28 Jun 2018 17:15:41 -0500
Subject: [PATCH] Fixed little bugs, should be squashed into previous
---
CanonicalNucleotideAtoms.py | 7 +++----
segmentmodel.py | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/CanonicalNucleotideAtoms.py b/CanonicalNucleotideAtoms.py
index e793888..8892fa3 100644
--- a/CanonicalNucleotideAtoms.py
+++ b/CanonicalNucleotideAtoms.py
@@ -39,10 +39,9 @@ class CanonicalNucleotideFactory(Group):
type_list = []
for i in range(len(tns)):
tn = tns[i]
- if tn not in atomic_types:
- type_ = ParticleType(tn.decode('UTF-8'),
- charge = d['f3'][i],
- mass = d['f4'][i])
+ type_ = ParticleType(tn.decode('UTF-8'),
+ charge = d['f3'][i],
+ mass = d['f4'][i])
p = PointParticle( type_ = type_,
position = [xs[i],ys[i],zs[i]],
name = names[i].decode('UTF-8'),
diff --git a/segmentmodel.py b/segmentmodel.py
index 3b57a50..96657b2 100644
--- a/segmentmodel.py
+++ b/segmentmodel.py
@@ -2032,7 +2032,7 @@ class SegmentModel(ArbdModel):
for s in self.strands:
s.update_atomic_orientations(orientation)
- def._write_atomic_ENM(self, prefix, lattice_type=None):
+ def _write_atomic_ENM(self, prefix, lattice_type=None):
## TODO: ensure atomic model was generated already
if lattice_type is None:
lattice_type = self.lattice_type
--
GitLab