diff --git a/mrdna/model/CanonicalNucleotideAtoms.py b/mrdna/model/CanonicalNucleotideAtoms.py index 4cade46478ef149f71fdb78fabc6e15499d3544b..fa28af0b9fb2240b18b9d4bf2304c9e6dec06e74 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 8219ed633b23f07b79959f0bb812f2a772a91eaf..3d6543cf9bcebfa467bca4c1559fe01fa18783c4 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 1e71f1dfd52f50d0aa6a87e5944af9ba37b8d128..85572a8487541727f16dfd733e3bb6ae765ea5d8 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