Raise SrFitError on failed validation.

Correct few other instances of inappropriately raised AttributeError-s.

Author: pavoljuhas

diffpy/srfit/equation/equationmod.py

@@ -187,7 +187,7 @@ def swap(self, oldlit, newlit):
 
     def addLiteral(self, literal):
         """Cannot add a literal to an Equation."""
-        raise AttributeError("Cannot add literals to an Equation.")
+        raise RuntimeError("Cannot add literals to an Equation.")
 
     # Visitors can treat us differently than an Operator.
 

diffpy/srfit/fitbase/constraint.py

@@ -12,18 +12,21 @@
 # See LICENSE_DANSE.txt for license information.
 #
 ########################################################################
+
 """Constraint class.
 
 Constraints are used by a FitRecipe (and other RecipeOrganizers) to organize
 constraint equations. They store a Parameter object and an Equation object that
 is used to compute its value. The Constraint.constrain method is used to create
 this association.
-
 """
+
 __all__ = ["Constraint"]
 
+from diffpy.srfit.exceptions import SrFitError
 from diffpy.srfit.fitbase.validatable import Validatable
 
+
 class Constraint(Validatable):
     """Constraint class.
 
@@ -88,29 +91,29 @@ def _validate(self):
         This validates that par is not None.
         This validates eq.
 
-        Raises AttributeError if validation fails.
+        Raises SrFitError if validation fails.
 
         """
         if self.par is None:
-            raise AttributeError("par is None")
+            raise SrFitError("par is None")
         if self.eq is None:
-            raise AttributeError("eq is None")
+            raise SrFitError("eq is None")
         self.par._validate()
         from diffpy.srfit.equation.visitors import validate
         try:
             validate(self.eq)
         except ValueError, e:
-            raise AttributeError(e)
+            raise SrFitError(e)
 
         # Try to get the value of eq.
         try:
             val = self.eq()
             self.par.setValue(val)
         except TypeError, e:
-            raise AttributeError("eq cannot be evaluated")
+            raise SrFitError("eq cannot be evaluated")
         finally:
             if val is None:
-                raise AttributeError("eq evaluates to None")
+                raise SrFitError("eq evaluates to None")
 
         return
 

diffpy/srfit/fitbase/fitcontribution.py

@@ -12,6 +12,7 @@
 # See LICENSE_DANSE.txt for license information.
 #
 ########################################################################
+
 """FitContribution class.
 
 FitContributions generate a residual function for a FitRecipe. A
@@ -20,14 +21,15 @@
 holds the observed and calculated signals.
 
 See the examples in the documention for how to use a FitContribution.
-
 """
+
 __all__ = ["FitContribution"]
 
 from diffpy.srfit.interface import _fitcontribution_interface
 from diffpy.srfit.fitbase.parameterset import ParameterSet
 from diffpy.srfit.fitbase.recipeorganizer import equationFromString
 from diffpy.srfit.fitbase.parameter import ParameterProxy
+from diffpy.srfit.exceptions import SrFitError
 
 class FitContribution(_fitcontribution_interface, ParameterSet):
     """FitContribution class.
@@ -224,15 +226,15 @@ def setResidualEquation(self, eqstr = None):
         Keep that in mind when defining a new residual or using the built-in
         ones.
 
-        Raises AttributeError if the Profile is not yet defined.
+        Raises SrFitError if the Profile is not yet defined.
         Raises ValueError if eqstr depends on a Parameter that is not part of
         the FitContribution.
 
         """
         if self.profile is None:
-            raise AttributeError("Assign the Profile first")
+            raise SrFitError("Assign the Profile first")
         if self._eq is None:
-            raise AttributeError("Assign the Equation first")
+            raise SrFitError("Assign the Equation first")
 
         chivstr = "(eq - %s)/%s" % (self._yname, self._dyname)
         resvstr = "(eq - %s)/sum(%s**2)**0.5" % (self._yname, self._yname)
@@ -280,7 +282,7 @@ def _validate(self):
         This validates _eq.
         This validates _reseq and residual.
 
-        Raises AttributeError if validation fails.
+        Raises SrFitError if validation fails.
 
         """
         self.profile._validate()
@@ -291,30 +293,30 @@ def _validate(self):
         try:
             validate(self._eq)
         except ValueError, e:
-            raise AttributeError(e)
+            raise SrFitError(e)
         if self._eq is None:
-            raise AttributeError("_eq is None")
+            raise SrFitError("_eq is None")
 
         val = None
         try:
             val = self._eq()
         except TypeError, e:
-            raise AttributeError("_eq cannot be evaluated: %s"%e)
+            raise SrFitError("_eq cannot be evaluated: %s"%e)
 
         if val is None:
-            raise AttributeError("_eq evaluates to None")
+            raise SrFitError("_eq evaluates to None")
 
         # Try to get the value for residual
         try:
             validate(self._reseq)
         except ValueError, e:
-            raise AttributeError(e)
+            raise SrFitError(e)
         try:
             val = self.residual()
         except TypeError, e:
-            raise AttributeError("residual cannot be evaluated")
+            raise SrFitError("residual cannot be evaluated")
         if val is None:
-            raise AttributeError("residual evaluates to None")
+            raise SrFitError("residual evaluates to None")
         return
 
 # End of file

diffpy/srfit/fitbase/parameter.py

@@ -26,6 +26,7 @@
 
 from numpy import inf
 
+from diffpy.srfit.exceptions import SrFitError
 from diffpy.srfit.equation.literals import Argument
 from diffpy.srfit.equation.literals.abcs import ArgumentABC
 from diffpy.srfit.util.nameutils import validateName
@@ -127,11 +128,11 @@ def _validate(self):
 
         This validates that value is not None.
 
-        Raises AttributeError if validation fails.
+        Raises SrFitError if validation fails.
 
         """
         if self.value is None:
-            raise AttributeError("value of '%s' is None"%self.name)
+            raise SrFitError("value of '%s' is None"%self.name)
         return
 
 # End class Parameter
@@ -180,13 +181,13 @@ def _validate(self):
 
         This validates that value and par are not None.
 
-        Raises AttributeError if validation fails.
+        Raises SrFitError if validation fails.
 
         """
         if self.value is None:
-            raise AttributeError("value is None")
+            raise SrFitError("value is None")
         if self.par is None:
-            raise AttributeError("par is None")
+            raise SrFitError("par is None")
         return
 
 # End class ParameterProxy

diffpy/srfit/fitbase/profile.py

@@ -12,21 +12,23 @@
 # See LICENSE_DANSE.txt for license information.
 #
 ########################################################################
+
 """The Profile class containing the physical and calculated data.
 
 Profile holds the arrays representing an observed profile, a selected subset of
 the observed profile and a calculated profile. Profiles are used by Calculators
 to store a calculated signal, and by FitContributions to help calculate a
 residual equation.
-
 """
+
 __all__ = ["Parameter", "Profile"]
 
 import numpy
 
 from diffpy.srfit.util.observable import Observable
 from diffpy.srfit.fitbase.parameter import Parameter
 from diffpy.srfit.fitbase.validatable import Validatable
+from diffpy.srfit.exceptions import SrFitError
 
 # This is the roundoff tolerance for selecting bounds on arrays.
 epsilon = 1e-8
@@ -315,15 +317,15 @@ def _validate(self):
         This validates that x, y, dy, xobx, yobs and dyobs are not None.
         This validates that x, y, and dy are the same length.
 
-        Raises AttributeError if validation fails.
+        Raises SrFitError if validation fails.
 
         """
         datanotset = any(v is None for v in
                 [self.x, self.y, self.dy, self.xobs, self.yobs, self.dyobs])
         if datanotset:
-            raise AttributeError("Missing data")
+            raise SrFitError("Missing data")
         if len(self.x) != len(self.y) or len(self.x) != len(self.dy):
-            raise AttributeError("Data are different lengths")
+            raise SrFitError("Data are different lengths")
         return
 
 

diffpy/srfit/fitbase/profilegenerator.py

@@ -12,6 +12,7 @@
 # See LICENSE_DANSE.txt for license information.
 #
 ########################################################################
+
 """The ProfileGenerator class for generating a profile.
 
 ProfileGenerators encapsulate the evaluation and required Parameters and
@@ -38,15 +39,16 @@
 >        return a * exp(-0.5*((x-x0)/w)**2)
 
 More examples can be found in the example directory of the documentation.
-
 """
+
 __all__ = ["ProfileGenerator"]
 
 from numpy import asarray
 
 from diffpy.srfit.equation.literals.operators import Operator
-
 from diffpy.srfit.fitbase.parameterset import ParameterSet
+from diffpy.srfit.exceptions import SrFitError
+
 
 class ProfileGenerator(Operator, ParameterSet):
     """Base class for profile generators.
@@ -161,16 +163,14 @@ def _validate(self):
         This does not validate the operation, since this could be costly. The
         operation should be validated with a containing equation.
 
-        Raises AttributeError if validation fails.
+        Raises SrFitError if validation fails.
 
         """
         if self.profile is None:
-            raise AttributeError("profile is None")
+            raise SrFitError("profile is None")
         self.profile._validate()
         ParameterSet._validate(self)
-
         return
 
 
-
 # End class ProfileGenerator

diffpy/srfit/fitbase/restraint.py

@@ -12,19 +12,22 @@
 # See LICENSE_DANSE.txt for license information.
 #
 ########################################################################
+
 """Restraints class.
 
 Restraints are used by RecipeOrganizers to organize restraint equations.
 Restraints store an Equation, bounds on its value, and the form of the penalty
 function for breaking a restraint. This penalty is added to the residual
 equation calculated by a FitRecipe.
-
 """
+
 __all__ = ["Restraint"]
 
 from numpy import inf
 
 from diffpy.srfit.fitbase.validatable import Validatable
+from diffpy.srfit.exceptions import SrFitError
+
 
 class Restraint(Validatable):
     """Restraint class.
@@ -90,25 +93,25 @@ def _validate(self):
 
         This validates eq.
 
-        Raises AttributeError if validation fails.
+        Raises SrFitError if validation fails.
 
         """
         if self.eq is None:
-            raise AttributeError("eq is None")
+            raise SrFitError("eq is None")
         from diffpy.srfit.equation.visitors import validate
         try:
             validate(self.eq)
         except ValueError, e:
-            raise AttributeError(e)
+            raise SrFitError(e)
 
         # Try to get the value of eq.
         try:
             val = self.eq()
         except TypeError, e:
-            raise AttributeError("eq cannot be evaluated")
+            raise SrFitError("eq cannot be evaluated")
         finally:
             if val is None:
-                raise AttributeError("eq evaluates to None")
+                raise SrFitError("eq evaluates to None")
 
         return
 

diffpy/srfit/pdf/basepdfgenerator.py

@@ -12,19 +12,21 @@
 # See LICENSE_DANSE.txt for license information.
 #
 ########################################################################
+
 """PDF profile generator base class.
 
 The BasePDFGenerator class interfaces with SrReal PDF calculators and is used
 as a base for the PDFGenerator and DebyePDFGenerator classes.
-
 """
+
 __all__ = ["BasePDFGenerator"]
 
 import numpy
 
 from diffpy.srfit.fitbase import ProfileGenerator
 from diffpy.srfit.fitbase.parameter import ParameterAdapter
 from diffpy.srfit.structure import struToParameterSet
+from diffpy.srfit.exceptions import SrFitError
 
 
 # FIXME - Parameter creation will have to be smarter once deeper calculator
@@ -266,13 +268,13 @@ def _validate(self):
         This validates that the phase is not None.
         This performs ProfileGenerator validations.
 
-        Raises AttributeError if validation fails.
+        Raises SrFitError if validation fails.
 
         """
         if self._calc is None:
-            raise AttributeError("_calc is None")
+            raise SrFitError("_calc is None")
         if self._phase is None:
-            raise AttributeError("_phase is None")
+            raise SrFitError("_phase is None")
         ProfileGenerator._validate(self)
         return
 

diffpy/srfit/pdf/pdfparser.py

@@ -178,7 +178,7 @@ def parseString(self, patstring):
         inf_or_nan = re.compile('(?i)^[+-]?(NaN|Inf)\\b')
         has_drobs = True
         has_dGobs = True
-        # raise PDFDataFormatError if something goes wrong
+        # raise ParseError if something goes wrong
         robs = []
         Gobs = []
         drobs = []