Ignore:
Timestamp:
Nov 23, 2016 10:15:47 AM (5 years ago)
Author:
vondreele
Message:

remove str() from some text handling - failed on non ascii characters in file name & user entered titles.
Some code cleanups

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/imports/G2pwd_BrukerRAW.py

    r2516 r2547  
    1818import os.path as ospath
    1919import struct as st
    20 import array as ar
    2120import numpy as np
    2221import GSASIIIO as G2IO
     
    138137                        nSteps = int(st.unpack('<i',File.read(4))[0])
    139138                        if iBlock+1 == blockNum:
    140                             t = st.unpack('<d',File.read(8))[0]
     139                            st.unpack('<d',File.read(8))[0]
    141140                            start2Th = st.unpack('<d',File.read(8))[0]
    142141                            File.seek(pos+176)
     
    183182                self.idstring = ospath.basename(filename) + ' Scan '+str(1)
    184183                nSteps = int(st.unpack('<i',File.read(4))[0])
    185                 t = st.unpack('<d',File.read(8))[0]
     184                st.unpack('<d',File.read(8))[0]
    186185                start2Th = st.unpack('<d',File.read(8))[0]
    187186                File.seek(pos+176)
Note: See TracChangeset for help on using the changeset viewer.