Skip to content

Commit 0ea8a2d

Browse files
committed
remove ~/Applications for RMCProfile MacOS exe, does not work
1 parent 4449ea9 commit 0ea8a2d

File tree

2 files changed

+12
-16
lines changed

2 files changed

+12
-16
lines changed

GSASII/GSASIIpwd.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3439,10 +3439,9 @@ def findrmcprofile():
34393439
the location where the GSAS-II Python files are found,
34403440
the location where GSAS-II binaries are found, the current
34413441
working directory and the location where the Python
3442-
interpreter is found. On MacOS the commonly-used install
3443-
locations of /Applications/RMCProfile.app/Contents/MacOS/exe/
3444-
and ~/Applications/RMCProfile.app/Contents/MacOS/exe/
3445-
are also checked.
3442+
interpreter is found.
3443+
On MacOS the only place where RMCProfile can be installed
3444+
is /Applications/ so only that is checked.
34463445
34473446
:returns: the full path to a python executable that is assumed to
34483447
have fullrmc installed or None, if it was not found.
@@ -3461,8 +3460,10 @@ def findrmcprofile():
34613460
lookfor = "rmcprofile.exe"
34623461
elif sys.platform == "darwin":
34633462
lookfor = "rmcprofile"
3464-
pathlist.insert(0,"/Applications/RMCProfile.app/Contents/MacOS/exe")
3465-
pathlist.insert(0,os.path.expanduser("~/Applications/RMCProfile.app/Contents/MacOS/exe"))
3463+
# MacOS: there is only one place where RMCProfile will run
3464+
pathlist = ["/Applications/RMCProfile.app/Contents/MacOS/exe"]
3465+
#pathlist.insert(0,"/Applications/RMCProfile.app/Contents/MacOS/exe")
3466+
#pathlist.insert(0,os.path.expanduser("~/Applications/RMCProfile.app/Contents/MacOS/exe"))
34663467
else:
34673468
lookfor = "rmcprofile"
34683469
for p in pathlist:

GSASII/config_example.py

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -282,16 +282,11 @@
282282
rmcprofile_exec = None
283283
'''Defines the full path to a compiled executable for RMCProfile (downloaded
284284
from https://rmcprofile.ornl.gov/download) If None (the default), GSAS-II
285-
will see if RMCProfile is found in the path (or for MacOS in the standard
286-
install location of "/Applications/RMCProfile.app/Contents/MacOS/exe/rmcprofile"
287-
If that does not work, GSAS-II will search for an executable named rmcprofile
288-
(or rmcprofile.exe on Windows) in the OS search path, as well as,
289-
the location where the GSAS-II Python files are found,
290-
the location where GSAS-II binaries are found, the current
291-
working directory and the location where the Python
292-
interpreter is found. On MacOS, the commonly-used install
293-
locations of /Applications/RMCProfile.app/Contents/MacOS/exe/ and
294-
~/Applications/RMCProfile.app/Contents/MacOS/exe/ are also checked.
285+
will see if RMCProfile is found in the path, as well as,
286+
where python, the GSAS-II Python files & binaries are located and the current
287+
working directory. For MacOS, RMCProfile will run only from
288+
/Applications/ so that is the only location checked if rmcprofile_exec is not
289+
specified.
295290
'''
296291

297292
lastUpdateNotice = 0

0 commit comments

Comments
 (0)