Changeset 3100 for trunk/GSASIIphsGUI.py

Timestamp:

Sep 27, 2017 3:18:40 PM (6 years ago)

Author:

vondreele

Message:

implement fix FXU for sequential refinements

File:

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

trunk/GSASIIphsGUI.py

@@ -6349 +6349 @@
             G2G.G2MessageBox(G2frame,'No histograms to copy to')
             return
-        sourceDict = data['Histograms'][hist]
+        sourceDict = copy.deepcopy(data['Histograms'][hist])
         if 'HKLF' in sourceDict['Histogram']:
-            copyNames = ['Scale','Extinction','Babinet','Flack','Twins']
+            copyNames = ['Scale','Extinction','Babinet','Flack','Twins','Fix FXU']
         else:  #PWDR  
-            copyNames = ['Scale','Pref.Ori.','Size','Mustrain','HStrain','Extinction','Babinet','LeBail','newLeBail',]
+            copyNames = ['Scale','Pref.Ori.','Size','Mustrain','HStrain','Extinction','Babinet','LeBail','newLeBail','Fix FXU']
         copyDict = {}
         for name in copyNames: 
-            copyDict[name] = copy.deepcopy(sourceDict[name])        #force copy
+            copyDict[name] = sourceDict[name]        #force copy
         dlg = G2G.G2MultiChoiceDialog(G2frame,u'Copy phase/histogram parameters\nfrom '+hist[5:][:35],
                 'Copy phase/hist parameters', keyList)
@@ -6362 +6362 @@
             if dlg.ShowModal() == wx.ID_OK:
                 for sel in dlg.GetSelections():
-                    data['Histograms'][keyList[sel]].update(copy.deepcopy(copyDict))
+                    data['Histograms'][keyList[sel]].update(copyDict)
         finally:
             dlg.Destroy()
@@ -6368 +6368 @@
     def OnDataCopyFlags(event):
         hist = G2frame.hist
-        sourceDict = data['Histograms'][hist]
+        sourceDict = copy.deepcopy(data['Histograms'][hist])
         copyDict = {}
         if 'HKLF' in sourceDict['Histogram']:
-            copyNames = ['Scale','Extinction','Babinet','Flack','Twins']
+            copyNames = ['Scale','Extinction','Babinet','Flack','Twins','Fix FXU']
         else:  #PWDR  
-            copyNames = ['Scale','Pref.Ori.','Size','Mustrain','HStrain','Extinction','Babinet']
+            copyNames = ['Scale','Pref.Ori.','Size','Mustrain','HStrain','Extinction','Babinet','Fix FXU']
         babNames = ['BabA','BabU']
         for name in copyNames:
@@ -6398 +6398 @@
                 copyDict[name] = {}
                 for bab in babNames:
-                    copyDict[name][bab] = sourceDict[name][bab][1]                       
+                    copyDict[name][bab] = sourceDict[name][bab][1]
+            elif name == 'Fix FXU':
+                copyDict[name] = sourceDict[name]                      
         keyList = G2frame.dataWindow.HistsInPhase[:]
         if hist in keyList: keyList.remove(hist)
@@ -6437 +6439 @@
                         elif name == 'Babinet':
                             for bab in babNames:
-                                data['Histograms'][item][name][bab][1] = copy.deepcopy(copyDict[name][bab])                                              
+                                data['Histograms'][item][name][bab][1] = copy.deepcopy(copyDict[name][bab])
+                        elif name == 'Fix FXU':
+                            data['Histograms'][item][name] = copy.deepcopy(sourceDict[name])                      
         finally:
             dlg.Destroy()
@@ -6451 +6455 @@
         copyDict = {}
         if 'HKLF' in sourceDict['Histogram']:
-            copyNames = ['Scale','Extinction','Babinet','Flack','Twins']
+            copyNames = ['Scale','Extinction','Babinet','Flack','Twins','Fix FXU']
         else:  #PWDR  
-            copyNames = ['Scale','Pref.Ori.','Size','Mustrain','HStrain','Extinction','Babinet','LeBail']
+            copyNames = ['Scale','Pref.Ori.','Size','Mustrain','HStrain','Extinction','Babinet','LeBail','Fix FXU']
         dlg = G2G.G2MultiChoiceDialog(G2frame,'Select which parameters to copy',
             'Select phase data parameters', copyNames)
@@ -6510 +6514 @@
                                 NShkl*[0.01,],NShkl*[False,]],
                             'HStrain':[NDij*[0.0,],NDij*[False,]],                          
-                            'Extinction':[0.0,False],'Babinet':{'BabA':[0.0,False],'BabU':[0.0,False]}}
+                            'Extinction':[0.0,False],'Babinet':{'BabA':[0.0,False],'BabU':[0.0,False]},'Fix FXU':' '}
                         refList = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,Id,'Reflection Lists'))
                         refList[generalData['Name']] = {}