Changeset 3210 for trunk/GSASIIphsGUI.py

Timestamp:

Dec 29, 2017 12:52:35 PM (5 years ago)

Author:

vondreele

Message:

some fixes for magnetic incommensurate cifs - dealing with 2 different dictionary defns for mcif!

File:

• trunk/GSASIIphsGUI.py (modified) (4 diffs)

trunk/GSASIIphsGUI.py

@@ -86 +86 @@
         first = text[0].split(':')[-1].strip()
         cents = [0,]
-        if len(Cents):
+        if len(Cents) > 1:
             cents = text[-1].split(';')
         for line in text:
@@ -92 +92 @@
         ncol = self.table[0].count(',')+2
         for ic,cent in enumerate(cents):
-            if cent:
+            if ic:
                 cent = cent.strip(' (').strip(')+\n') 
                 mainSizer.Add(wx.StaticText(self.panel,label=' for (%s)+'%(cent)),0,WACV)
@@ -1790 +1790 @@
             return magSizer
             
-        def PawleySizer():
-            
-            def OnPawleyRef(event):
-                generalData['doPawley'] = pawlRef.GetValue()
-            
-            pawleySizer = wx.BoxSizer(wx.HORIZONTAL)
-            pawleySizer.Add(wx.StaticText(General,label=' Pawley controls: '),0,WACV)
-            pawlRef = wx.CheckBox(General,-1,label=' Do Pawley refinement?')
-            pawlRef.SetValue(generalData['doPawley'])
-            pawlRef.Bind(wx.EVT_CHECKBOX,OnPawleyRef)
-            pawleySizer.Add(pawlRef,0,WACV)
-            pawleySizer.Add(wx.StaticText(General,label=' Pawley dmin: '),0,WACV)
-            pawlVal = G2G.ValidatedTxtCtrl(General,generalData,'Pawley dmin',
-                min=0.25,max=20.,nDig=(10,5))
-            pawleySizer.Add(pawlVal,0,WACV)
-            pawleySizer.Add(wx.StaticText(General,label=' Pawley neg. wt.: '),0,WACV)
-            pawlNegWt = G2G.ValidatedTxtCtrl(General,generalData,'Pawley neg wt',
-                min=0.,max=1.,nDig=(10,4))
-            pawleySizer.Add(pawlNegWt,0,WACV)
-            return pawleySizer
-            
         def ModulatedSizer(name):
             
@@ -1892 +1871 @@
             ssSizer.Add(vecSizer)
             return ssSizer
+            
+        def PawleySizer():
+            
+            def OnPawleyRef(event):
+                generalData['doPawley'] = pawlRef.GetValue()
+            
+            pawleySizer = wx.BoxSizer(wx.HORIZONTAL)
+            pawleySizer.Add(wx.StaticText(General,label=' Pawley controls: '),0,WACV)
+            pawlRef = wx.CheckBox(General,-1,label=' Do Pawley refinement?')
+            pawlRef.SetValue(generalData['doPawley'])
+            pawlRef.Bind(wx.EVT_CHECKBOX,OnPawleyRef)
+            pawleySizer.Add(pawlRef,0,WACV)
+            pawleySizer.Add(wx.StaticText(General,label=' Pawley dmin: '),0,WACV)
+            pawlVal = G2G.ValidatedTxtCtrl(General,generalData,'Pawley dmin',
+                min=0.25,max=20.,nDig=(10,5))
+            pawleySizer.Add(pawlVal,0,WACV)
+            pawleySizer.Add(wx.StaticText(General,label=' Pawley neg. wt.: '),0,WACV)
+            pawlNegWt = G2G.ValidatedTxtCtrl(General,generalData,'Pawley neg wt',
+                min=0.,max=1.,nDig=(10,4))
+            pawleySizer.Add(pawlNegWt,0,WACV)
+            return pawleySizer
             
         def MapSizer():