diff --git a/CanonicalNucleotideAtoms.py b/CanonicalNucleotideAtoms.py index e793888d6b0bac26316167aea4de5a53ef39f99d..8892fa318f4eee82846baac23e271ae19915231a 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 3b57a50a30b788a7db6b4283ea5fa82562c6c555..96657b2630825342255a46dd29aab5359abbb86a 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