Changeset 1145 for trunk/GSASIIgrid.py

Timestamp:

Nov 12, 2013 3:52:13 PM (10 years ago)

Author:

toby

Message:

move DefaultControls? out of g2grid to avoid wx requirement; now import mmCIF reflection files

File:

• trunk/GSASIIgrid.py (modified) (3 diffs)

trunk/GSASIIgrid.py

@@ -41 +41 @@
 import GSASIIrestrGUI as G2restG
 import GSASIIpy3 as G2py3
+import GSASIIobj as G2obj
 
 # trig functions in degrees
@@ -141 +142 @@
 
 VERY_LIGHT_GREY = wx.Colour(235,235,235)
-DefaultControls = {
-    'deriv type':'analytic Hessian',    #default controls
-    'min dM/M':0.0001,'shift factor':1.,'max cyc':3,'F**2':True,
-    'minF/sig':0,
-    'Author':'no name',
-    'FreeVar1':'Sample humidity (%)',
-    'FreeVar2':'Sample voltage (V)',
-    'FreeVar3':'Applied load (MN)',
-    }
 ################################################################################
 #### GSAS-II class definitions
@@ -3551 +3543 @@
             data = G2frame.PatternTree.GetItemPyData(item)
             if not data:           #fill in defaults
-                data = copy.copy(DefaultControls)    #least squares controls
+                data = copy.copy(G2obj.DefaultControls)    #least squares controls
                 G2frame.PatternTree.SetItemPyData(item,data)                             
             for i in G2frame.Refine: i.Enable(True)