diff --git a/eco b/eco index 69dafca..edf6403 100755 --- a/eco +++ b/eco @@ -1,12 +1,6 @@ #/bin/bash -#source /opt/gfa/python - -default=bernina38 +default=sfb312 dest=${1:-$default} -source anaconda_env $dest +source mm_bernina_env $dest ipython --pylab --profile=eco3 --no-banner -i -c "run /sf/bernina/config/src/python/eco/startup_inline_new.py -l -s bernina" - - -#python /sf/bernina/config/src/python/eco/startup.py -s bernina "$@" -l - diff --git a/eco_historic b/eco_historic new file mode 100755 index 0000000..6ea0ee2 --- /dev/null +++ b/eco_historic @@ -0,0 +1,17 @@ +#/bin/bash +#source /opt/gfa/python +source anaconda_env +export PYTHONPATH=$PYTHONPATH:/sf/bernina/config/src/python +ipython --profile=operation --pylab --no-banner -c "\ +print(' ___ _______\n / -_) __/ _ \ \n Experiment Control \__/\__/\___/ \n\n');\ +import h5py;\ +h5py.enable_ipython_completer();\ +import IPython.utils as _ipy_utils;\ +_ipy_utils.terminal.set_term_title('eco Bernina');\ + +from eco_old.instruments import bernina;\ +from eco_old.instruments.bernina import *;\ +from escape.parse.swissfel import parseScanEco_v01;\ +#%config IPCompleter.use_jedi=True;\ +" -i + diff --git a/eco_new b/eco_new deleted file mode 100755 index edf6403..0000000 --- a/eco_new +++ /dev/null @@ -1,6 +0,0 @@ -#/bin/bash -default=sfb312 -dest=${1:-$default} -source mm_bernina_env $dest - -ipython --pylab --profile=eco3 --no-banner -i -c "run /sf/bernina/config/src/python/eco/startup_inline_new.py -l -s bernina" diff --git a/eco_old b/eco_old index 6ea0ee2..69dafca 100755 --- a/eco_old +++ b/eco_old @@ -1,17 +1,12 @@ #/bin/bash #source /opt/gfa/python -source anaconda_env -export PYTHONPATH=$PYTHONPATH:/sf/bernina/config/src/python -ipython --profile=operation --pylab --no-banner -c "\ -print(' ___ _______\n / -_) __/ _ \ \n Experiment Control \__/\__/\___/ \n\n');\ -import h5py;\ -h5py.enable_ipython_completer();\ -import IPython.utils as _ipy_utils;\ -_ipy_utils.terminal.set_term_title('eco Bernina');\ -from eco_old.instruments import bernina;\ -from eco_old.instruments.bernina import *;\ -from escape.parse.swissfel import parseScanEco_v01;\ -#%config IPCompleter.use_jedi=True;\ -" -i +default=bernina38 +dest=${1:-$default} +source anaconda_env $dest + +ipython --pylab --profile=eco3 --no-banner -i -c "run /sf/bernina/config/src/python/eco/startup_inline_new.py -l -s bernina" + + +#python /sf/bernina/config/src/python/eco/startup.py -s bernina "$@" -l diff --git a/mm_bernina_env b/mm_bernina_env index 262f735..ae82183 100755 --- a/mm_bernina_env +++ b/mm_bernina_env @@ -12,7 +12,7 @@ echo Loading Bernina Micromamba/conda Python # <<< conda initialize <<< source /sf/bernina/bin/mm_bernina -#micromamba config append envs_dirs /sf/bernina/applications/mm/envs +micromamba config append envs_dirs /sf/bernina/applications/mm/envs #conda config --set env_prompt '({name})' echo Activating Micromamba/conda environment ${1:-$dest}