fix import of non-Q .xye/.chi that has a wavelength in header

Author: briantoby

GSASII/GSASIIscriptable.py

@@ -5100,12 +5100,13 @@ def HAPvalue(self, param=None, newValue=None, targethistlist='all'):
         :param str param: is a parameter name, which can be 'Scale' or
           'PhaseFraction' (either can be used for phase
           fraction), 'Use', 'Extinction', 'LeBail', 'PO' 
-          (for Prefered Orientation).
+          (for Preferred Orientation).
           If not specified or invalid
           an exception is generated showing the list of valid parameters.
-          At present, these HAP parameters cannot be access with this function:
-          'Size', 'Mustrain', 'HStrain', 'Babinet'. On request this
-          might be addressed in the future. Some of these values can be set via
+          At present, only these HAP parameters cannot be accessed with 
+          this function: 'Size', 'Mustrain', 'HStrain', 'Babinet'. 
+          This might be addressed in the future. 
+          Some of these values can be set via
           :meth:`G2Phase.set_HAP_refinements`.
         :param newValue: the value to use when setting the HAP parameter for the
           appropriate histogram(s). Will be converted to the proper type or

GSASII/imports/G2pwd_xye.py

@@ -5,7 +5,7 @@
 '''
 
 from __future__ import division, print_function
-import os.path as ospath
+import os.path
 import numpy as np
 from .. import GSASIIobj as G2obj
 from .. import GSASIIpath
@@ -38,9 +38,10 @@ def ContentsValidator(self, filename):
         Qchi = False
         self.Wave = None
         fp = open(filename,'r')
-        if '.chi' in filename:
+        ext = os.path.splitext(filename)[1]
+        if ext == '.chi':
             self.Chi = True
-        if '.qchi' in filename:
+        if ext == '.qchi':
             Qchi = True
         if2theta = False
         ifQ = False
@@ -83,7 +84,7 @@ def ContentsValidator(self, filename):
                         gotCcomment = True
                         continue   
                     if S[0] in ["'",'#','!']:
-                        if 'wavelength' in S and not self.Wave:
+                        if 'wavelength' in S and not self.Wave and '.q' in ext:
                             wave = S.split()[2]
                             if wave: 
                                 try:
@@ -212,7 +213,7 @@ def Reader(self,filename, ParentFrame=None, **unused):
         self.powderentry[0] = filename
         #self.powderentry[1] = pos # bank offset (N/A here)
         #self.powderentry[2] = 1 # xye file only has one bank
-        self.idstring = ospath.basename(filename)
+        self.idstring = os.path.basename(filename)
         # scan comments for temperature
         Temperature = 300.
         for S in self.comments: