Changeset 4377 for trunk

Timestamp:

Mar 20, 2020 7:57:36 PM (3 years ago)

Author:

vondreele

Message:

Add end-of-life warning for python 2.7
small fix for mag str. fctr calc

Location:

trunk

Files:

• GSASIIdataGUI.py (modified) (1 diff)
• GSASIIstrMath.py (modified) (1 diff)

trunk/GSASIIdataGUI.py

@@ -407 +407 @@
             dlg.Destroy()
         sys.exit()
+        
+    if platform.python_version()[:3] == '2.7':
+        dlg = wx.MessageDialog(None,
+'''
+The end-of-life for python 2.7 was January 1, 2020. 
+We strongly recommend reinstalling GSAS-II from a new installation kit as
+we may not be able to offer support for operation of GSAS-II in python 2.7. 
+GSAS-II installation kits can be found at https://subversion.xray.aps.anl.gov/trac/pyGSAS
+which is easily found by searching the web for GSAS-II
+The kit will install python 3.7 and all current packages as well as the newest version of GSAS-II.''',
+            'End-Of-Life warning for Python 2.7',wx.OK)
+        try:
+            dlg.ShowModal()
+        finally:
+            dlg.Destroy()
             
     application.main = GSASII(None)  # application.main is the main wx.Frame (G2frame in most places)

trunk/GSASIIstrMath.py

@@ -1601 +1601 @@
         if 'N' in calcControls[hfx+'histType'] and parmDict[pfx+'isMag']:       #TODO: mag math here??            
             
-            phasem = twopi*np.inner(HP.T,mXYZ)    #2pi(Q.r)
-            phasem = np.swapaxes(phasem,1,2)            #Nref,Nops,Natm
+            phasem = twopi*np.inner(mXYZ,HP.T).T    #2pi(Q.r)
             cosm = np.cos(phasem)
             sinm = np.sin(phasem)