Changeset 2363

Timestamp:

Jul 5, 2016 9:20:05 PM (7 years ago)

Author:

toby

Message:

fix minor bugs in sequential refinement

Files:

• Tutorials/SeqRefine/SequentialTutorial.htm (modified) (2 diffs)
• trunk/GSASII.py (modified) (3 diffs)
• trunk/GSASIIobj.py (modified) (2 diffs)

Tutorials/SeqRefine/SequentialTutorial.htm

@@ -2515 +2515 @@
 style='mso-bidi-font-weight:bold'> tab</span>. Then press the <b><span
 style='font-family:"Calibri",sans-serif;mso-ascii-theme-font:major-latin;
-mso-hansi-theme-font:major-latin'>Copy?</span></b><span style='mso-bidi-font-weight:
+mso-hansi-theme-font:major-latin'>Copy data</span></b><span style='mso-bidi-font-weight:
 bold'> button for </span><b><span style='font-family:"Calibri",sans-serif;
 mso-ascii-theme-font:major-latin;mso-hansi-theme-font:major-latin'>PWDR
@@ -3257 +3257 @@
 
 <p class=MsoListParagraphCxSpMiddle>These two constraints will interfere when
-refining the first histograms, so <span style='mso-bidi-font-weight:bold'>press
+refining the with first histogram, so <span style='mso-bidi-font-weight:bold'>press
 the </span><b><span style='font-family:"Calibri",sans-serif;mso-ascii-theme-font:
 major-latin;mso-hansi-theme-font:major-latin'>Delete</span></b><span

trunk/GSASII.py

@@ -504 +504 @@
                     rd.objname = os.path.basename(filename)
                     flag = False
-                    if GSASIIpath.GetConfigValue('debug'):
+                    if GSASIIpath.GetConfigValue('debug'): # allow exceptions for debugging
                         flag = rd.Reader(filename,fp,self,
                                          buffer=rdbuffer,
@@ -1593 +1593 @@
         phaseNameList = usedHistograms.keys() # phase names in use
         if not phaseNameList: return # no phases yet, nothing to do
-        header = 'Select phase(s) to link\nto new data:'
+        header = 'Select phase(s) to link\nto the newly-read data:'
         for Name in newHistList:
             header += '\n  '+str(Name)
@@ -3801 +3801 @@
                     Id = G2gd.GetPatternTreeItemId(self,self.root,'Sequential results')
                     self.PatternTree.SelectItem(Id)
+                    G2gd.MovePatternTreeToGrid(self,Id) # reload current tree item, should update current plot
 #                    self.G2plotNB.replotAll() # refresh any plots not yet updated - doesn't exist!
             finally:

trunk/GSASIIobj.py

@@ -1280 +1280 @@
         # Phase vars (p::<var>)
         'A([0-5])' : 'Reciprocal metric tensor component \\1',
-        'Vol' : 'Unit cell volume',
+        '[vV]ol' : 'Unit cell volume', # probably an error that both upper and lower case are used
         # Atom vars (p::<var>:a)
         'dA([xyz])$' : 'change to atomic coordinate, \\1',
@@ -1287 +1287 @@
         'AU([123][123])':'Atomic anisotropic displacement parameter U\\1',
         'Afrac': 'Atomic occupancy parameter',
+        'Amul': 'Atomic site multiplicity value',
         # Hist & Phase (HAP) vars (p:h:<var>)
         'Back': 'Background term',