Changeset 1559 for trunk/GSASIIddataGUI.py

Timestamp:

Nov 3, 2014 2:48:51 PM (8 years ago)

Author:

vondreele

Message:

use deepcopy for various copy operations in G2ddataGUI
use complementary colors to background for cell edges
trap superlattice in cubics
more fixes to cell indexing routines from possible use of superlattice
add HStrainVals to G2spc
use it (maybe) in G2strIO, Math
make arguments for GetReflPos? & GetReflPosDeriv? the same (use A not G)
add GetDij? to G2strMath
topas xye file comments start with "'" sometimes

File:

• trunk/GSASIIddataGUI.py (modified) (1 diff)

trunk/GSASIIddataGUI.py

@@ -228 +228 @@
                             if name in ['Scale','Extinction','HStrain']:
                                 if name == 'Extinction' and 'HKLF' in sourceDict['Histogram']:
-                                    UseList[item][name][:1] = copy.copy(sourceDict[name][:1])
+                                    UseList[item][name][:1] = copy.deepcopy(sourceDict[name][:1])
                                     for itm in ['Eg','Es','Ep']:
-                                        UseList[item][name][2][itm][1] = copy.copy(copyDict[name][itm])
+                                        UseList[item][name][2][itm][1] = copy.deepcopy(copyDict[name][itm])
                                 else:
-                                    UseList[item][name][1] = copy.copy(copyDict[name])
+                                    UseList[item][name][1] = copy.deepcopy(copyDict[name])
                             elif name in ['Size','Mustrain']:
-                                UseList[item][name][0] = copy.copy(copyDict[name][0])
-                                UseList[item][name][2] = copy.copy(copyDict[name][1])
-                                UseList[item][name][4] = copy.copy(copyDict[name][2])
+                                UseList[item][name][0] = copy.deepcopy(copyDict[name][0])
+                                UseList[item][name][2] = copy.deepcopy(copyDict[name][1])
+                                UseList[item][name][4] = copy.deepcopy(copyDict[name][2])
                             elif name == 'Pref.Ori.':
-                                UseList[item][name][0] = copy.copy(copyDict[name][0])
-                                UseList[item][name][2] = copy.copy(copyDict[name][1])
+                                UseList[item][name][0] = copy.deepcopy(copyDict[name][0])
+                                UseList[item][name][2] = copy.deepcopy(copyDict[name][1])
                                 if sourceDict[name][0] == 'SH':
-                                    SHflags = copy.copy(copyDict[name][2])
-                                    SHterms = copy.copy(sourceDict[name][5])
+                                    SHflags = copy.deepcopy(copyDict[name][2])
+                                    SHterms = copy.deepcopy(sourceDict[name][5])
                                     for item in SHflags:
-                                        SHterms[item][1] = copy.copy(SHflags[item])
+                                        SHterms[item][1] = copy.deepcopy(SHflags[item])
                             elif name == 'Babinet':
                                 for bab in babNames:
-                                    UseList[item][name][bab][1] = copy.copy(copyDict[name][bab])                                              
+                                    UseList[item][name][bab][1] = copy.deepcopy(copyDict[name][bab])                                              
                     wx.CallAfter(UpdateDData,G2frame,DData,data)
             finally: