Changeset 1638

Timestamp:

Feb 9, 2015 9:48:03 AM (8 years ago)

Author:

vondreele

Message:

remove status bar from restraint pages. Wasn't used & failed for multiple phases.
More work on super special position constraints

Location:

trunk

Files:

• GSASIIrestrGUI.py (modified) (3 diffs)
• GSASIIspc.py (modified) (6 diffs)

trunk/GSASIIrestrGUI.py

@@ -1782 +1782 @@
         text = G2frame.dataDisplay.GetPageText(page)
         G2frame.dataFrame.RestraintEdit.SetLabel(G2gd.wxID_RESRCHANGEVAL,'Change value')
-        SetStatusLine('')
         if text == 'Bond restraints':
             G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.RestraintMenu)
@@ -1839 +1838 @@
         event.Skip()
 
-    def SetStatusLine(text):
-        Status.SetStatusText(text)                                      
-
     def RaisePage(event):
         'Respond to a "select tab" menu button'
@@ -1860 +1856 @@
     G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.RestraintMenu)
     G2frame.dataFrame.SetLabel('restraints for '+phaseName)
-    if not G2frame.dataFrame.GetStatusBar():
-        Status = G2frame.dataFrame.CreateStatusBar()
-    SetStatusLine('')
     
     G2frame.dataFrame.RestraintEdit.Enable(G2gd.wxID_RESTSELPHASE,False)

trunk/GSASIIspc.py

@@ -1504 +1504 @@
     Sdtau = np.array(Sdtau)
     SdIndx = np.argsort(Sdtau)
-    print SdIndx
+    print SdIndx,[Sdtau[i] for i in SdIndx]
     OpText =  [MT2text(s).replace(' ','') for s in Sop]         #debug?
     SSOpText = [SSMT2text(ss).replace(' ','') for ss in SSop]   #debug?
@@ -1569 +1569 @@
         if waveType == 'Fourier':
             if np.any(dtau%.5) and ('1/2' in SSGData['modSymb'] or '1' in SSGData['modSymb']):
-                dt = sdet*dT**sdet
+                dt = dT**(sdet*epsinv)
                 CSI['Spos'] = [[[1,0,0],[2,0,0],[3,0,0], [1,0,0],[2,0,0],[3,0,0]],
                     [[1.,0.,0.],[1.,0.,0.],[1.,0.,0.], [1.,0.,0.],[1.,0.,0.],[1.,0.,0.]]]
@@ -1578 +1578 @@
                 elif '(z)' in siteSym:
                     CSI['Spos'][1][3:] = [-dt,0.,0.],[-dt,0.,0.],[1./dt,0.,0.]
+                for i in range(3):
+                    if not XSC[i]:
+                        CSI['Spos'][0][i] = [0,0,0]
+                        CSI['Spos'][1][i] = [0.,0.,0.]
+                        CSI['Spos'][0][i+3] = [0,0,0]
+                        CSI['Spos'][1][i+3] = [0.,0.,0.]
             else:
                 for i in range(3):
@@ -1603 +1609 @@
         
             if np.any(dtau%.5) and ('1/2' in SSGData['modSymb'] or '1' in SSGData['modSymb']):
-                dt = dT     #**sdet
+                dt = dT     #**epsinv
                 fsc = [1,1]
                 CSI['Sfrac'] = [[[1,0],[1,0]],[[1.,0.],[1/dt,0.]]]
+                for i in range(2):
+                    if not FSC[i]:
+                        CSI['Sfrac'][0][i] = [0,0]
+                        CSI['Sfrac'][1][i] = [0.,0.]
             else:
                 for i in range(2):
@@ -1624 +1634 @@
         dUTP.append(dUT)
         if np.any(dtau%.5) and ('1/2' in SSGData['modSymb'] or '1' in SSGData['modSymb']):
-            dt = dT     #**sdet
+            dt = dT**(sdet*epsinv)
+            print epsinv,sdet,ssdet,dT,dt
             CSI['Sadp'] = [[[1,0,0],[2,0,0],[3,0,0],[4,0,0],[5,0,0],[6,0,0], 
             [1,0,0],[2,0,0],[3,0,0],[4,0,0],[5,0,0],[6,0,0]],
@@ -1635 +1646 @@
             elif '(z)' in siteSym:
                 CSI['Sadp'][1][9:] = [1./dt,0.,0.],[-dt,0.,0.],[-dt,0.,0.]
+            for i in range(6):
+                if not USC[i]:
+                    CSI['Sadp'][0][i] = [0,0,0]
+                    CSI['Sadp'][1][i] = [0.,0.,0.]
+                    CSI['Sadp'][0][i+6] = [0,0,0]
+                    CSI['Sadp'][1][i+6] = [0.,0.,0.]
         else:
             for i in range(6):