From 97a41dd1080011162990fd2033c304b9a5119b8b Mon Sep 17 00:00:00 2001
From: pinyili2 <pinyili2@illinois.edu>
Date: Wed, 2 Oct 2024 11:19:52 -0500
Subject: [PATCH] a
---
mrdna/model/CanonicalNucleotideAtoms.py | 8 ++++++--
mrdna/model/arbdmodel.py | 2 +-
mrdna/model/nbPot.py | 6 ++++--
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/mrdna/model/CanonicalNucleotideAtoms.py b/mrdna/model/CanonicalNucleotideAtoms.py
index 4cade46..fa28af0 100644
--- a/mrdna/model/CanonicalNucleotideAtoms.py
+++ b/mrdna/model/CanonicalNucleotideAtoms.py
@@ -1,8 +1,12 @@
import json
import numpy as np
import copy
-from arbdmodel.coords import rotationAboutAxis
-from arbdmodel import Group, PointParticle, ParticleType
+try:
+ from arbdmodel.coords import rotationAboutAxis
+ from arbdmodel import Group, PointParticle, ParticleType
+except:
+ from ..marbdmodel.coords import rotationAboutAxis
+ from ..marbdmodel import Group, PointParticle, ParticleType
from .. import get_resource_path
seqComplement = dict(A='T',G='C')
diff --git a/mrdna/model/arbdmodel.py b/mrdna/model/arbdmodel.py
index 8219ed6..3d6543c 100644
--- a/mrdna/model/arbdmodel.py
+++ b/mrdna/model/arbdmodel.py
@@ -1,4 +1,4 @@
-from ..arbdmodel import *
+from ..marbdmodel import *
from sys import stderr
stderr.write("WARNING: the module 'mrdna.model.arbdmodel' has been deprecated. Please change your scripts to use 'mrdna.arbdmodel'\n")
diff --git a/mrdna/model/nbPot.py b/mrdna/model/nbPot.py
index 1e71f1d..85572a8 100644
--- a/mrdna/model/nbPot.py
+++ b/mrdna/model/nbPot.py
@@ -2,8 +2,10 @@ import numpy as np
import scipy.optimize as opt
from scipy.interpolate import interp1d
from scipy.signal import savgol_filter as savgol
-
-from arbdmodel.interactions import NonbondedScheme
+try:
+ from arbdmodel.interactions import NonbondedScheme
+except:
+ from ..marbdmodel.interactions import NonbondedScheme
from .. import get_resource_path
from ..config import CACHE_DIR
--
GitLab