Changeset 4377


Ignore:
Timestamp:
Mar 20, 2020 7:57:36 PM (19 months ago)
Author:
vondreele
Message:

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

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIdataGUI.py

    r4375 r4377  
    407407            dlg.Destroy()
    408408        sys.exit()
     409       
     410    if platform.python_version()[:3] == '2.7':
     411        dlg = wx.MessageDialog(None,
     412'''
     413The end-of-life for python 2.7 was January 1, 2020.
     414We strongly recommend reinstalling GSAS-II from a new installation kit as
     415we may not be able to offer support for operation of GSAS-II in python 2.7.
     416GSAS-II installation kits can be found at https://subversion.xray.aps.anl.gov/trac/pyGSAS
     417which is easily found by searching the web for GSAS-II
     418The kit will install python 3.7 and all current packages as well as the newest version of GSAS-II.''',
     419            'End-Of-Life warning for Python 2.7',wx.OK)
     420        try:
     421            dlg.ShowModal()
     422        finally:
     423            dlg.Destroy()
    409424           
    410425    application.main = GSASII(None)  # application.main is the main wx.Frame (G2frame in most places)
  • trunk/GSASIIstrMath.py

    r4370 r4377  
    16011601        if 'N' in calcControls[hfx+'histType'] and parmDict[pfx+'isMag']:       #TODO: mag math here??           
    16021602           
    1603             phasem = twopi*np.inner(HP.T,mXYZ)    #2pi(Q.r)
    1604             phasem = np.swapaxes(phasem,1,2)            #Nref,Nops,Natm
     1603            phasem = twopi*np.inner(mXYZ,HP.T).T    #2pi(Q.r)
    16051604            cosm = np.cos(phasem)
    16061605            sinm = np.sin(phasem)
Note: See TracChangeset for help on using the changeset viewer.