Changeset 5277

Timestamp:

May 15, 2022 8:58:48 PM (17 months ago)

Author:

toby

Message:

reorg pdffit

Files:

• Binaries/mac_64_p3.7_n1.18/pdffit2.cpython-37m-darwin.so (added)
• Binaries/win_64_p3.7_n1.19/pdffit2.cp37-win_amd64.pyd (copied) (copied from Binaries/win_64_p3.7_n1.19/diffpy/pdffit2/pdffit2.cp37-win_amd64.pyd)
• PDFfit2 (added)
• PDFfit2/AUTHORS.txt (copied) (copied from Binaries/win_64_p3.7_n1.19/diffpy/AUTHORS.txt)
• PDFfit2/LICENSE.txt (copied) (copied from Binaries/win_64_p3.7_n1.19/diffpy/LICENSE.txt)
• PDFfit2/diffpy (moved) (moved from Binaries/win_64_p3.7_n1.19/diffpy)
• PDFfit2/diffpy/AUTHORS.txt (deleted)
• PDFfit2/diffpy/LICENSE.txt (deleted)
• PDFfit2/diffpy/manual (deleted)
• PDFfit2/diffpy/pdffit2/__init__.py (modified) (1 diff)
• PDFfit2/diffpy/pdffit2/pdffit2.cp37-win_amd64.pyd (deleted)
• PDFfit2/diffpy/pdffit2/pdffit2.py (deleted)
• PDFfit2/manual (copied) (copied from Binaries/win_64_p3.7_n1.19/diffpy/manual)
• Tutorials/RietPlot/PublicationPlot.htm (modified) (1 diff)
• fullrmc-pkg/notes (modified) (1 diff)

PDFfit2/diffpy/pdffit2/__init__.py

@@ -25 +25 @@
 from diffpy.pdffit2.pdffit import PdfFit
 from diffpy.pdffit2.output import redirect_stdout
-from diffpy.pdffit2.pdffit2 import is_element
+try: 
+    from diffpy.pdffit2.pdffit2 import is_element
+except ImportError:
+    from pdffit2 import is_element  # added for GSAS-II to relocate binary file
 
 # silence pyflakes checker

Tutorials/RietPlot/PublicationPlot.htm

@@ -1791 +1791 @@
 
 The export feature for <span class=SpellE>OriginPro</span> was
-developed by Conrad Gillard.</p>
+developed by Conrad Gillard. He provides a <A
+href="https://youtu.be/W4VtNnj16u0">short video</A> demonstrating its
+use.
+</p>
 
 <p class=MsoNormal><o:p>&nbsp;</o:p></p>

fullrmc-pkg/notes

@@ +1 @@
+12/31/21 build in Jenkins. Use no-arch then Mac
+
+download https://repo.anaconda.com/miniconda/Miniconda3-py39_4.10.3-MacOSX-x86_64.sh
+bash /Users/toby/Downloads/Miniconda3-py39_4.10.3-MacOSX-x86_64.sh -b -p /tmp/Miniconda3-py39_4.10.3
+source /tmp/Miniconda3-py39_4.10.3/bin/activate
+conda install -c fullrmc fullrmc
+conda install gsas2pkg -c defaults -c conda-forge -c briantoby
+pythonw Miniconda3-py39_4.10.3/GSASII/GSASII.py
+
+
+
+
 Preparing: