Changeset 1006 for trunk/GSASII.py

Timestamp:

Jul 22, 2013 8:57:37 PM (10 years ago)

Author:

toby

Message:

fix Bob's bug when multiple HKL files are read; pickup shelx spacegroup in CIF; improve file read error messages

File:

• trunk/GSASII.py (modified) (6 diffs)

trunk/GSASII.py

@@ -362 +362 @@
             primaryReaders = []
             secondaryReaders = []
-            for reader in readerlist:
-                flag = reader.ExtensionValidator(filename)
+            for r in readerlist:
+                flag = r.ExtensionValidator(filename)
                 if flag is None: 
-                    secondaryReaders.append(reader)
+                    secondaryReaders.append(r)
                 elif flag:
-                    primaryReaders.append(reader)
+                    primaryReaders.append(r)
             if len(secondaryReaders) + len(primaryReaders) == 0:
                 self.ErrorDialog('No Format','No matching format for file '+filename)
@@ -437 +437 @@
                         break # success reading
                 else:
-                    self.ErrorDialog('Read Error','No reader is able to read from file '+filename+msg)
+                    if reader:
+                        self.ErrorDialog('Read Error','The '+ rd.formatName+
+                                         ' reader was not able to read file '+filename+msg)
+                    else:
+                        self.ErrorDialog('Read Error','No reader is able to read file '+filename+msg)
             except:
                 import traceback
@@ -2247 +2251 @@
 
         :param str PWDRname: a powder histogram name as obtained from
-          :mod:`GSASIIstruct.GetHistogramNames`
+          :meth:`GSASIIstruct.GetHistogramNames`
 
         :returns: PWDRdata = powder data dictionary with
@@ -2274 +2278 @@
         :param str HKLFname: a single crystal histogram name as obtained
           from
-          :mod:`GSASIIstruct.GetHistogramNames`
+          :meth:`GSASIIstruct.GetHistogramNames`
 
         :returns: HKLFdata = single crystal data list of reflections
@@ -2290 +2294 @@
     def GetPhaseData(self):
         '''Returns a list of defined phases. Used only in GSASIIgrid
-        Note routine :mod:`GSASIIstruct.GetPhaseData` also exists.
+        Note routine :meth:`GSASIIstruct.GetPhaseData` also exists.
         '''
         phaseData = {}
@@ -2344 +2348 @@
     class ViewParmDialog(wx.Dialog):
         '''Window to show all parameters in the refinement.
-        Called from :mod:`OnViewLSParms`
+        Called from :meth:`OnViewLSParms`
         '''
         def __init__(self,parent,title,parmDict):