Skip to content

Commit

Permalink
Merge pull request #140 from pcdshub/FIX/makeped_jf_fraclm
Browse files Browse the repository at this point in the history
Fix/makeped jf fraclm
  • Loading branch information
silkenelson authored Nov 4, 2022
2 parents 74584dd + 7c89ad8 commit 649a32f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
7 changes: 3 additions & 4 deletions scripts/makepeds_psana
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,6 @@ deploy_gain()
fi
}


POSITIONAL=()
while [[ $# -gt 0 ]]
do
Expand Down Expand Up @@ -319,9 +318,9 @@ do
done
set -- "${POSITIONAL[@]}"


T="$(date +%s%N)"
echo "XXXXXXXXXXXXXXXXX START MAKEPEDS DEV at $(date +'%T') on $HOSTNAME XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
echo "XXXXXXXXXXXXXXXXX START MAKEPEDS at $(date +'%T') on $HOSTNAME XXXXXXXXXXXXXXXXXXXXXXXXXXXX"


RUN=${RUN:=0}
EXP=${EXP:='xxx'}
Expand Down Expand Up @@ -665,7 +664,7 @@ if [[ ( $HAVE_JUNGFRAU -ge 1 ) && ( $WANT_ZYLA -eq 0 ) && ( $WANT_OPAL -eq 0 ) &
#specify parameters for status bits in pixel mask
get_config "Jungfrau"

JFARG=$JFARG' --int_lo='$ADUMIN' --int_hi='$ADUMAX' --rms_lo='$NOISESIGMIN' --rms_hi='$NOISESIGMAX
JFARG=$JFARG' --int_lo='$ADUMIN' --int_hi='$ADUMAX' --rms_lo='$NOISESIGMIN' --rms_hi='$NOISESIGMAX' --fraclm='$FRACLM

echo "-------------------- START JUNGFRAU PEDESTALS at $(date +'%T') ----------------------------"

Expand Down
2 changes: 1 addition & 1 deletion scripts/takepeds
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ HUTCH=${EXP:0:3}
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"&

echo 'please call: makepeds -u <userID> -r '`get_lastRun`
echo 'please call: makepeds -r '`get_lastRun`' -u <userID>'
echo 'for gainswitching detectors we recommend: makepeds -u <userID> -q <ffb-queue-assigned-in-elog> -r '`get_lastRun`
#echo 'we need to use the offline data to process pedestals right now, make sure files have moved, otherwise a very silent failure might happen'
#echo 'please call: makepeds -u <userID> -e '`get_curr_exp`' -r '`get_lastRun`' -q psfehhiprioq'
Expand Down

0 comments on commit 649a32f

Please sign in to comment.