diff --git a/applications/apertif/commissioning/central_commands.sh b/applications/apertif/commissioning/central_commands.sh index e296e4d66cab84d4b963b27647e233ff9e26ae11..b750533591e61a0e264d00e5e8ce2019a1278856 100755 --- a/applications/apertif/commissioning/central_commands.sh +++ b/applications/apertif/commissioning/central_commands.sh @@ -108,6 +108,8 @@ if [ "$APP" == "apertif" ]; then # IMAGE=/home/daniel/apertif_unb1_correlator_full-r17077.rbf # IMAGE=/home/kooistra/images/apertif_unb1_correlator_full-r17164.rbf # Erics image, 2 bit change to optimize quantisation in correlator (20 Jun 2017) IMAGE=/home/daniel/apertif_unb1_correlator_full-r17077.rbf # SR1 +elif [ "$APP" == "apertif-sr2.6" ]; then + IMAGE=/home/kooistra/images/apertif_unb1_correlator_full-r17164.rbf # SR2.5 elif [ "$APP" == "arts_sc1" ]; then IMAGE=/home/arts/arts_unb1_sc1-r16748.rbf elif [ "$APP" == "arts_sc4" ]; then @@ -266,7 +268,7 @@ fi # Set destination MAC/IP/Ports ############################################################################### UNBS2="${UNBS//,/ }" -if [ $APP == "apertif" ]; then +if [ ${APP:0:7} == "apertif" ]; then if [ "$DATAWRITER" == "wcudata1" ]; then DATAWRITER_ETH0_ETH_DST_MAC=$WCUDATA1_ETH0_ETH_DST_MAC DATAWRITER_ETH0_IP_DST_ADDR=$WCUDATA1_ETH0_IP_DST_ADDR @@ -361,7 +363,7 @@ fi ############################################################################### # Enable output streams NOTE - temporary not outputting to ARTS0 (absent network) ############################################################################### -if [ $APP == "apertif" ]; then +if [ ${APP:0:7} == "apertif" ]; then # Enable all output of all correlator uniboards python $UPE/peripherals/util_dp_xonoff.py --unb $UNBS --fn 0:3 --bn 0:3 -s OUTPUT -n 2 elif [ $APP == "arts_sc1" ]; then diff --git a/applications/apertif/commissioning/dish_commands.sh b/applications/apertif/commissioning/dish_commands.sh index 1a9eb62cd42b4a8f34e34c0417695d4406b442a1..e2f588461edf451d29f9517ec8c36143f900553c 100755 --- a/applications/apertif/commissioning/dish_commands.sh +++ b/applications/apertif/commissioning/dish_commands.sh @@ -71,8 +71,11 @@ IMAGE_BF=/home/kooistra/images/apertif_unb1_fn_beamformer_trans-r16510_v2.rbf if [ "$APP" == "apertif" ]; then # IMAGE_FB=/home/kooistra/images/apertif_unb1_bn_filterbank-r17352.rbf # with PPS delay compensation # IMAGE_BF=/home/kooistra/images/apertif_unb1_fn_beamformer_trans-r17352.rbf # with Fiber delay compensation -# IMAGE_FB=/home/kooistra/images/apertif_unb1_bn_filterbank-r16579.rbf # SR1 - IMAGE_BF=/home/daniel/apertif_unb1_fn_beamformer_trans-r17128.rbf # SR1 + IMAGE_FB=/home/kooistra/images/apertif_unb1_bn_filterbank-r16579.rbf # SR2.0 + IMAGE_BF=/home/daniel/apertif_unb1_fn_beamformer_trans-r17128.rbf # SR2.0 +elif [ "$APP" == "apertif-sr2.6" ]; then + IMAGE_FB=/home/kooistra/images/apertif_unb1_bn_filterbank-r17352.rbf # SR2.2 + IMAGE_BF=/home/kooistra/images/apertif_unb1_fn_beamformer_trans-r17352.rbf # SR2.3 elif [ "$APP" == "arts_sc1" ]; then # IMAGE_BF=$RADIOHDL/applications/arts/commissioning/sc1/apertif_unb1_fn_beamformer_base-r16106.rbf # Augus 8: Yogesh conformed SC1 works with below image + transpose switch enabled. diff --git a/applications/apertif/commissioning/main.py b/applications/apertif/commissioning/main.py index 7655e3a973e78d1f282ce5d28f8051879e104b6f..59fcb38dccf9a9890beecf8398b019fe8c302c2f 100644 --- a/applications/apertif/commissioning/main.py +++ b/applications/apertif/commissioning/main.py @@ -28,7 +28,7 @@ # data streams # Usage: # . python main.py --app <application> --tel <telescopes> --unb <uniboards> --opt <options> -# . application = "apertif" or "arts_sc1" +# . application = "apertif", "apertif-sr2.6" or "arts_sc1" # . telescopes = 2,3,4,..,c,d # . unb = bands = 0,1,2,..15 # . options = noflash (optional, debug/development only)