Changeset 931


Ignore:
Timestamp:
May 21, 2013 9:11:21 AM (10 years ago)
Author:
vondreele
Message:

a few more G2str needed to be changed

Location:
trunk/imports
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/imports/G2phase_GPX.py

    r884 r931  
    1010import cPickle
    1111import GSASIIIO as G2IO
    12 import GSASIIstruct as G2str
     12import GSASIIstrIO as G2stIO
    1313
    1414class PhaseReaderClass(G2IO.ImportPhase):
    … …  
    2929    def Reader(self,filename,filepointer, ParentFrame=None, **unused):
    3030        try:
    31             phasenames = G2str.GetPhaseNames(filename)
     31            phasenames = G2stIO.GetPhaseNames(filename)
    3232        except:
    3333            return False
    … …  
    4444            if selblk is None: return False # User pressed cancel
    4545        try:
    46             self.Phase = G2str.GetAllPhaseData(filename,phasenames[selblk])
     46            self.Phase = G2stIO.GetAllPhaseData(filename,phasenames[selblk])
    4747            self.Phase['Histograms'] = {}       #remove any histograms
    4848            self.Phase['Pawley ref'] = []       # & any Pawley refl.

  • trunk/imports/G2pwd_GPX.py

    r887 r931  
    1111import numpy as np
    1212import GSASIIIO as G2IO
    13 import GSASIIstruct as G2str
    1413
    1514class GSAS2_ReaderClass(G2IO.ImportPowderData):
Note: See TracChangeset for help on using the changeset viewer.