Changeset 4142

Timestamp:

Sep 10, 2019 3:15:35 PM (4 years ago)

Author:

vondreele

Message:

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

Location:

trunk

Files:

• GSASIIpwd.py (modified) (1 diff)
• GSASIIpwdGUI.py (modified) (1 diff)
• imports/G2rfd_Panalytical.py (modified) (3 diffs)

trunk/GSASIIpwd.py

@@ -2347 +2347 @@
     Ic[:] = 0
     Scale = data['Scale'][0]
+    if data['Layer Seq'] == []:
+        return
     laySeq = ['0',]+data['Layer Seq'].split()+[str(len(data['Layers'])-1),]
     Nlayers = len(laySeq)

trunk/GSASIIpwdGUI.py

@@ -6160 +6160 @@
         ModelPlot(data,x,xr,y)
         G2plt.PlotPatterns(G2frame,plotType='REFD')
-        wx.CallLater(100,UpdateREFDModelsGrid,G2frame,data)
+        wx.CallAfter(UpdateREFDModelsGrid,G2frame,data)
         
     def OnModelPlot(event):

trunk/imports/G2rfd_Panalytical.py

@@ -14 +14 @@
 import GSASIIobj as G2obj
 import GSASIIpath
+sind = lambda x: np.sin(x*np.pi/180.)
 GSASIIpath.SetVersionNumber("$Revision: $")
 class Panalytical_ReaderClass(G2obj.ImportReflectometryData):
@@ -106 +107 @@
             print('Panalytical read error: Intensities could not be located')
             return False            
-        self.instdict['wave'] = wave
+        self.instdict['wave'] = float(wave.find(tag+'kAlpha1').text)
         self.instdict['type'] = 'RXC'
         self.reflectometryentry[0] = filename
@@ -112 +113 @@
         N = y.shape[0]
         x = np.linspace(startPos,endPos,N)
+        x = 4.*np.pi*sind(x/2.)/self.instdict['wave']
         w = np.where(y>0,1./y,1.)
         self.reflectometrydata = [