Changeset 4236

Timestamp:

Jan 8, 2020 9:44:02 AM (3 years ago)

Author:

vondreele

Message:

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

Location:

trunk

Files:

• GSASIIdataGUI.py (modified) (1 diff)
• GSASIIphsGUI.py (modified) (3 diffs)
• GSASIIplot.py (modified) (1 diff)
• GSASIIpwd.py (modified) (1 diff)

trunk/GSASIIdataGUI.py

@@ -2915 +2915 @@
         self.lastSelectedPhaseTab = None # track the last tab pressed on a phase window
         self.testRBObjSizers = {}   #rigid body sizer datafile contents
-        self.RMCchoice = 'fullrmc' 
+        self.RMCchoice = 'RMCProfile' 
         
     def __init__(self, parent):

trunk/GSASIIphsGUI.py

@@ -4631 +4631 @@
         mainSizer = wx.BoxSizer(wx.VERTICAL)
         runFile = ' '
-        choice = ['fullrmc','RMCProfile']
+        choice = ['RMCProfile','fullrmc',]
         RMCsel = wx.RadioBox(G2frame.FRMC,-1,' Select RMC method:',choices=choice)
         RMCsel.SetStringSelection(G2frame.RMCchoice)
@@ -10498 +10498 @@
         G2frame.Bind(wx.EVT_MENU, OnPeaksClear, id=G2G.wxID_PEAKSCLEAR)
         # fullrmc
-        try:
-            import fullrmc
-            FillSelectPageMenu(TabSelectionIdDict, G2frame.dataWindow.FRMCMenu)
-            G2frame.Bind(wx.EVT_MENU, OnSetupRMC, id=G2G.wxID_SETUPRMC)
-            G2frame.Bind(wx.EVT_MENU, OnLoadRMC, id=G2G.wxID_LOADRMC)
-            G2frame.Bind(wx.EVT_MENU, OnSaveRMC, id=G2G.wxID_SAVERMC)
-            G2frame.Bind(wx.EVT_MENU, OnRunRMC, id=G2G.wxID_RUNRMC)
-            G2frame.Bind(wx.EVT_MENU, OnViewRMC, id=G2G.wxID_VIEWRMC)
-        except:
-            pass
+        FillSelectPageMenu(TabSelectionIdDict, G2frame.dataWindow.FRMCMenu)
+        G2frame.Bind(wx.EVT_MENU, OnSetupRMC, id=G2G.wxID_SETUPRMC)
+        G2frame.Bind(wx.EVT_MENU, OnLoadRMC, id=G2G.wxID_LOADRMC)
+        G2frame.Bind(wx.EVT_MENU, OnSaveRMC, id=G2G.wxID_SAVERMC)
+        G2frame.Bind(wx.EVT_MENU, OnRunRMC, id=G2G.wxID_RUNRMC)
+        G2frame.Bind(wx.EVT_MENU, OnViewRMC, id=G2G.wxID_VIEWRMC)
         # MC/SA
         FillSelectPageMenu(TabSelectionIdDict, G2frame.dataWindow.MCSAMenu)
@@ -10599 +10595 @@
         G2frame.phaseDisplay.AddPage(G2frame.MCSA,'MC/SA')
         Pages.append('MC/SA')
-        try:
-            import fullrmc
-            G2frame.FRMC = wx.ScrolledWindow(G2frame.phaseDisplay)
-            G2frame.phaseDisplay.AddPage(G2frame.FRMC,'RMC')
-            Pages.append('RMC')
-        except:
-            pass
+        G2frame.FRMC = wx.ScrolledWindow(G2frame.phaseDisplay)
+        G2frame.phaseDisplay.AddPage(G2frame.FRMC,'RMC')
+        Pages.append('RMC')
     Texture = wx.ScrolledWindow(G2frame.phaseDisplay)
     G2frame.phaseDisplay.AddPage(Texture,'Texture')

trunk/GSASIIplot.py

@@ -2855 +2855 @@
         elif plottype in ['SASD','REFD']:
             Page.Choice = [' key press',
-                'b: toggle subtract background file','n: toggle semilog/loglog',
-                'g: toggle grid','q: toggle S(q) plot','m: toggle multidata plot',
-                'w: toggle (Io-Ic)/sig plot','+: toggle selection',]
+                'b: toggle subtract background file','g: toggle grid',
+                'm: toggle multidata plot','n: toggle semilog/loglog',
+                'q: toggle S(q) plot','w: toggle (Io-Ic)/sig plot','+: toggle selection',]
             if not G2frame.SinglePlot:
                 Page.Choice = Page.Choice+ \

trunk/GSASIIpwd.py

@@ -2195 +2195 @@
     fl.write('Number of each atom type:       %s\n'%'  '.join(NAstr))
     fl.write('Number of atoms:                %d\n'%len(Atoms))
-    fl.write('%-35s%3d%3d%3d\n'%('Supercell dimensions:',Supercell[0],Supercell[1],Supercell[2]))
+    fl.write('%-35s%4d%4d%4d\n'%('Supercell dimensions:',Supercell[0],Supercell[1],Supercell[2]))
     fl.write('Cell (Ang/deg): %12.6f%12.6f%12.6f%12.6f%12.6f%12.6f\n'%(
             Cell[0],Cell[1],Cell[2],Cell[3],Cell[4],Cell[5]))