Changeset 2735 for trunk/GSASIIstrIO.py

Timestamp:

Mar 2, 2017 12:48:10 PM (8 years ago)

Author:

vondreele

Message:

set default flight path = 20. in case FPATH0 missing from TOF Iparm file.
fix problem editing flight path
modify SetPhaseWindow? to take Size as optional variable & make sizer an optional variable
Use it for all table only phase windows in place of set SizePosLeft? - fixes issues of windows jumping about after Refine.
for initial LeBail? refinement exclude all hap variables (size, mustrain, etc.)

File:

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

trunk/GSASIIstrIO.py ¶

@@ -2256 +2256 @@
                     hapDict[pfx+name] = hapData['HStrain'][0][i]
                     HSvals.append(hapDict[pfx+name])
-                    if hapData['HStrain'][1][i]:
+                    if hapData['HStrain'][1][i] and not hapDict[pfx+'newLeBail']:
                         hapVary.append(pfx+name)
                     controlDict[pfx+'poType'] = hapData['Pref.Ori.'][0]
@@ -2283 +2283 @@
                     controlDict[pfx+item+'Type'] = hapData[item][0]
                     hapDict[pfx+item+';mx'] = hapData[item][1][2]
-                    if hapData[item][2][2]:
+                    if hapData[item][2][2] and not hapDict[pfx+'newLeBail']:
                         hapVary.append(pfx+item+';mx')
                     if hapData[item][0] in ['isotropic','uniaxial']:
                         hapDict[pfx+item+';i'] = hapData[item][1][0]
-                        if hapData[item][2][0]:
+                        if hapData[item][2][0] and not hapDict[pfx+'newLeBail']:
                             hapVary.append(pfx+item+';i')
                         if hapData[item][0] == 'uniaxial':
                             controlDict[pfx+item+'Axis'] = hapData[item][3]
                             hapDict[pfx+item+';a'] = hapData[item][1][1]
-                            if hapData[item][2][1]:
+                            if hapData[item][2][1] and not hapDict[pfx+'newLeBail']:
                                 hapVary.append(pfx+item+';a')
                     else:       #generalized for mustrain or ellipsoidal for size
@@ -2306 +2306 @@
                             sfx = ';'+str(i)
                             hapDict[pfx+item+sfx] = hapData[item][4][i]
-                            if hapData[item][5][i]:
+                            if hapData[item][5][i] and not hapDict[pfx+'newLeBail']:
                                 hapVary.append(pfx+item+sfx)
                 if Phases[phase]['General']['Type'] != 'magnetic':