Changeset 5404

Timestamp:

Nov 24, 2022 11:44:13 PM (4 months ago)

Author:

toby

Message:

new M1 binaries; merge mag phase in CIF

Files:

• Binaries/mac_arm_p3.10_n1.23 (added)
• Binaries/mac_arm_p3.10_n1.23/Build.notes.txt (added)
• Binaries/mac_arm_p3.10_n1.23/LATTIC (added)
• Binaries/mac_arm_p3.10_n1.23/convcell (added)
• Binaries/mac_arm_p3.10_n1.23/histogram2d.cpython-310-darwin.so (added)
• Binaries/mac_arm_p3.10_n1.23/histosigma2d.cpython-310-darwin.so (added)
• Binaries/mac_arm_p3.10_n1.23/pack_f.cpython-310-darwin.so (added)
• Binaries/mac_arm_p3.10_n1.23/polymask.cpython-310-darwin.so (added)
• Binaries/mac_arm_p3.10_n1.23/pydiffax.cpython-310-darwin.so (added)
• Binaries/mac_arm_p3.10_n1.23/pypowder.cpython-310-darwin.so (added)
• Binaries/mac_arm_p3.10_n1.23/pyspg.cpython-310-darwin.so (added)
• Binaries/mac_arm_p3.10_n1.23/pytexture.cpython-310-darwin.so (added)
• Binaries/mac_arm_p3.10_n1.23/spotmask.cpython-310-darwin.so (added)
• Binaries/mac_arm_p3.10_n1.23/unpack_cbf.cpython-310-darwin.so (added)
• trunk/GSASIIpath.py (modified) (3 diffs)
• trunk/exports/G2export_CIF.py (modified) (1 diff)

trunk/GSASIIpath.py

@@ -535 +535 @@
     print('\nAttempting patch for svn Checksum mismatch error\n')
     svnCleanup(fpath)
-    cmd = ['svn','update','--set-depth','empty',
+    cmd = [svn,'update','--set-depth','empty',
                os.path.join(fpath,'bindist')]
     showsvncmd(cmd)        
@@ -541 +541 @@
     out,err = MakeByte2str(s.communicate())
     #if err: print('error=',err)
-    cmd = ['svn','switch',g2home+'/trunk/bindist',
+    cmd = [svn,'switch',g2home+'/trunk/bindist',
                os.path.join(fpath,'bindist'),
                '--non-interactive', '--trust-server-cert', '--accept',
@@ -549 +549 @@
     out,err = MakeByte2str(s.communicate())
     DownloadG2Binaries(g2home,verbose=True)
-    cmd = ['svn','update','--set-depth','infinity',
+    cmd = [svn,'update','--set-depth','infinity',
                os.path.join(fpath,'bindist')]
     showsvncmd(cmd)        

trunk/exports/G2export_CIF.py

@@ -4771 +4771 @@
                     self.CloseFile()
                     return
+        MagPhase = None
+        ChemPhase = None
+            
+        if len(self.phasenam) == 2:
+            for name in self.phasenam:
+                if self.Phases[name]['General']['Type'] == 'nuclear':
+                    ChemPhase = name
+                if self.Phases[name]['General']['Type'] == 'magnetic':
+                    MagPhase = name
+            if MagPhase and ChemPhase:
+                mergeMag(ChemPhase,MagPhase)
         for name in self.phasenam:
             self.openDelayed()