Author: bugman
Date: Fri Mar 2 07:06:11 2007
New Revision: 3072
URL: http://svn.gna.org/viewcvs/relax?rev=3072&view=rev
Log:
Added import statements for the RelaxError and RelaxWarning systems to all
the generic_fns modules.
Modified:
branches/error_import/generic_fns/angles.py
branches/error_import/generic_fns/dasha.py
branches/error_import/generic_fns/diffusion_tensor.py
branches/error_import/generic_fns/eliminate.py
branches/error_import/generic_fns/fix.py
branches/error_import/generic_fns/grace.py
branches/error_import/generic_fns/minimise.py
branches/error_import/generic_fns/model_selection.py
branches/error_import/generic_fns/molmol.py
branches/error_import/generic_fns/monte_carlo.py
branches/error_import/generic_fns/nuclei.py
branches/error_import/generic_fns/palmer.py
branches/error_import/generic_fns/pymol.py
branches/error_import/generic_fns/results.py
branches/error_import/generic_fns/runs.py
branches/error_import/generic_fns/selection.py
branches/error_import/generic_fns/sequence.py
branches/error_import/generic_fns/value.py
branches/error_import/generic_fns/vmd.py
Modified: branches/error_import/generic_fns/angles.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/generic_fns/angles.py?rev=3072&r1=3071&r2=3072&view=diff
==============================================================================
--- branches/error_import/generic_fns/angles.py (original)
+++ branches/error_import/generic_fns/angles.py Fri Mar 2 07:06:11 2007
@@ -22,6 +22,8 @@
from math import acos, pi, sin
from Numeric import dot
+
+from relax_errors import RelaxError, RelaxNoPdbError, RelaxNoRunError,
RelaxNoSequenceError, RelaxNoTensorError
class Angles:
Modified: branches/error_import/generic_fns/dasha.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/generic_fns/dasha.py?rev=3072&r1=3071&r2=3072&view=diff
==============================================================================
--- branches/error_import/generic_fns/dasha.py (original)
+++ branches/error_import/generic_fns/dasha.py Fri Mar 2 07:06:11 2007
@@ -25,6 +25,8 @@
from re import match, search
from string import lower, split
import sys
+
+from relax_errors import RelaxDirError, RelaxError, RelaxFileError,
RelaxNoPdbError, RelaxNoRunError, RelaxNoSequenceError, RelaxNoTensorError,
RelaxNucleusError
class Dasha:
Modified: branches/error_import/generic_fns/diffusion_tensor.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/generic_fns/diffusion_tensor.py?rev=3072&r1=3071&r2=3072&view=diff
==============================================================================
--- branches/error_import/generic_fns/diffusion_tensor.py (original)
+++ branches/error_import/generic_fns/diffusion_tensor.py Fri Mar 2 07:06:11
2007
@@ -24,6 +24,8 @@
from math import cos, pi, sin
from Numeric import Float64, array, dot, identity, transpose, zeros
from re import search
+
+from relax_errors import RelaxError, RelaxNoRunError, RelaxNoTensorError,
RelaxTensorError, RelaxUnknownParamCombError, RelaxUnknownParamError
def calc_Diso(tm):
Modified: branches/error_import/generic_fns/eliminate.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/generic_fns/eliminate.py?rev=3072&r1=3071&r2=3072&view=diff
==============================================================================
--- branches/error_import/generic_fns/eliminate.py (original)
+++ branches/error_import/generic_fns/eliminate.py Fri Mar 2 07:06:11 2007
@@ -21,6 +21,8 @@
###############################################################################
from copy import deepcopy
+
+from relax_errors import RelaxError, RelaxNoRunError
class Eliminate:
Modified: branches/error_import/generic_fns/fix.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/generic_fns/fix.py?rev=3072&r1=3071&r2=3072&view=diff
==============================================================================
--- branches/error_import/generic_fns/fix.py (original)
+++ branches/error_import/generic_fns/fix.py Fri Mar 2 07:06:11 2007
@@ -21,6 +21,9 @@
###############################################################################
from re import match
+
+from relax_errors import RelaxError, RelaxNoRunError, RelaxNoSequenceError,
RelaxNoTensorError
+
class Fix:
def __init__(self, relax):
Modified: branches/error_import/generic_fns/grace.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/generic_fns/grace.py?rev=3072&r1=3071&r2=3072&view=diff
==============================================================================
--- branches/error_import/generic_fns/grace.py (original)
+++ branches/error_import/generic_fns/grace.py Fri Mar 2 07:06:11 2007
@@ -22,6 +22,8 @@
from os import system
from re import match
+
+from relax_errors import RelaxError, RelaxNoRunError, RelaxNoSequenceError,
RelaxNoSimError, RelaxRegExpError
class Grace:
Modified: branches/error_import/generic_fns/minimise.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/generic_fns/minimise.py?rev=3072&r1=3071&r2=3072&view=diff
==============================================================================
--- branches/error_import/generic_fns/minimise.py (original)
+++ branches/error_import/generic_fns/minimise.py Fri Mar 2 07:06:11 2007
@@ -25,6 +25,7 @@
from re import search
#from processes import RelaxPopen3
+from relax_errors import RelaxError, RelaxNoRunError
from thread_classes import RelaxParentThread, RelaxThread
Modified: branches/error_import/generic_fns/model_selection.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/generic_fns/model_selection.py?rev=3072&r1=3071&r2=3072&view=diff
==============================================================================
--- branches/error_import/generic_fns/model_selection.py (original)
+++ branches/error_import/generic_fns/model_selection.py Fri Mar 2 07:06:11
2007
@@ -22,6 +22,8 @@
from copy import deepcopy
from math import log
+
+from relax_errors import RelaxDiffSeqError, RelaxError, RelaxNoRunError,
RelaxNoSequenceError
class Model_selection:
Modified: branches/error_import/generic_fns/molmol.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/generic_fns/molmol.py?rev=3072&r1=3071&r2=3072&view=diff
==============================================================================
--- branches/error_import/generic_fns/molmol.py (original)
+++ branches/error_import/generic_fns/molmol.py Fri Mar 2 07:06:11 2007
@@ -22,6 +22,8 @@
from os import popen
from string import split
+
+from relax_errors import RelaxError, RelaxNoRunError, RelaxNoSequenceError
class Molmol:
Modified: branches/error_import/generic_fns/monte_carlo.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/generic_fns/monte_carlo.py?rev=3072&r1=3071&r2=3072&view=diff
==============================================================================
--- branches/error_import/generic_fns/monte_carlo.py (original)
+++ branches/error_import/generic_fns/monte_carlo.py Fri Mar 2 07:06:11 2007
@@ -24,6 +24,8 @@
from math import sqrt
from Numeric import ones
from random import gauss
+
+from relax_errors import RelaxError, RelaxNoRunError, RelaxNoSequenceError
class Monte_carlo:
Modified: branches/error_import/generic_fns/nuclei.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/generic_fns/nuclei.py?rev=3072&r1=3071&r2=3072&view=diff
==============================================================================
--- branches/error_import/generic_fns/nuclei.py (original)
+++ branches/error_import/generic_fns/nuclei.py Fri Mar 2 07:06:11 2007
@@ -21,6 +21,8 @@
###############################################################################
from re import match
+
+from relax_errors import RelaxInvalidError
class Nuclei:
Modified: branches/error_import/generic_fns/palmer.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/generic_fns/palmer.py?rev=3072&r1=3071&r2=3072&view=diff
==============================================================================
--- branches/error_import/generic_fns/palmer.py (original)
+++ branches/error_import/generic_fns/palmer.py Fri Mar 2 07:06:11 2007
@@ -30,6 +30,8 @@
from os import spawnlp
except ImportError:
pass
+
+from relax_errors import RelaxDirError, RelaxFileError,
RelaxFileOverwriteError, RelaxNoPdbError, RelaxNoRunError,
RelaxNoSequenceError, RelaxNucleusError, RelaxProgFailError
class Palmer:
Modified: branches/error_import/generic_fns/pymol.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/generic_fns/pymol.py?rev=3072&r1=3071&r2=3072&view=diff
==============================================================================
--- branches/error_import/generic_fns/pymol.py (original)
+++ branches/error_import/generic_fns/pymol.py Fri Mar 2 07:06:11 2007
@@ -22,6 +22,8 @@
from os import popen
from string import split
+
+from relax_errors import RelaxError, RelaxImplementError, RelaxNoRunError,
RelaxNoSequenceError
class Pymol:
Modified: branches/error_import/generic_fns/results.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/generic_fns/results.py?rev=3072&r1=3071&r2=3072&view=diff
==============================================================================
--- branches/error_import/generic_fns/results.py (original)
+++ branches/error_import/generic_fns/results.py Fri Mar 2 07:06:11 2007
@@ -21,6 +21,8 @@
###############################################################################
import sys
+
+from relax_errors import RelaxError, RelaxFileEmptyError, RelaxNoRunError
class Results:
Modified: branches/error_import/generic_fns/runs.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/generic_fns/runs.py?rev=3072&r1=3071&r2=3072&view=diff
==============================================================================
--- branches/error_import/generic_fns/runs.py (original)
+++ branches/error_import/generic_fns/runs.py Fri Mar 2 07:06:11 2007
@@ -21,6 +21,8 @@
###############################################################################
from copy import deepcopy
+
+from relax_errors import RelaxError, RelaxNoRunError, RelaxRunError
from specific_fns.relax_fit import C_module_exp_fn
Modified: branches/error_import/generic_fns/selection.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/generic_fns/selection.py?rev=3072&r1=3071&r2=3072&view=diff
==============================================================================
--- branches/error_import/generic_fns/selection.py (original)
+++ branches/error_import/generic_fns/selection.py Fri Mar 2 07:06:11 2007
@@ -22,6 +22,8 @@
from os import F_OK, access
from re import compile, match
+
+from relax_errors import RelaxError, RelaxNoRunError, RelaxNoSequenceError,
RelaxRegExpError
class Selection:
Modified: branches/error_import/generic_fns/sequence.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/generic_fns/sequence.py?rev=3072&r1=3071&r2=3072&view=diff
==============================================================================
--- branches/error_import/generic_fns/sequence.py (original)
+++ branches/error_import/generic_fns/sequence.py Fri Mar 2 07:06:11 2007
@@ -19,6 +19,9 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
#
#
###############################################################################
+
+
+from relax_errors import RelaxError, RelaxFileEmptyError,
RelaxNoPdbChainError, RelaxNoRunError, RelaxNoSequenceError,
RelaxSequenceError
class Sequence:
Modified: branches/error_import/generic_fns/value.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/generic_fns/value.py?rev=3072&r1=3071&r2=3072&view=diff
==============================================================================
--- branches/error_import/generic_fns/value.py (original)
+++ branches/error_import/generic_fns/value.py Fri Mar 2 07:06:11 2007
@@ -25,6 +25,8 @@
from re import compile, match
import sys
+from relax_errors import RelaxError, RelaxFileEmptyError, RelaxNoResError,
RelaxNoRunError, RelaxNoSequenceError, RelaxRegExpError,
RelaxUnknownParamError, RelaxValueError
+
class Value:
def __init__(self, relax):
Modified: branches/error_import/generic_fns/vmd.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/generic_fns/vmd.py?rev=3072&r1=3071&r2=3072&view=diff
==============================================================================
--- branches/error_import/generic_fns/vmd.py (original)
+++ branches/error_import/generic_fns/vmd.py Fri Mar 2 07:06:11 2007
@@ -21,6 +21,8 @@
###############################################################################
from Scientific.Visualization import VMD
+
+from relax_errors import RelaxNoPdbError
class Vmd:
r3072 - /branches/error_import/generic_fns/