Changeset 2784 for trunk/imports/G2rfd_xye.py

Timestamp:

Apr 15, 2017 10:46:00 PM (6 years ago)

Author:

vondreele

Message:

fix REFD plotting
put neutron reflectometry reader back in import routine

File:

• trunk/imports/G2rfd_xye.py (modified) (5 diffs)

trunk/imports/G2rfd_xye.py

@@ -122 +122 @@
         return True
 
-class txt_nmXRayReaderClass(G2IO.ImportReflectometryData):
-    'Routines to import X-ray q REFD data from a .xrfd or .xdat file, q in nm-1'
+class txt_NeutronReaderClass(G2IO.ImportReflectometryData):
+    'Routines to import neutron q REFD data from a .nrfd or .ndat file'
     def __init__(self):
         super(self.__class__,self).__init__( # fancy way to self-reference
-            extensionlist=('.xrfd','.xdat'),
+            extensionlist=('.nrfd','.ndat'),
             strictExtension=False,
-            formatName = 'q (nm-1) step X-ray QRE data',
-            longFormatName = 'q (nm-1) stepped X-ray text data file in Q,R,E order; E optional'
+            formatName = 'q (A-1) step neutron QRE data',
+            longFormatName = 'q (A-1) stepped neutron text data file in Q,R,E order; E optional'
             )
 
@@ -176 +176 @@
                 try:
                     data = [float(val) for val in vals]
-                    x.append(float(data[0])/10.)        #convert nm-1 to A-1
+                    x.append(float(data[0]))
                     f = float(data[1])
                     if f <= 0.0:
-                        x.pop()
+                        del x[-1]
                         continue
                     elif len(vals) > 2:
@@ -203 +203 @@
                     pass
         self.instdict['wave'] = wave
-        self.instdict['type'] = 'RXC'
+        self.instdict['type'] = 'RNC'
         x = np.array(x)
         self.reflectometrydata = [
@@ -211 +211 @@
             np.zeros(N), # calc. intensities (zero)
             np.zeros(N), # obs-calc profiles
-            np.array(sq), # fix bkg
+            np.array(sq), # Q FWHM
             ]
         self.reflectometryentry[0] = filename
@@ -220 +220 @@
 
         return True
+