Commit d17686e7 authored by Peterson, Peter's avatar Peterson, Peter
Browse files

Merge branch 'mantid_wrap' into 'main' 

Mantid wrappers

Closes #7

See merge request !10
parents 45368661 f08dcf8e

Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -30,4 +30,4 @@ RUN rpmlint nsd-app-wrap.spec 
RUN ./rpmbuild.sh



# copy to packages.sns.gov

RUN scp -o StrictHostKeyChecking=no ${HOME}/rpmbuild/RPMS/noarch/${PROJECT}*.noarch.rpm $SSH_USER@packages.sns.gov:${PKG_PATH}
 
RUN scp -o StrictHostKeyChecking=no ${HOME}/rpmbuild/RPMS/noarch/${PROJECT}*.noarch.rpm ${SSH_USER}@packages.sns.gov:${PKG_PATH}

addie

+4 −9
Original line number Diff line number Diff line
@@ -12,15 +12,10 @@ if [ -n "$1" ]; then 
  fi

fi



# Addie executable

STARTUP=addie



# import library to do the real work

source "$(dirname "$(realpath "$0")")/nsd-app-wrap.sh"



# activate the environment - will be deactivated on exit

activate_conda_environment "${CONDA_ENVIRON}"



# start the application

echo "Execute: ${STARTUP} $*"

"${STARTUP}" "$@"
 
# put together arguments - conda_env, application, argv

args=("${CONDA_ENVIRON}" "addie" "$@")

# launch the tool

activate_and_launch "${args[@]}"

drtsans

+4 −5
Original line number Diff line number Diff line
@@ -22,8 +22,7 @@ fi 
# import library to do the real work

source "$(dirname "$(realpath "$0")")/nsd-app-wrap.sh"



# activate the environment - will be deactivated on exit

activate_conda_environment "${CONDA_ENVIRON}"



# start the application

"$STARTUP" "$@"
 
# put together arguments - conda_env, application, argv

args=("${CONDA_ENVIRON}" "${STARTUP}" "$@")

# launch the tool

activate_and_launch "${args[@]}"

gsas2

+1 −1
Original line number Diff line number Diff line
@@ -10,4 +10,4 @@ source "$(dirname "$(realpath "$0")")/nsd-app-wrap.sh" 
activate_conda_environment "${CONDA_ENVIRON}"



# start the application

python /opt/anaconda/envs/gsas2/GSASII/GSASII.py
 
python "${CONDA_PREFIX}/GSASII/GSASII.py"

mantid_workbench.png

0 → 100644
+17 KiB
Loading image diff...