Changeset 1906

Timestamp:

Jun 23, 2015 12:58:59 PM (8 years ago)

Author:

vondreele

Message:

set lowest map search to 1.0 (from 10.)

Location:

trunk

Files:

• GSASIIddataGUI.py (modified) (1 diff)
• GSASIIgrid.py (modified) (3 diffs)
• GSASIIphsGUI.py (modified) (1 diff)

trunk/GSASIIddataGUI.py

@@ -833 +833 @@
         twinsizer = wx.BoxSizer(wx.VERTICAL)
         topsizer = wx.BoxSizer(wx.HORIZONTAL)          
-        topsizer.Add(wx.StaticText(DData,wx.ID_ANY,' Merohedral/pseudomerohedral twins: '),0,WACV)
+        topsizer.Add(wx.StaticText(DData,wx.ID_ANY,' Merohedral twins: '),0,WACV)
         addtwin = wx.CheckBox(DData,wx.ID_ANY,label=' Add Twin Law')
         addtwin.Bind(wx.EVT_CHECKBOX, OnAddTwin)

trunk/GSASIIgrid.py

@@ -2751 +2751 @@
         wtval.SetValue('%.3f'%(val))
         
+    def OnCompression(event):
+        data[0] = int(comp.GetValue())
+        
     def onCopyPlotCtrls(event):
         '''Respond to menu item to copy multiple sections from a histogram.
@@ -2767 +2770 @@
     if 'wtFactor' not in data[0]:
         data[0] = {'wtFactor':1.0}
+#    if kind == 'PWDR' and 'Compression' not in data[0]:
+#        data[0]['Compression'] = 1
     #if isinstance(data[1],list) and kind == 'HKLF':
     if 'list' in str(type(data[1])) and kind == 'HKLF':
@@ -2799 +2804 @@
     wtval.Bind(wx.EVT_KILL_FOCUS,OnWtFactor)
     wtSizer.Add(wtval,0,WACV)
+#    if kind == 'PWDR':         #possible future compression feature; NB above patch as well
+#        wtSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,' Compression factor: '),0,WACV)
+#        choice = ['1','2','3','4','5','6']
+#        comp = wx.ComboBox(parent=G2frame.dataDisplay,choices=choice,
+#            style=wx.CB_READONLY|wx.CB_DROPDOWN)
+#        comp.SetValue(str(data[0]['Compression']))
+#        comp.Bind(wx.EVT_COMBOBOX, OnCompression)
+#        wtSizer.Add(comp,0,WACV)
     mainSizer.Add(wtSizer)
     if data[0].get('Dummy'):

trunk/GSASIIphsGUI.py

@@ -735 +735 @@
                 try:
                     res = float(cutOff.GetValue())
-                    if 10.0 <= res <= 100.:
+                    if 1.0 <= res <= 100.:
                         Map['cutOff'] = res
                 except ValueError: