Changeset 1638


Ignore:
Timestamp:
Feb 9, 2015 9:48:03 AM (7 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIrestrGUI.py

    r1615 r1638  
    17821782        text = G2frame.dataDisplay.GetPageText(page)
    17831783        G2frame.dataFrame.RestraintEdit.SetLabel(G2gd.wxID_RESRCHANGEVAL,'Change value')
    1784         SetStatusLine('')
    17851784        if text == 'Bond restraints':
    17861785            G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.RestraintMenu)
     
    18391838        event.Skip()
    18401839
    1841     def SetStatusLine(text):
    1842         Status.SetStatusText(text)                                     
    1843 
    18441840    def RaisePage(event):
    18451841        'Respond to a "select tab" menu button'
     
    18601856    G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.RestraintMenu)
    18611857    G2frame.dataFrame.SetLabel('restraints for '+phaseName)
    1862     if not G2frame.dataFrame.GetStatusBar():
    1863         Status = G2frame.dataFrame.CreateStatusBar()
    1864     SetStatusLine('')
    18651858   
    18661859    G2frame.dataFrame.RestraintEdit.Enable(G2gd.wxID_RESTSELPHASE,False)
  • trunk/GSASIIspc.py

    r1637 r1638  
    15041504    Sdtau = np.array(Sdtau)
    15051505    SdIndx = np.argsort(Sdtau)
    1506     print SdIndx
     1506    print SdIndx,[Sdtau[i] for i in SdIndx]
    15071507    OpText =  [MT2text(s).replace(' ','') for s in Sop]         #debug?
    15081508    SSOpText = [SSMT2text(ss).replace(' ','') for ss in SSop]   #debug?
     
    15691569        if waveType == 'Fourier':
    15701570            if np.any(dtau%.5) and ('1/2' in SSGData['modSymb'] or '1' in SSGData['modSymb']):
    1571                 dt = sdet*dT**sdet
     1571                dt = dT**(sdet*epsinv)
    15721572                CSI['Spos'] = [[[1,0,0],[2,0,0],[3,0,0], [1,0,0],[2,0,0],[3,0,0]],
    15731573                    [[1.,0.,0.],[1.,0.,0.],[1.,0.,0.], [1.,0.,0.],[1.,0.,0.],[1.,0.,0.]]]
     
    15781578                elif '(z)' in siteSym:
    15791579                    CSI['Spos'][1][3:] = [-dt,0.,0.],[-dt,0.,0.],[1./dt,0.,0.]
     1580                for i in range(3):
     1581                    if not XSC[i]:
     1582                        CSI['Spos'][0][i] = [0,0,0]
     1583                        CSI['Spos'][1][i] = [0.,0.,0.]
     1584                        CSI['Spos'][0][i+3] = [0,0,0]
     1585                        CSI['Spos'][1][i+3] = [0.,0.,0.]
    15801586            else:
    15811587                for i in range(3):
     
    16031609       
    16041610            if np.any(dtau%.5) and ('1/2' in SSGData['modSymb'] or '1' in SSGData['modSymb']):
    1605                 dt = dT     #**sdet
     1611                dt = dT     #**epsinv
    16061612                fsc = [1,1]
    16071613                CSI['Sfrac'] = [[[1,0],[1,0]],[[1.,0.],[1/dt,0.]]]
     1614                for i in range(2):
     1615                    if not FSC[i]:
     1616                        CSI['Sfrac'][0][i] = [0,0]
     1617                        CSI['Sfrac'][1][i] = [0.,0.]
    16081618            else:
    16091619                for i in range(2):
     
    16241634        dUTP.append(dUT)
    16251635        if np.any(dtau%.5) and ('1/2' in SSGData['modSymb'] or '1' in SSGData['modSymb']):
    1626             dt = dT     #**sdet
     1636            dt = dT**(sdet*epsinv)
     1637            print epsinv,sdet,ssdet,dT,dt
    16271638            CSI['Sadp'] = [[[1,0,0],[2,0,0],[3,0,0],[4,0,0],[5,0,0],[6,0,0],
    16281639            [1,0,0],[2,0,0],[3,0,0],[4,0,0],[5,0,0],[6,0,0]],
     
    16351646            elif '(z)' in siteSym:
    16361647                CSI['Sadp'][1][9:] = [1./dt,0.,0.],[-dt,0.,0.],[-dt,0.,0.]
     1648            for i in range(6):
     1649                if not USC[i]:
     1650                    CSI['Sadp'][0][i] = [0,0,0]
     1651                    CSI['Sadp'][1][i] = [0.,0.,0.]
     1652                    CSI['Sadp'][0][i+6] = [0,0,0]
     1653                    CSI['Sadp'][1][i+6] = [0.,0.,0.]
    16371654        else:
    16381655            for i in range(6):
Note: See TracChangeset for help on using the changeset viewer.