fixes to exceptHook & fixes to deformation stuff.

Author: vondreele

GSASII/GSASIIpath.py

@@ -1135,8 +1135,10 @@ def exceptHook(*args):
     import IPython.core
     savehook = sys.excepthook # save the exception hook
     # show the error location
-    tb_formatter = IPython.core.ultratb.FormattedTB()
-    #tb_formatter = IPython.core.ultratb.ListTB() # better for windows?
+    if sys.platform == "win32":
+        tb_formatter = IPython.core.ultratb.ListTB() # better for windows?
+    else:
+        tb_formatter = IPython.core.ultratb.FormattedTB()
     print() # blank line
     print(tb_formatter.text(*args,-1),end='') # show only last routine
     # get the Ipython shell routine
@@ -1146,12 +1148,11 @@ def exceptHook(*args):
         ipshell = IPython.terminal.embed.InteractiveShellEmbed()
     # traceback display routines
     def TB(): print(IPython.core.ultratb.FormattedTB().text(*args))
-    def vTB(): print(IPython.core.ultratb.VerboseTB().text(*args))
+    def vTB(): print(IPython.core.ultratb.VerboseTB().text(*args,-1))
     def bwTB(): print(IPython.core.ultratb.ListTB().text(*args)) # uncolored
     try:     # get to the right frame
         import inspect
-        frame = inspect.getinnerframes(args[2])[-1][0]
-        import copy
+        frame = inspect.getinnerframes(args[2])[-2][0]
         locals = frame.f_locals  # add traceback commands to shell namespace
         locals['TB'] = TB
         locals['vTB'] = vTB

GSASII/GSASIIplot.py

@@ -7364,12 +7364,12 @@ def Draw(caller='',Fade=[],NPkey=False):
                             SHC = {item.replace('D','C'):SHC[item] for item in SHC if item not in ['Ne','kappa']}
                             SGC = G2lat.CrysM2CartM(Amat,Bmat,SGM)
                             UVMat = np.inner(defCtrls['UVmat'],SGC)
-                            Npsi,Ngam = 91,46 
+                            Npsi,Ngam = 90,45 
                             PSI,GAM = np.mgrid[0:Npsi,0:Ngam]   #[azm,pol]
-                            PSI = PSI.flatten()*360./(Npsi-1)  #azimuth 0-360 incl
-                            GAM = GAM.flatten()*180./(Ngam-1)  #polar 0-180 incl
+                            PSI = PSI.flatten()*360./Npsi  #azimuth 0-360 incl
+                            GAM = GAM.flatten()*180./Ngam  #polar 0-180 incl
                             Rp,PSIp,GAMp = G2mth.RotPolbyM(np.ones_like(PSI),PSI,GAM,UVMat) #TODO: needs symmetry operation for equiv. positions
-                            P = G2lat.SHarmcal(SytSym,SHC,PSIp,GAMp).reshape((Npsi,Ngam))
+                            P = G2lat.SHarmcal(SytSym,SHC,PSIp,GAMp).reshape((Npsi,Ngam-1))
                             if np.min(P) < np.max(P):
                                 P = (P-np.min(P))/(np.max(P)-np.min(P))
                             RenderTextureSphere(x,y,z,radius,atcolor,shape=[Npsi,Ngam],Texture=P.T,ifFade=False)