diff --git a/anaconda_env b/anaconda_env index c67b6c7..24f4dd4 100755 --- a/anaconda_env +++ b/anaconda_env @@ -6,6 +6,7 @@ #fi default=/sf/bernina/anaconda/bernina36 +default=/sf/bernina/anaconda/psi_python_envs/bernina36 dest=${1:-$default} echo Loading PSI Anaconda Python distribution 3.6 diff --git a/eco b/eco index 178aa56..03ee278 100755 --- a/eco +++ b/eco @@ -1,6 +1,6 @@ #/bin/bash #source /opt/gfa/python -source anaconda_env +#source anaconda_env ipython --pylab --profile=eco --no-banner -i -c "run /sf/bernina/config/src/python/eco/startup_inline.py -l -s bernina" diff --git a/eco_dev b/eco_dev index 2d2c662..2bf2d27 100755 --- a/eco_dev +++ b/eco_dev @@ -1,9 +1,10 @@ #/bin/bash -source anaconda_env -export PYTHONPATH=$PYTHONPATH:/sf/bernina/config/src/python/devel -ipython --pylab --no-banner -c "\ -print(' ___ _______\n / -_) __/ _ \ \n Experiment Control \__/\__/\___/ \n\n');\ -from eco.instruments import bernina;\ -from eco.instruments.bernina import *;\ -" -i +#source /opt/gfa/python +source anaconda_bernina_env +conda activate /sf/bernina/anaconda/bernina_envs/bernina36_op + +ipython --pylab --profile=eco --no-banner -i -c "run /sf/bernina/config/src/python/eco_dev/startup_inline.py -l -s bernina" + + +#python /sf/bernina/config/src/python/eco/startup.py -s bernina "$@" -l diff --git a/startup_bernina_terminal b/startup_bernina_terminal index 9334d02..d85c857 100755 --- a/startup_bernina_terminal +++ b/startup_bernina_terminal @@ -1,7 +1,7 @@ #!/bin/bash source /opt/gfa/python -set_gnome_keyboard_shortcut 'stop_fel' 'feloff' 'F8' -set_gnome_keyboard_shortcut 'open_fel' 'felon' 'F8' +set_gnome_keyboard_shortcut 'stop_fel' 'feloff' 'F12' +set_gnome_keyboard_shortcut 'open_fel' 'felon' 'F12' set_gnome_keyboard_shortcut 'eco' 'gnome-terminal -- eco' 'c' set_gnome_keyboard_shortcut 'browser' 'firefox' 'b' set_gnome_keyboard_shortcut 'stop_laser' 'laseroff' 'F4'