Changeset 2532


Ignore:
Timestamp:
Nov 17, 2016 2:43:50 PM (5 years ago)
Author:
vondreele
Message:

clean up display of version info. etc. on console.

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASII.py

    r2531 r2532  
    39893989            except:
    39903990                pass
    3991         self.main.PackageVersions.append([' Platform',sys.platform+' '+platform.architecture()[0]+' '+platform.machine()])
     3991        self.main.PackageVersions.append(['Platform',sys.platform+' '+platform.architecture()[0]+' '+platform.machine()])
    39923992       
    39933993        return True
     
    40194019    # print versions
    40204020    print "Python module versions loaded:"
    4021     print "python:     ",sys.version.split()[0]
    4022     print "wxpython:   ",wx.__version__
    4023     print "matplotlib: ",mpl.__version__
    4024     print "numpy:      ",np.__version__
    4025     print "scipy:      ",sp.__version__
    4026     print "OpenGL:     ",ogl.__version__
     4021    print "  Python:     ",sys.version.split()[0]
     4022    print "  wx:         ",wx.__version__
     4023    print "  matplotlib: ",mpl.__version__
     4024    print "  numpy:      ",np.__version__
     4025    print "  scipy:      ",sp.__version__
     4026    print "  OpenGL:     ",ogl.__version__
    40274027    try:
    40284028        from PIL import Image
     
    40324032        except:
    40334033            version = Image.VERSION
    4034         print "pillow:     ",version
     4034        print "  PIL.Image:  ",version
    40354035    except ImportError:
    40364036        try:
     
    40394039        except ImportError:
    40404040            print "Image module not present; Note that PIL (Python Imaging Library) or pillow is needed for some image operations"
     4041    import platform
     4042    print "  Platform:   ",sys.platform,platform.architecture()[0],platform.machine()
    40414043    try:
    40424044        import mkl
    4043         print "Max threads ",mkl.get_max_threads()
     4045        print "  Max threads:",mkl.get_max_threads()
    40444046    except:
    40454047        pass
    4046     import platform
    4047     print "Platform info:",sys.platform,platform.architecture()[0],platform.machine()
    40484048    #print "wxPython description",wx.PlatformInfo
    4049     print "This is GSAS-II version:     ",__version__,' revision #'+str(GSASIIpath.GetVersionNumber())
     4049    print "This is GSAS-II revision "+str(GSASIIpath.GetVersionNumber())+'\n'
    40504050    GSASIIpath.InvokeDebugOpts()
    40514051    main() # start the GUI
  • trunk/GSASIIIO.py

    r2530 r2532  
    781781                    if 'dict' in str(type(datum[1]['PythonVersions'])):  #patch
    782782                        for p in sorted(datum[1]['PythonVersions'],key=lambda s: s.lower()):
    783                             print("  {:>14s}: {:s}".format(p[0],p[1]))
     783                            print("  {:<14s}: {:s}".format(p[0],p[1]))
    784784                    else:
    785785                        for p in datum[1]['PythonVersions']:
    786                             print("  {:>12s} {:s}".format(p[0]+':',p[1]))
     786                            print("  {:<12s} {:s}".format(p[0]+':',p[1]))
    787787            for datus in data[1:]:
    788788                sub = G2frame.PatternTree.AppendItem(Id,datus[0])
     
    803803        file.close()
    804804        if LastSavedUsing:
    805             print('GPX load successful. Last saved with GSAS-II version '+LastSavedUsing)
     805            print('GPX load successful. Last saved with GSAS-II revision '+LastSavedUsing)
    806806        else:
    807807            print('project load successful')
  • trunk/testDeriv.py

    r2508 r2532  
    102102                self.pawleyLookup = cPickle.load(file)
    103103                self.use = [False for i in range(len(self.varylist+self.depVarList))]
    104                 self.delt = [max(abs(self.parmDict[name])*0.001,1e-6) for name in self.varylist+self.depVarList]
     104                self.delt = [max(abs(self.parmDict[name])*0.0001,1e-6) for name in self.varylist+self.depVarList]
    105105                file.close()
    106106                groups,parmlist = G2mv.GroupConstraints(self.constrDict)
Note: See TracChangeset for help on using the changeset viewer.