Changeset 5029

Timestamp:

Sep 22, 2021 5:26:46 PM (18 months ago)

Author:

vondreele

Message:

upper limit on crystallite size = 10 (it was 4)
consolidate import subprocess as subp (remove the extra imports)
minor change to MakeInst? for bug in RMCProfile 6.7.9

Location:

trunk

Files:

• GSASIIddataGUI.py (modified) (2 diffs)
• GSASIIphsGUI.py (modified) (4 diffs)
• GSASIIpwd.py (modified) (1 diff)

trunk/GSASIIddataGUI.py

@@ -957 +957 @@
                 isoSizer.Add(ResetSizer('isotropic',OnResetSize),0,WACV)
                 bottomSizer.Add(isoSizer)
-                bottomSizer.Add(IsoSizer(u'size(\xb5m): ','Size',(10,4),[0.,4.],OnSizeRef),0,wx.BOTTOM,5)
+                bottomSizer.Add(IsoSizer(u'size(\xb5m): ','Size',(10,4),[0.,10.],OnSizeRef),0,wx.BOTTOM,5)
             elif UseList[G2frame.hist]['Size'][0] == 'uniaxial':
                 uniSizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -966 +966 @@
                 bottomSizer.Add(UniSizer('Size',OnSizeAxis),0)
                 bottomSizer.Add(uniSizer)
-                bottomSizer.Add(UniDataSizer(u'size(\xb5m): ','Size',(10,3),[0.,4.],OnSizeRef),0,wx.BOTTOM,5)
+                bottomSizer.Add(UniDataSizer(u'size(\xb5m): ','Size',(10,3),[0.,10.],OnSizeRef),0,wx.BOTTOM,5)
             elif UseList[G2frame.hist]['Size'][0] == 'ellipsoidal':
                 ellSizer = wx.BoxSizer(wx.HORIZONTAL)

trunk/GSASIIphsGUI.py

@@ -5843 +5843 @@
                     break
                 ilog += 1
-            import subprocess as sb
             if sys.platform.lower().startswith('win'):
                 batch = open('fullrmc.bat','w')
@@ -5850 +5849 @@
                 batch.write('pause')
                 batch.close()
-                sb.Popen('fullrmc.bat',creationflags=sb.CREATE_NEW_CONSOLE)
+                subp.Popen('fullrmc.bat',creationflags=subp.CREATE_NEW_CONSOLE)
             else:
                 batch = open('fullrmc.sh','w')
@@ -5868 +5867 @@
                 else:
                     # TODO: better to create this in a new terminal on Linux
-                    sb.Popen(['/bin/bash','fullrmc.sh'])
+                    subp.Popen(['/bin/bash','fullrmc.sh'])
         else:
             pName = generalData['Name'].replace(' ','_')
@@ -5915 +5914 @@
             G2frame.OnFileSave(event)
             print (' GSAS-II project saved')
-            import subprocess as sb
             generalData = data['General']
             pName = generalData['Name'].replace(' ','_')
+            exstr = rmcexe+'\\rmcprofile.exe '+pName
             batch = open('runrmc.bat','w')
             batch.write('Title RMCProfile\n')
-            batch.write(rmcexe+'\\rmcprofile.exe '+pName+'\n')
+            batch.write(exstr+'\n')
             batch.write('pause\n')
             batch.close()
-            sb.Popen('runrmc.bat',creationflags=sb.CREATE_NEW_CONSOLE)
+            subp.Popen('runrmc.bat',creationflags=subp.CREATE_NEW_CONSOLE)
             
     def OnStopRMC(event):

trunk/GSASIIpwd.py

@@ -2430 +2430 @@
         fl.write('%12.6e%14.6e%14.6e\n'%(inst[prms[8]][1],inst[prms[9]][1],inst[prms[10]][1]))    
         fl.write('%12.6e%14.6e%14.6e%14.6e%14.6e\n'%(inst[prms[11]][1],inst[prms[12]][1]+Ysb,inst[prms[13]][1]+Xsb,0.0,0.0))
+        fl.write('\n\n\n')
         fl.close()
     else: