minor: comments on single-peak fit value def routines; change preference button labels

Author: briantoby

GSASII/GSASIIctrlGUI.py

@@ -6884,17 +6884,17 @@ def OnNewColorBar(event):
             self.varsizer.Add(rb, 0, wx.ALIGN_CENTRE|wx.ALL, 5)
         else:
             if var.endswith('_directory') or var.endswith('_location'):
-                btn = wx.Button(self,wx.ID_ANY,'Select from dialog...')
+                btn = wx.Button(self,wx.ID_ANY,'Select from file dialog...')
                 btn.Bind(wx.EVT_BUTTON,self.onSelDir)
                 sz = (400,-1)
             elif var.endswith('_exec'):
-                btn = wx.Button(self,wx.ID_ANY,'Select from dialog...')
+                btn = wx.Button(self,wx.ID_ANY,'Select from file dialog...')
                 btn.Bind(wx.EVT_BUTTON,self.onSelExec)
                 sz = (400,-1)
             elif var.endswith('_color') and var != 'Contour_color':
                 self.colorText = wx.StaticText(self,wx.ID_ANY,size=(80,20))
                 self.colorChip = wx.StaticText(self,wx.ID_ANY,size=(80,30))
-                btn = wx.Button(self,wx.ID_ANY,'Select from dialog...')
+                btn = wx.Button(self,wx.ID_ANY,'Select from color selector...')
                 btn.Bind(wx.EVT_BUTTON,self.onSelColor)
                 sz = (400,-1)
             else:

GSASII/GSASIIpwd.py

@@ -2514,10 +2514,11 @@ def SetInstParms(Inst):
         return dataType,instDict,insVary
 
     def GetPkInstParms(parmDict,Inst,varyList):
-        '''This is where the default values for sigma & gamma
-        are set for peaks in single-peak fits when peakInstPrmMode is True
-        and the values are not being fit. This seems also to be done in 
-        GetPeaksParms (TODO: this routine is not needed?)
+        '''This sets default values for sigma & gamma in the 
+        single-peak fitting parameter dict when peakInstPrmMode is True
+        and the peak values are not being fit. (Why not alpha & beta?)
+        Note similar routine, GetPeaksParms, which sets values in the 
+        peak table. (TODO: add setting of alpha & beta here?)
         '''
         for name in Inst:
             Inst[name][1] = parmDict[name]
@@ -2596,9 +2597,12 @@ def SetPeaksParms(dataType,Peaks):
         return peakDict,peakVary
 
     def GetPeaksParms(Inst,parmDict,Peaks,varyList):
-        '''Put values into the Peaks list from the refinement results from inside
-        the parmDict array. 
-        This is done prior for sigma & gamma in GetPkInstParms
+        '''Put single-peak fitting values into the Peaks List 
+        from the refinement results. Where values are not fit (unless 
+        peakInstPrmMode is False), they are computed from the 
+        Instrument Parameter values. 
+        Note that routine GetPkInstParms does this prior 
+        for sigma & gamma (only).
         '''
         names,_,_ = getHeaderInfo(Inst['Type'][0])
         off = 0