Changeset 1411

Timestamp:

Jul 5, 2014 3:35:29 PM (9 years ago)

Author:

vondreele

Message:

remove unused reference to z-matrix RBs
noted in comment about Constraints problem with returning after refine.
NB: The Constraints menu isn't built the same was as Restraints or Rigid Bodies
Fix peak fitting - now can refine sig, gam, etc. for selected peaks along with U,V,W, etc.

Location:

trunk

Files:

• GSASIIconstrGUI.py (modified) (1 diff)
• GSASIIgrid.py (modified) (1 diff)
• GSASIIpwd.py (modified) (8 diffs)

trunk/GSASIIconstrGUI.py

@@ -1056 +1056 @@
             G2frame.Page = [page,'rrb']
             UpdateResidueRB()
-        elif text == 'Z-matrix rigid bodies':
-            G2frame.dataFrame.RigidBodyMenu.Remove(0)
-            G2frame.dataFrame.RigidBodyMenu.Insert(0,G2frame.dataFrame.ZMatrixRBMenu,title='Edit')
-            G2frame.Page = [page,'zrb']
-            UpdateZMatrixRB()
             
     def getMacroFile(macName):

trunk/GSASIIgrid.py

@@ -2698 +2698 @@
         self.PostfillDataMenu(empty=True)
         
-        # Constraints
+        # Constraints - something amiss here - get weird wx C++ error after refine!
         self.ConstraintMenu = wx.MenuBar()
         self.PrefillDataMenu(self.ConstraintMenu,helpType='Constraints')

trunk/GSASIIpwd.py

@@ -919 +919 @@
                 if sigName in varyList:
                     sig = parmDict[sigName]
+                    dsdU = dsdV = dsdW = 0
                 else:
                     sig = G2mth.getCWsig(parmDict,theta)
@@ -926 +927 @@
                 if gamName in varyList:
                     gam = parmDict[gamName]
+                    dgdX = dgdY = 0
                 else:
                     gam = G2mth.getCWgam(parmDict,theta)
@@ -994 +996 @@
                     if len(Pdabc):
                         alp = np.interp(dsp,Pdabc[0],Pdabc[1])
+                        dad0 = 0
                     else:
                         alp = G2mth.getTOFalpha(parmDict,dsp)
@@ -1003 +1006 @@
                     if len(Pdabc):
                         bet = np.interp(dsp,Pdabc[0],Pdabc[2])
+                        dbdb0 = dbdb1 = dbdb2 = 0
                     else:
                         bet = G2mth.getTOFbeta(parmDict,dsp)
@@ -1009 +1013 @@
                 if sigName in varyList:
                     sig = parmDict[sigName]
+                    dsds0 = dsds1 = dsds2 = 0
                 else:
                     sig = G2mth.getTOFsig(parmDict,dsp)
@@ -1015 +1020 @@
                 if gamName in varyList:
                     gam = parmDict[gamName]
+                    dsdX = dsdY = 0
                 else:
                     gam = G2mth.getTOFgamma(parmDict,dsp)
@@ -1283 +1289 @@
         if 'C' in Inst['Type'][0]:
             names = ['pos','int','sig','gam']
-        else:
+        else:   #'T'
             names = ['pos','int','alp','bet','sig','gam']
         for i,peak in enumerate(Peaks):
@@ -1312 +1318 @@
         if 'C' in dataType:
             names = ['pos','int','sig','gam']
-        else:
+        else:   #'T'
             names = ['pos','int','alp','bet','sig','gam']            
         head = 13*' '