Changeset 1390 for trunk/GSASII.py


Ignore:
Timestamp:
Jun 20, 2014 11:15:24 AM (8 years ago)
Author:
toby
Message:

revise start, sort out phase fraction vs scale factor label, add configurable label for columns in sequential refinements. Note: the dict (variableLabels) is not saved yet when a seq. refinement is repeated.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASII.py

    r1386 r1390  
    7878wxInspector = False
    7979
    80 # print versions
    81 print "Python module versions loaded:"
    82 print "python:     ",sys.version[:5]
    83 print "wxpython:   ",wx.__version__
    84 print "matplotlib: ",mpl.__version__
    85 print "numpy:      ",np.__version__
    86 print "scipy:      ",sp.__version__
    87 print "OpenGL:     ",ogl.__version__
    88 try:
    89     import mkl
    90     print "Max threads ",mkl.get_max_threads()
    91 except:
    92     pass
    93 #    print "MKL module not present"
    9480__version__ = '0.2.0'
    9581G2gd.__version__ = __version__
    96 print "This is GSAS-II version:     ",__version__,' revision '+str(GSASIIpath.GetVersionNumber())
     82
     83# PATCH: for Mavericks (OS X 10.9.x), wx produces an annoying warning about LucidaGrandeUI.
     84# In case stderr has been suppressed there, redirect python error output to stdout. Nobody
     85# else should care much about this.
     86sys.stderr = sys.stdout
    9787
    9888# useful degree trig functions
     
    33883378   
    33893379if __name__ == '__main__':
     3380    # print versions
     3381    print "Python module versions loaded:"
     3382    print "python:     ",sys.version[:5]
     3383    print "wxpython:   ",wx.__version__
     3384    print "matplotlib: ",mpl.__version__
     3385    print "numpy:      ",np.__version__
     3386    print "scipy:      ",sp.__version__
     3387    print "OpenGL:     ",ogl.__version__
     3388    try:
     3389        import Image
     3390        print "Image (PIL):",Image.VERSION
     3391    except ImportError:
     3392        print "Image module not present; Note that PIL (Python Imaging Library) is needed for some image formats."
     3393    try:
     3394        import mkl
     3395        print "Max threads ",mkl.get_max_threads()
     3396    except:
     3397        pass
     3398    print "This is GSAS-II version:     ",__version__,' revision '+str(GSASIIpath.GetVersionNumber())
    33903399    main() # start the GUI
Note: See TracChangeset for help on using the changeset viewer.