Ignore:
Timestamp:
Apr 24, 2020 11:06:35 AM (2 years ago)
Author:
toby
Message:

do much more cleanup after phase delete; refactor some importer imports to avoid G2IO

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/imports/G2phase_CIF.py

    r4399 r4410  
    2525import re
    2626import copy
    27 import GSASIIIO as G2IO
    2827import GSASIIobj as G2obj
    2928import GSASIIspc as G2spc
     
    3231import GSASIIpy3 as G2p3
    3332import GSASIIpath
     33try:
     34    import GSASIIctrlGUI as G2G
     35except ImportError:
     36    pass
    3437GSASIIpath.SetVersionNumber("$Revision$")
    3538import CifFile as cif # PyCifRW from James Hester
     
    132135                sg = sg.replace('_','')
    133136                if sg: choice[-1] += ', (' + sg.strip() + ')'
    134             selblk = G2IO.PhaseSelector(choice,ParentFrame=ParentFrame,
     137            selblk = G2G.PhaseSelector(choice,ParentFrame=ParentFrame,
    135138                title= 'Select a phase from one the CIF data_ blocks below',size=(600,100))
    136139        self.errors = 'Error during reading of selected block'
     
    11521155            for atmline in self.Phase['Atoms']:
    11531156                lbl = atmline[0]
    1154                 print( lbl,atmline[6],Occ[lbl])
     1157                if lbl in Occ: print( lbl,atmline[6],Occ[lbl])
    11551158
    11561159            print( 70*'=')
Note: See TracChangeset for help on using the changeset viewer.