Changeset 4142


Ignore:
Timestamp:
Sep 10, 2019 3:15:35 PM (3 years ago)
Author:
vondreele
Message:

fix panalytical reflectometry mporter - now converts 2theta to q
some fixes to reflectometry stuff

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIpwd.py

    r4102 r4142  
    23472347    Ic[:] = 0
    23482348    Scale = data['Scale'][0]
     2349    if data['Layer Seq'] == []:
     2350        return
    23492351    laySeq = ['0',]+data['Layer Seq'].split()+[str(len(data['Layers'])-1),]
    23502352    Nlayers = len(laySeq)
  • trunk/GSASIIpwdGUI.py

    r4135 r4142  
    61606160        ModelPlot(data,x,xr,y)
    61616161        G2plt.PlotPatterns(G2frame,plotType='REFD')
    6162         wx.CallLater(100,UpdateREFDModelsGrid,G2frame,data)
     6162        wx.CallAfter(UpdateREFDModelsGrid,G2frame,data)
    61636163       
    61646164    def OnModelPlot(event):
  • trunk/imports/G2rfd_Panalytical.py

    r4141 r4142  
    1414import GSASIIobj as G2obj
    1515import GSASIIpath
     16sind = lambda x: np.sin(x*np.pi/180.)
    1617GSASIIpath.SetVersionNumber("$Revision: $")
    1718class Panalytical_ReaderClass(G2obj.ImportReflectometryData):
     
    106107            print('Panalytical read error: Intensities could not be located')
    107108            return False           
    108         self.instdict['wave'] = wave
     109        self.instdict['wave'] = float(wave.find(tag+'kAlpha1').text)
    109110        self.instdict['type'] = 'RXC'
    110111        self.reflectometryentry[0] = filename
     
    112113        N = y.shape[0]
    113114        x = np.linspace(startPos,endPos,N)
     115        x = 4.*np.pi*sind(x/2.)/self.instdict['wave']
    114116        w = np.where(y>0,1./y,1.)
    115117        self.reflectometrydata = [
Note: See TracChangeset for help on using the changeset viewer.