diff --git a/SubSystems/Online_Cobalt/test/LMM/tMultipleBeamFormers.run b/SubSystems/Online_Cobalt/test/LMM/tMultipleBeamFormers.run
index c4635a8aa3ad0f9eebf944064d337eb06399188c..98ca31233589142b1a35ec66794df3ce1aeee930 100755
--- a/SubSystems/Online_Cobalt/test/LMM/tMultipleBeamFormers.run
+++ b/SubSystems/Online_Cobalt/test/LMM/tMultipleBeamFormers.run
@@ -27,83 +27,102 @@ fi
# Remove existing parsets (if any)
rm -f *.parset
+ OUTDIR_REF_IM1="${OUTDIR}/${TESTNAME}_ref-im1"
+ OUTDIR_REF_BF1="${OUTDIR}/${TESTNAME}_ref-bf1"
+ OUTDIR_REF_BF2="${OUTDIR}/${TESTNAME}_ref-bf2"
+ OUTDIR_REF_BF3="${OUTDIR}/${TESTNAME}_ref-bf3"
+ OUTDIR_REF_BF4="${OUTDIR}/${TESTNAME}_ref-bf4"
+ OUTDIR_LMM_IM1="${OUTDIR}/${TESTNAME}_lmm-im1"
+ OUTDIR_LMM_BF1="${OUTDIR}/${TESTNAME}_lmm-bf1"
+ OUTDIR_LMM_BF2="${OUTDIR}/${TESTNAME}_lmm-bf2"
+ OUTDIR_LMM_BF3="${OUTDIR}/${TESTNAME}_lmm-bf3"
+ OUTDIR_LMM_BF4="${OUTDIR}/${TESTNAME}_lmm-bf4"
+
# Common parset configuration
- BFCOMMON="${TESTNAME}_common.parset"
+ PARSET_BFCOMMON="${TESTNAME}_common.parset"
# Setup parset for bf1
- BF1="${TESTNAME}_bf1.parset"
- cat ${srcdir}/${BFCOMMON} >> ${BF1}
- cat ${srcdir}/${BF1} >> ${BF1}
+ PARSET_BF1="${TESTNAME}_bf1.parset"
+ cat ${srcdir}/${PARSET_BFCOMMON} >> ${PARSET_BF1}
+ cat ${srcdir}/${PARSET_BF1} >> ${PARSET_BF1}
echo "Observation.DataProducts.Output_Correlated.locations="\
- "[10*localhost:${OUTDIR}/ref-im1]" >> ${BF1}
+ "[10*localhost:${OUTDIR_REF_IM1}]" >> ${PARSET_BF1}
echo "Observation.DataProducts.Output_CoherentStokes.locations="\
- "[7*localhost:${OUTDIR}/ref-bf1]" >> ${BF1}
+ "[7*localhost:${OUTDIR_REF_BF1}]" >> ${PARSET_BF1}
echo "Observation.DataProducts.Output_IncoherentStokes.locations="\
- "[1*localhost:${OUTDIR}/ref-bf1]" >> ${BF1}
+ "[1*localhost:${OUTDIR_REF_BF1}]" >> ${PARSET_BF1}
# Setup parset for bf2
- BF2="${TESTNAME}_bf2.parset"
- cat ${srcdir}/${BFCOMMON} >> ${BF2}
- cat ${srcdir}/${BF2} >> ${BF2}
+ PARSET_BF2="${TESTNAME}_bf2.parset"
+ cat ${srcdir}/${PARSET_BFCOMMON} >> ${PARSET_BF2}
+ cat ${srcdir}/${PARSET_BF2} >> ${PARSET_BF2}
echo "Observation.DataProducts.Output_CoherentStokes.locations="\
- "[217*localhost:${OUTDIR}/ref-bf2]" >> ${BF2}
+ "[217*localhost:${OUTDIR_REF_BF2}]" >> ${PARSET_BF2}
# Setup parset for bf3
- BF3="${TESTNAME}_bf3.parset"
- cat ${srcdir}/${BFCOMMON} >> ${BF3}
- cat ${srcdir}/${BF3} >> ${BF3}
+ PARSET_BF3="${TESTNAME}_bf3.parset"
+ cat ${srcdir}/${PARSET_BFCOMMON} >> ${PARSET_BF3}
+ cat ${srcdir}/${PARSET_BF3} >> ${PARSET_BF3}
echo "Observation.DataProducts.Output_CoherentStokes.locations="\
- "[64*localhost:${OUTDIR}/ref-bf3]" >> ${BF3}
+ "[64*localhost:${OUTDIR_REF_BF3}]" >> ${PARSET_BF3}
# Setup parset for bf4
- BF4="${TESTNAME}_bf4.parset"
- cat ${srcdir}/${BFCOMMON} >> ${BF4}
- cat ${srcdir}/${BF4} >> ${BF4}
+ PARSET_BF4="${TESTNAME}_bf4.parset"
+ cat ${srcdir}/${PARSET_BFCOMMON} >> ${PARSET_BF4}
+ cat ${srcdir}/${PARSET_BF4} >> ${PARSET_BF4}
echo "Observation.DataProducts.Output_CoherentStokes.locations="\
- "[12*localhost:${OUTDIR}/ref-bf4]" >> ${BF4}
+ "[12*localhost:${OUTDIR_REF_BF4}]" >> ${PARSET_BF4}
# Setup parset for LMM beamFormer
BFLMM="${TESTNAME}_combined.parset"
- cat ${srcdir}/${BFCOMMON} >> ${BFLMM}
+ cat ${srcdir}/${PARSET_BFCOMMON} >> ${BFLMM}
cat ${srcdir}/${BFLMM} >> ${BFLMM}
echo "Observation.DataProducts.Output_Correlated.locations="\
- "[10*localhost:${OUTDIR}/lmm-im1]" >> ${BFLMM}
+ "[10*localhost:${OUTDIR_LMM_IM1}]" >> ${BFLMM}
echo "Observation.DataProducts.Output_CoherentStokes.locations="\
- "[7*localhost:${OUTDIR}/lmm-bf1,"\
- "19*localhost:${OUTDIR}/lmm-bf2,"\
- "32*localhost:${OUTDIR}/lmm-bf3,"\
- "12*localhost:${OUTDIR}/lmm-bf4]" >> ${BFLMM}
+ "[7*localhost:${OUTDIR_LMM_BF1},"\
+ "19*localhost:${OUTDIR_LMM_BF2},"\
+ "32*localhost:${OUTDIR_LMM_BF3},"\
+ "12*localhost:${OUTDIR_LMM_BF4}]" >> ${BFLMM}
echo "Observation.DataProducts.Output_IncoherentStokes.locations="\
- "[1*localhost:${OUTDIR}/lmm-bf1]" >> ${BFLMM}
+ "[1*localhost:${OUTDIR_LMM_BF1}]" >> ${BFLMM}
# Run reference: individual beamFormers
- runObservation.sh -A -F -l 1 ${BF1}
- runObservation.sh -A -F -l 1 ${BF2}
- runObservation.sh -A -F -l 1 ${BF3}
- runObservation.sh -A -F -l 1 ${BF4}
+ runObservation.sh -A -F -l 1 ${PARSET_BF1}
+ runObservation.sh -A -F -l 1 ${PARSET_BF2}
+ runObservation.sh -A -F -l 1 ${PARSET_BF3}
+ runObservation.sh -A -F -l 1 ${PARSET_BF4}
# Run LMM beamFormer
runObservation.sh -A -F -l 1 ${BFLMM}
# Examine the output
EXAMINE=${srcdir}/examine.py
- ${EXAMINE} -d ref-bf1 > ref-bf1.out || error "no output for ref-bf1"
- ${EXAMINE} -d ref-bf2 > ref-bf2.out || error "no output for ref-bf2"
- ${EXAMINE} -d ref-bf3 > ref-bf3.out || error "no output for ref-bf3"
- ${EXAMINE} -d ref-bf4 > ref-bf4.out || error "no output for ref-bf4"
- ${EXAMINE} -d lmm-bf1 > lmm-bf1.out || error "no output for lmm-bf1"
- ${EXAMINE} -d lmm-bf2 > lmm-bf2.out || error "no output for lmm-bf2"
- ${EXAMINE} -d lmm-bf3 > lmm-bf3.out || error "no output for lmm-bf3"
- ${EXAMINE} -d lmm-bf4 > lmm-bf4.out || error "no output for lmm-bf4"
+ OUT_REF_BF1=${TESTNAME}_ref_bf1.out
+ OUT_REF_BF2=${TESTNAME}_ref_bf2.out
+ OUT_REF_BF3=${TESTNAME}_ref_bf3.out
+ OUT_REF_BF4=${TESTNAME}_ref_bf4.out
+ OUT_LMM_BF1=${TESTNAME}_lmm_bf1.out
+ OUT_LMM_BF2=${TESTNAME}_lmm_bf2.out
+ OUT_LMM_BF3=${TESTNAME}_lmm_bf3.out
+ OUT_LMM_BF4=${TESTNAME}_lmm_bf4.out
+ ${EXAMINE} -d ${OUTDIR_REF_BF1} > ${OUT_REF_BF1} || error "no output for ref-bf1"
+ ${EXAMINE} -d ${OUTDIR_REF_BF2} > ${OUT_REF_BF2} || error "no output for ref-bf2"
+ ${EXAMINE} -d ${OUTDIR_REF_BF3} > ${OUT_REF_BF3} || error "no output for ref-bf3"
+ ${EXAMINE} -d ${OUTDIR_REF_BF4} > ${OUT_REF_BF4} || error "no output for ref-bf4"
+ ${EXAMINE} -d ${OUTDIR_LMM_BF1} > ${OUT_LMM_BF1} || error "no output for lmm-bf1"
+ ${EXAMINE} -d ${OUTDIR_LMM_BF2} > ${OUT_LMM_BF2} || error "no output for lmm-bf2"
+ ${EXAMINE} -d ${OUTDIR_LMM_BF3} > ${OUT_LMM_BF3} || error "no output for lmm-bf3"
+ ${EXAMINE} -d ${OUTDIR_LMM_BF4} > ${OUT_LMM_BF4} || error "no output for lmm-bf4"
# Compare the output
echo "Comparing output of BF1"
- diff ref-bf1.out lmm-bf1.out || error "output does not match"
+ diff ${OUT_REF_BF1} ${OUT_LMM_BF1} || error "output does not match"
echo "Comparing output of BF2"
- diff ref-bf2.out lmm-bf2.out || error "output does not match"
+ diff ${OUT_REF_BF2} ${OUT_LMM_BF2} || error "output does not match"
echo "Comparing output of BF3"
- diff ref-bf3.out lmm-bf3.out || error "output does not match"
+ diff ${OUT_REF_BF3} ${OUT_LMM_BF3} || error "output does not match"
echo "Comparing output of BF4"
- diff ref-bf4.out lmm-bf4.out || error "output does not match"
+ diff ${OUT_REF_BF4} ${OUT_LMM_BF4} || error "output does not match"
) || exit 1
\ No newline at end of file