Changeset 1006 for trunk/GSASII.py


Ignore:
Timestamp:
Jul 22, 2013 8:57:37 PM (9 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASII.py

    r1000 r1006  
    362362            primaryReaders = []
    363363            secondaryReaders = []
    364             for reader in readerlist:
    365                 flag = reader.ExtensionValidator(filename)
     364            for r in readerlist:
     365                flag = r.ExtensionValidator(filename)
    366366                if flag is None:
    367                     secondaryReaders.append(reader)
     367                    secondaryReaders.append(r)
    368368                elif flag:
    369                     primaryReaders.append(reader)
     369                    primaryReaders.append(r)
    370370            if len(secondaryReaders) + len(primaryReaders) == 0:
    371371                self.ErrorDialog('No Format','No matching format for file '+filename)
     
    437437                        break # success reading
    438438                else:
    439                     self.ErrorDialog('Read Error','No reader is able to read from file '+filename+msg)
     439                    if reader:
     440                        self.ErrorDialog('Read Error','The '+ rd.formatName+
     441                                         ' reader was not able to read file '+filename+msg)
     442                    else:
     443                        self.ErrorDialog('Read Error','No reader is able to read file '+filename+msg)
    440444            except:
    441445                import traceback
     
    22472251
    22482252        :param str PWDRname: a powder histogram name as obtained from
    2249           :mod:`GSASIIstruct.GetHistogramNames`
     2253          :meth:`GSASIIstruct.GetHistogramNames`
    22502254
    22512255        :returns: PWDRdata = powder data dictionary with
     
    22742278        :param str HKLFname: a single crystal histogram name as obtained
    22752279          from
    2276           :mod:`GSASIIstruct.GetHistogramNames`
     2280          :meth:`GSASIIstruct.GetHistogramNames`
    22772281
    22782282        :returns: HKLFdata = single crystal data list of reflections
     
    22902294    def GetPhaseData(self):
    22912295        '''Returns a list of defined phases. Used only in GSASIIgrid
    2292         Note routine :mod:`GSASIIstruct.GetPhaseData` also exists.
     2296        Note routine :meth:`GSASIIstruct.GetPhaseData` also exists.
    22932297        '''
    22942298        phaseData = {}
     
    23442348    class ViewParmDialog(wx.Dialog):
    23452349        '''Window to show all parameters in the refinement.
    2346         Called from :mod:`OnViewLSParms`
     2350        Called from :meth:`OnViewLSParms`
    23472351        '''
    23482352        def __init__(self,parent,title,parmDict):
Note: See TracChangeset for help on using the changeset viewer.