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 diff --git a/mrdna/model/nonbonded.py b/mrdna/model/nonbonded.py index 37d22a526aa8b58165e8ca091baefb07f65f1389..c522b905d6124f2e9e88e7e564e6ae0c15473377 100644 --- a/mrdna/model/nonbonded.py +++ b/mrdna/model/nonbonded.py @@ -1,4 +1,4 @@ -from ..arbdmodel.nonbonded import * +from ..marbdmodel.nonbonded import * from sys import stderr stderr.write("WARNING: the module 'mrdna.model.nonbonded' has been deprecated. Please change your scripts to use 'mrdna.arbdmodel.nonbonded'\n") diff --git a/mrdna/segmentmodel.py b/mrdna/segmentmodel.py index cbf037d9b4b97f22834581311d8088d44d0e9572..b0925e7479c3f8dd9fd4727a5c1ca6301b3cdd20 100644 --- a/mrdna/segmentmodel.py +++ b/mrdna/segmentmodel.py @@ -5,9 +5,14 @@ from pathlib import Path import numpy as np import random import networkx as nx -from arbdmodel import PointParticle, ParticleType, Group, ArbdModel -from arbdmodel.coords import rotationAboutAxis, quaternion_from_matrix, quaternion_to_matrix -from arbdmodel.interactions import * +try: + from arbdmodel import PointParticle, ParticleType, Group, ArbdModel + from arbdmodel.coords import rotationAboutAxis, quaternion_from_matrix, quaternion_to_matrix + from arbdmodel.interactions import * +except: + from .marbdmodel import PointParticle, ParticleType, Group, ArbdModel + from .marbdmodel.coords import rotationAboutAxis, quaternion_from_matrix, quaternion_to_matrix + from .marbdmodel.interactions import * from copy import copy, deepcopy from .model.nbPot import nbDnaScheme diff --git a/mrdna/simulate.py b/mrdna/simulate.py index 101b8b5f6c451cd375d31260b750d27bca0a835b..f2fc4fa027ad2be927dac7165ad945ca98aae788 100644 --- a/mrdna/simulate.py +++ b/mrdna/simulate.py @@ -1,6 +1,6 @@ import os import tempfile -from arbdmodel.coords import readArbdCoords, readAvgArbdCoords +from .marbdmodel.coords import readArbdCoords, readAvgArbdCoords import shutil from . import get_resource_path, DoubleStrandedSegment