diff --git a/scripts/ap.sh b/scripts/ap.sh index 43b9dfc..99910da 100755 --- a/scripts/ap.sh +++ b/scripts/ap.sh @@ -5,7 +5,7 @@ while true do echo "Running "`date` - python ${DIR_AP}/ap/ap.py --pgroup ${PGROUP} --beamline ${BEAMLINE} --detector ${DETN} --logbook ${LOGBOOK} --dir_ap ${DIR_AP} + python ${DIR_AP}/ap/ap.py --pgroup ${PGROUP} --beamline ${BEAMLINE} --detector ${DETECTOR_NAME} --logbook ${LOGBOOK} --dir_ap ${DIR_AP} ${DIR_AP}/scripts/jobs_overview.sh diff --git a/scripts/env_setup.sh b/scripts/env_setup.sh index 9abd21e..e3b028c 100755 --- a/scripts/env_setup.sh +++ b/scripts/env_setup.sh @@ -1,7 +1,5 @@ #!/bin/bash -DIRNAME=`dirname ${BASH_SOURCE}` - export PGROUP= export BEAMLINE=alvra @@ -12,16 +10,16 @@ BASEDIR=/sf/${BEAMLINE}/data/${PGROUP}/res source /sf/jungfrau/applications/miniconda3/etc/profile.d/conda.sh conda activate sf-dap -export DETN= +export DETECTOR_NAME= # Possible choice: JF06T08V04 JF06T32V04 JF17T16V01 -export GEOM_FILE=${DETN}.geom +export GEOM_FILE=${DETECTOR_NAME}.geom #for Alvra(rounding 0.25): 4000 and lower #for Cristallina (photon counts): 10 -# edit run_index.*.sh file(s) for indexing options -export THRESHOLD_INDEXING=10 +# edit run_index.*.sh file(s) for (more) indexing options +export THRESHOLD_INDEXING= -#LOGBOOK="https://docs.google.com/spreadsheets/...." +LOGBOOK= +# Possible choice: None (if no google logbook feeling) -CONFIG_DIR=$PWD diff --git a/scripts/prepare.sh b/scripts/prepare.sh index 104d9bb..1940a54 100755 --- a/scripts/prepare.sh +++ b/scripts/prepare.sh @@ -20,6 +20,8 @@ do fi done +#path to current directory which contains config files +echo "export CONFIG_DIR=$PWD" >> env_setup.sh # path to the installed ap package DIR_AP=`dirname ${SRC}` echo "export DIR_AP=${DIR_AP}" >> env_setup.sh