Ignore:
Timestamp:
Oct 2, 2013 9:27:17 AM (8 years ago)
Author:
toby
Message:

more CIF work

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/imports/G2sfact_CIF.py

    r1069 r1074  
    1313import os.path
    1414import GSASIIIO as G2IO
    15 import CifFile as cif # PyCifRW from James Hester
    16 import urllib
    1715import GSASIIpath
    1816GSASIIpath.SetVersionNumber("$Revision: 810 $")
     17import CifFile as cif # PyCifRW from James Hester
    1918
    2019class CIFhklReader(G2IO.ImportStructFactor):
     
    6362            if cf is None:
    6463                self.ShowBusy() # this can take a while
    65                 ciffile = 'file:'+urllib.pathname2url(filename)
    66                 #cf = cif.ReadCif(ciffile)
    67                 fp = open(ciffile,'r')             # patch: open file to avoid windows bug
    68                 cf = cif.ReadCif(fp)
    69                 fp.close()
     64                cf = G2IO.ReadCIF(filename)
    7065                self.DoneBusy()
    7166            # scan blocks for reflections
Note: See TracChangeset for help on using the changeset viewer.