From bf1a5e7778f63f777c467d4e604938e3f5f3ca74 Mon Sep 17 00:00:00 2001 From: Daniel Hader Date: Tue, 3 Aug 2021 11:39:30 -0500 Subject: [PATCH 1/2] fixed sign error causing roll to be applied in the wrong direction --- scadnano/scadnano.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scadnano/scadnano.py b/scadnano/scadnano.py index 3f1df84e..2cc827b1 100644 --- a/scadnano/scadnano.py +++ b/scadnano/scadnano.py @@ -6646,7 +6646,7 @@ def _oxdna_get_helix_vectors(design: Design, helix: Helix) -> Tuple[_OxdnaVector forward = forward.rotate(design.yaw_of_helix(helix), normal) forward = forward.rotate(-design.pitch_of_helix(helix), _OxdnaVector(1, 0, 0)) normal = normal.rotate(-design.pitch_of_helix(helix), _OxdnaVector(1, 0, 0)) - normal = normal.rotate(helix.roll, forward) + normal = normal.rotate(-helix.roll, forward) x: float = 0.0 y: float = 0.0 From 447c9994502c3670189b62fa7f957ad03602841d Mon Sep 17 00:00:00 2001 From: Daniel Hader Date: Tue, 3 Aug 2021 11:52:29 -0500 Subject: [PATCH 2/2] fixes #188 --- scadnano/scadnano.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scadnano/scadnano.py b/scadnano/scadnano.py index 2cc827b1..7f4ffc74 100644 --- a/scadnano/scadnano.py +++ b/scadnano/scadnano.py @@ -6646,6 +6646,7 @@ def _oxdna_get_helix_vectors(design: Design, helix: Helix) -> Tuple[_OxdnaVector forward = forward.rotate(design.yaw_of_helix(helix), normal) forward = forward.rotate(-design.pitch_of_helix(helix), _OxdnaVector(1, 0, 0)) normal = normal.rotate(-design.pitch_of_helix(helix), _OxdnaVector(1, 0, 0)) + normal = normal.rotate(-helix.roll, forward) x: float = 0.0