Changeset 4236


Ignore:
Timestamp:
Jan 8, 2020 9:44:02 AM (22 months ago)
Author:
vondreele
Message:

remove dependence on fullrmc existing
rearrange RMC options
fixes to RMCProfile file prep.

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIdataGUI.py

    r4223 r4236  
    29152915        self.lastSelectedPhaseTab = None # track the last tab pressed on a phase window
    29162916        self.testRBObjSizers = {}   #rigid body sizer datafile contents
    2917         self.RMCchoice = 'fullrmc'
     2917        self.RMCchoice = 'RMCProfile'
    29182918       
    29192919    def __init__(self, parent):
  • trunk/GSASIIphsGUI.py

    r4221 r4236  
    46314631        mainSizer = wx.BoxSizer(wx.VERTICAL)
    46324632        runFile = ' '
    4633         choice = ['fullrmc','RMCProfile']
     4633        choice = ['RMCProfile','fullrmc',]
    46344634        RMCsel = wx.RadioBox(G2frame.FRMC,-1,' Select RMC method:',choices=choice)
    46354635        RMCsel.SetStringSelection(G2frame.RMCchoice)
     
    1049810498        G2frame.Bind(wx.EVT_MENU, OnPeaksClear, id=G2G.wxID_PEAKSCLEAR)
    1049910499        # fullrmc
    10500         try:
    10501             import fullrmc
    10502             FillSelectPageMenu(TabSelectionIdDict, G2frame.dataWindow.FRMCMenu)
    10503             G2frame.Bind(wx.EVT_MENU, OnSetupRMC, id=G2G.wxID_SETUPRMC)
    10504             G2frame.Bind(wx.EVT_MENU, OnLoadRMC, id=G2G.wxID_LOADRMC)
    10505             G2frame.Bind(wx.EVT_MENU, OnSaveRMC, id=G2G.wxID_SAVERMC)
    10506             G2frame.Bind(wx.EVT_MENU, OnRunRMC, id=G2G.wxID_RUNRMC)
    10507             G2frame.Bind(wx.EVT_MENU, OnViewRMC, id=G2G.wxID_VIEWRMC)
    10508         except:
    10509             pass
     10500        FillSelectPageMenu(TabSelectionIdDict, G2frame.dataWindow.FRMCMenu)
     10501        G2frame.Bind(wx.EVT_MENU, OnSetupRMC, id=G2G.wxID_SETUPRMC)
     10502        G2frame.Bind(wx.EVT_MENU, OnLoadRMC, id=G2G.wxID_LOADRMC)
     10503        G2frame.Bind(wx.EVT_MENU, OnSaveRMC, id=G2G.wxID_SAVERMC)
     10504        G2frame.Bind(wx.EVT_MENU, OnRunRMC, id=G2G.wxID_RUNRMC)
     10505        G2frame.Bind(wx.EVT_MENU, OnViewRMC, id=G2G.wxID_VIEWRMC)
    1051010506        # MC/SA
    1051110507        FillSelectPageMenu(TabSelectionIdDict, G2frame.dataWindow.MCSAMenu)
     
    1059910595        G2frame.phaseDisplay.AddPage(G2frame.MCSA,'MC/SA')
    1060010596        Pages.append('MC/SA')
    10601         try:
    10602             import fullrmc
    10603             G2frame.FRMC = wx.ScrolledWindow(G2frame.phaseDisplay)
    10604             G2frame.phaseDisplay.AddPage(G2frame.FRMC,'RMC')
    10605             Pages.append('RMC')
    10606         except:
    10607             pass
     10597        G2frame.FRMC = wx.ScrolledWindow(G2frame.phaseDisplay)
     10598        G2frame.phaseDisplay.AddPage(G2frame.FRMC,'RMC')
     10599        Pages.append('RMC')
    1060810600    Texture = wx.ScrolledWindow(G2frame.phaseDisplay)
    1060910601    G2frame.phaseDisplay.AddPage(Texture,'Texture')
  • trunk/GSASIIplot.py

    r4229 r4236  
    28552855        elif plottype in ['SASD','REFD']:
    28562856            Page.Choice = [' key press',
    2857                 'b: toggle subtract background file','n: toggle semilog/loglog',
    2858                 'g: toggle grid','q: toggle S(q) plot','m: toggle multidata plot',
    2859                 'w: toggle (Io-Ic)/sig plot','+: toggle selection',]
     2857                'b: toggle subtract background file','g: toggle grid',
     2858                'm: toggle multidata plot','n: toggle semilog/loglog',
     2859                'q: toggle S(q) plot','w: toggle (Io-Ic)/sig plot','+: toggle selection',]
    28602860            if not G2frame.SinglePlot:
    28612861                Page.Choice = Page.Choice+ \
  • trunk/GSASIIpwd.py

    r4221 r4236  
    21952195    fl.write('Number of each atom type:       %s\n'%'  '.join(NAstr))
    21962196    fl.write('Number of atoms:                %d\n'%len(Atoms))
    2197     fl.write('%-35s%3d%3d%3d\n'%('Supercell dimensions:',Supercell[0],Supercell[1],Supercell[2]))
     2197    fl.write('%-35s%4d%4d%4d\n'%('Supercell dimensions:',Supercell[0],Supercell[1],Supercell[2]))
    21982198    fl.write('Cell (Ang/deg): %12.6f%12.6f%12.6f%12.6f%12.6f%12.6f\n'%(
    21992199            Cell[0],Cell[1],Cell[2],Cell[3],Cell[4],Cell[5]))
Note: See TracChangeset for help on using the changeset viewer.