Skip to content

Quoting vars, using $() instead of backticks #309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KaushikMalapati wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Quoting vars, using $() instead of backticks #309

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions scripts/takepeds
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ Takes a run with dark images for use in pedestals, and posts to the elog.
EOF
}

if [[($1 == "--help") || ($1 == "-h")]]; then
if [[ ($1 == "--help") || ($1 == "-h") ]]; then
usage
exit 0
fi

EXP=`get_curr_exp`
EXP=$(get_curr_exp)
HUTCH=${EXP:0:3}

#SIT_ENV_DIR="/sdf/group/lcls/ds/ana/sw"
Expand All @@ -25,12 +25,11 @@ HUTCH=$(get_info --gethutch)
if [[ "$(daqutils isdaqmgr)" = "true" ]]; then
echo "This is an LCLS-II experiment"
SIT_ENV_DIR='/cds/group/pcds/dist/pds/'$HUTCH'/scripts/'
source $SIT_ENV_DIR/setup_env.sh
LCLS2=1
source "$SIT_ENV_DIR"/setup_env.sh
if [[ ${HUTCH} =~ 'ued' ]]; then
epixquad_pedestal_scan --record 1 --hutch ${HUTCH}
epixquad_pedestal_scan --record 1 --hutch "${HUTCH}"
elif [[ ${HUTCH} =~ 'mfx' ]]; then
jungfrau_pedestal_scan --record 1 --hutch ${HUTCH} -p 0 -g 1 -v -t 10000 -C drp-srcf-cmp014
jungfrau_pedestal_scan --record 1 --hutch "${HUTCH}" -p 0 -g 1 -v -t 10000 -C drp-srcf-cmp014
elif [[ ${HUTCH} =~ 'rix' ]]; then
echo "Running LCLS2 RIX specific pedestal acquisition..."
timed_run --duration="60" --config="/cds/group/pcds/dist/pds/rix/scripts/rix.py" --record
Expand All @@ -42,20 +41,21 @@ else

# -R: for norecord , -r forces recording
station=$(get_info --getstation)
$DAQ_RELEASE/tools/scanning/take_pedestals -p $station -r
$DAQ_RELEASE/tools/scanning/take_pedestals -p "$station" -r
fi

# shellcheck disable=SC2181
if [ $? -eq 0 ]; then
echo 'Finished taking the pedestals, now posting to the elog'
# changing to the LCLS2 DAQ enviroment breaks get_info based scripts
source pcds_conda
echo 'Please call: makepeds -q milano -r '`get_lastRun`' -u <userID>'
echo "Please call: makepeds -q milano -r $(get_lastRun) -u <userID>"
elogMessage="DARK"
PYCMD=LogBookPost

RUN=`get_lastRun`
echo $PYCMD -i "${HUTCH^^}" -u `whoami` -e "$EXP" -t DARK -r $RUN -m "$elogMessage"
$PYCMD -i "${HUTCH^^}" -u `whoami` -p pcds -e "$EXP" -t DARK -r $RUN -m "$elogMessage"&
RUN=$(get_lastRun)
echo $PYCMD -i "${HUTCH^^}" -u "$(whoami)" -e "$EXP" -t DARK -r "$RUN" -m "$elogMessage"
$PYCMD -i "${HUTCH^^}" -u "$(whoami)" -p pcds -e "$EXP" -t DARK -r "$RUN" -m "$elogMessage"&

else
echo 'takepeds failed, make sure the DAQ is setup appropriately!'
Expand Down