Changeset 5404


Ignore:
Timestamp:
Nov 24, 2022 11:44:13 PM (2 months ago)
Author:
toby
Message:

new M1 binaries; merge mag phase in CIF

Files:
14 added
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIpath.py

    r5289 r5404  
    535535    print('\nAttempting patch for svn Checksum mismatch error\n')
    536536    svnCleanup(fpath)
    537     cmd = ['svn','update','--set-depth','empty',
     537    cmd = [svn,'update','--set-depth','empty',
    538538               os.path.join(fpath,'bindist')]
    539539    showsvncmd(cmd)       
     
    541541    out,err = MakeByte2str(s.communicate())
    542542    #if err: print('error=',err)
    543     cmd = ['svn','switch',g2home+'/trunk/bindist',
     543    cmd = [svn,'switch',g2home+'/trunk/bindist',
    544544               os.path.join(fpath,'bindist'),
    545545               '--non-interactive', '--trust-server-cert', '--accept',
     
    549549    out,err = MakeByte2str(s.communicate())
    550550    DownloadG2Binaries(g2home,verbose=True)
    551     cmd = ['svn','update','--set-depth','infinity',
     551    cmd = [svn,'update','--set-depth','infinity',
    552552               os.path.join(fpath,'bindist')]
    553553    showsvncmd(cmd)       
  • trunk/exports/G2export_CIF.py

    r5356 r5404  
    47714771                    self.CloseFile()
    47724772                    return
     4773        MagPhase = None
     4774        ChemPhase = None
     4775           
     4776        if len(self.phasenam) == 2:
     4777            for name in self.phasenam:
     4778                if self.Phases[name]['General']['Type'] == 'nuclear':
     4779                    ChemPhase = name
     4780                if self.Phases[name]['General']['Type'] == 'magnetic':
     4781                    MagPhase = name
     4782            if MagPhase and ChemPhase:
     4783                mergeMag(ChemPhase,MagPhase)
    47734784        for name in self.phasenam:
    47744785            self.openDelayed()
Note: See TracChangeset for help on using the changeset viewer.