Changeset 1875 for trunk/GSASIIphsGUI.py

Timestamp:

Jun 2, 2015 2:36:58 PM (8 years ago)

Author:

vondreele

Message:

add Flack parameter to GUI (commented out for now)

File:

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

trunk/GSASIIphsGUI.py

@@ -3800 +3800 @@
             item, cookie = G2frame.PatternTree.GetNextChild(G2frame.root, cookie)                        
         dlg = G2G.G2MultiChoiceDialog(G2frame, 'Select reflection sets to use',
-                    'Use data',TextList)
+            'Use data',TextList)
         try:
             if dlg.ShowModal() == wx.ID_OK:
@@ -3832 +3832 @@
             histoName = TextList[i]
             UseList[histoName] = {'Histogram':histoName,'Show':False,'Scale':[1.0,True],
-                                  'Babinet':{'BabA':[0.0,False],'BabU':[0.0,False]},
-                                  'Extinction':['Lorentzian','None',
-                                                {'Tbar':0.1,'Cos2TM':0.955,'Eg':[1.e-7,False],'Es':[1.e-7,False],'Ep':[1.e-7,False]},]}                        
+                'Babinet':{'BabA':[0.0,False],'BabU':[0.0,False]},
+                'Extinction':['Lorentzian','None',
+                {'Tbar':0.1,'Cos2TM':0.955,'Eg':[1.e-7,False],'Es':[1.e-7,False],'Ep':[1.e-7,False]},],
+                'Flack':[0.0,False]}                        
             UpdateHKLFdata(histoName)
             data['Histograms'] = UseList
@@ -3859 +3860 @@
         sourceDict = UseList[hist]
         if 'HKLF' in sourceDict['Histogram']:
-            copyNames = ['Scale','Extinction','Babinet']
+            copyNames = ['Scale','Extinction','Babinet','Flack']
         else:  #PWDR  
             copyNames = ['Scale','Pref.Ori.','Size','Mustrain','HStrain','Extinction','Babinet']
@@ -3881 +3882 @@
         copyDict = {}
         if 'HKLF' in sourceDict['Histogram']:
-            copyNames = ['Scale','Extinction','Babinet']
+            copyNames = ['Scale','Extinction','Babinet','Flack']
         else:  #PWDR  
             copyNames = ['Scale','Pref.Ori.','Size','Mustrain','HStrain','Extinction','Babinet']
         babNames = ['BabA','BabU']
         for name in copyNames:
-            if name in ['Scale','Extinction','HStrain']:
+            if name in ['Scale','Extinction','HStrain','Flack']:
                 if name == 'Extinction' and 'HKLF' in sourceDict['Histogram']:
                     copyDict[name] = {name:[sourceDict[name][:2]]}
@@ -3918 +3919 @@
                         UseList[item]
                         for name in copyNames:
-                            if name in ['Scale','Extinction','HStrain']:
+                            if name in ['Scale','Extinction','HStrain','Flack']:
                                 if name == 'Extinction' and 'HKLF' in sourceDict['Histogram']:
                                     UseList[item][name][:2] = copy.deepcopy(sourceDict[name][:2])
@@ -3950 +3951 @@
         copyDict = {}
         if 'HKLF' in sourceDict['Histogram']:
-            copyNames = ['Scale','Extinction','Babinet']
+            copyNames = ['Scale','Extinction','Babinet','Flack']
         else:  #PWDR  
             copyNames = ['Scale','Pref.Ori.','Size','Mustrain','HStrain','Extinction','Babinet']
@@ -3974 +3975 @@
             finally:
                 dlg.Destroy()            
-
         
     def OnPwdrAdd(event):