Ignore:
Timestamp:
Nov 17, 2018 7:36:26 PM (3 years ago)
Author:
vondreele
Message:

modifications to allow Load Unit Cell command for incommensurate phases. (not for phases from mcif files!)
cleanup space group display for magnetic/incommensurate phases

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/imports/G2phase_CIF.py

    r3710 r3736  
    188188                    sspgrp[1] = "("+sspgrp[1]
    189189                    SpGrp = sspgrp[0]
     190                    if "1'" in SpGrp:       #nonmagnetics can't be gray
     191                        SpGrp = SpGrp.replace("1'",'')
     192                        sspgrp[1] = sspgrp[1][:-1]  #take off extra 's'
    190193                    SpGrp = G2spc.StandardizeSpcName(SpGrp)
    191194                    self.Phase['General']['Type'] = 'nuclear'
     
    194197                    self.warnings += 'Space group name '+sspgrp[0]+sspgrp[1]+' not recognized by GSAS-II'
    195198                    return False
    196                 SuperSg = sspgrp[1].replace('\\','')
     199                SuperSg = sspgrp[1].replace('\\','').replace(',','')
    197200                SuperVec = [[0,0,.1],False,4]
    198201            else:   #not incommensurate
     
    593596                self.MPhase['General']['Super'] = Super
    594597                if Super:
    595                     if self.MPhase['General']['SGData']['SGGray']:
    596                         SuperSg += 's'
    597598                    self.MPhase['General']['Modulated'] = True
    598599                    self.MPhase['General']['SuperVec'] = SuperVec
    599600                    self.MPhase['General']['SuperSg'] = SuperSg
     601                    if self.MPhase['General']['SGData']['SGGray']:
     602                        self.MPhase['General']['SuperSg'] += 's'
    600603                if 'mcif' not in filename:
    601604                    self.Phase = copy.deepcopy(self.MPhase)
Note: See TracChangeset for help on using the changeset viewer.