Merge branch 'master' into Tests

AmpScan/core.py

@@ -341,7 +341,7 @@ class AmpObject(trimMixin, smoothMixin, analyseMixin, visMixin):
         >>> ang = [np.pi/2, -np.pi/4, np.pi/3]
         >>> amp.rotateAng(ang, ang='rad')
         """
-        if type(rot)==type([]):
+        if isinstance(rot, (tuple, list, np.ndarray)):
             R = self.rotMatrix(rot, ang)
             self.rotate(R, norms)
         else:

AmpScan/trim.py

@@ -30,6 +30,7 @@ class trimMixin(object):
         >>> amp.planarTrim(100, 2)
 
         """
+        if isinstance(height, float) and isinstance(plane, int):
             # planar values for each vert on face 
             fv = self.vert[self.faces, plane]
             # Number points on each face are above cut plane
@@ -49,3 +50,5 @@ class trimMixin(object):
             self.faces = vInd[self.faces]
             self.vert = self.vert[~delv, :]
             self.calcStruct()
+        else:
+            raise TypeError("height arg must be a float and plane arg must be an int")
\ No newline at end of file