Changeset 1813 for trunk

Timestamp:

Apr 27, 2015 4:55:12 PM (10 years ago)

Author:

vondreele

Message:

revise GSAS-II exception handling - traps user aborts & I hope the bad metric tensor error

Location:

trunk

Files:

• GSASIIobj.py (modified) (1 diff)
• GSASIIstrIO.py (modified) (1 diff)
• GSASIIstrMain.py (modified) (2 diffs)
• GSASIIstrMath.py (modified) (2 diffs)

trunk/GSASIIobj.py ¶

@@ -2007 +2007 @@
             val = np.sum(val)
         return val
+        
+class G2Exception(Exception):
+    def __init__(self,msg):
+        self.msg = msg
+    def __str__(self):
+        return repr(self.msg)
 
 

trunk/GSASIIstrIO.py ¶

@@ -1318 +1318 @@
     except KeyError:
         sigA = [0,0,0,0,0,0]
-
+    if np.any(np.diag(G2lat.A2Gmat(A,False))) < 0.:
+        raise G2obj.G2Exception('Negative g-tensor')
     return A,sigA
         

trunk/GSASIIstrMain.py ¶

@@ -211 +211 @@
         print ' Refinement results are in file: '+ospath.splitext(GPXfile)[0]+'.lst'
         print ' ***** Refinement successful *****'
-    except G2stMth.UserAbort:
+    except G2obj.G2Exception,Msg:
         printFile.close()
-        return False,'Refinement aborted by user'
+        return False,Msg.msg
     
 #for testing purposes!!!
@@ -425 +425 @@
                         newparm = ':'.join(items)
                         NewparmDict[newparm] = parmDict[parm]
-        except G2stMth.UserAbort:
+        except G2obj.G2Exception,Msg:
             printFile.close()
             print ' ***** Refinement aborted *****'
-            return False,' Refinement aborted by user'
+            return False,Msg.msg
     G2stIO.SetSeqResult(GPXfile,Histograms,SeqResult)
     printFile.close()

trunk/GSASIIstrMath.py ¶

@@ -27 +27 @@
 import GSASIImapvars as G2mv
 import GSASIImath as G2mth
+import GSASIIobj as G2obj
 
 sind = lambda x: np.sin(x*np.pi/180.)
@@ -2801 +2802 @@
             parmDict['saved values'] = values
             dlg.Destroy()
-            raise UserAbort('User abort')         #Abort!!
+            raise G2obj.G2Exception('User abort')         #Abort!!
     pDict,pVals,pWt,pWsum = penaltyFxn(HistoPhases,calcControls,parmDict,varylist)
     if len(pVals):