From 168f910e2853bb59318b113756eca13b1d032a2b Mon Sep 17 00:00:00 2001
From: David Rohr <drohr@jwdt.org>
Date: Tue, 16 Jan 2024 13:14:30 +0100
Subject: [PATCH] FST: Use new CTF coding by default

---
 prodtests/full-system-test/dpl-workflow.sh | 5 ++---
 prodtests/full-system-test/start_tmux.sh   | 1 -
 prodtests/full_system_test.sh              | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/prodtests/full-system-test/dpl-workflow.sh b/prodtests/full-system-test/dpl-workflow.sh
index 684008b7681fc..ed3d384f8f30e 100755
--- a/prodtests/full-system-test/dpl-workflow.sh
+++ b/prodtests/full-system-test/dpl-workflow.sh
@@ -30,10 +30,9 @@ fi
 : ${CTF_FREE_DISK_WAIT:="10"}         # if disk on EPNs is close to full, wait X seconds before retrying to write
 : ${CTF_MAX_FREE_DISK_WAIT:="600"}    # if not enough disk space after this time throw error
 
-# entropy encoding/decoding mode, default "" is equivalent to '--ans-version compat' (compatible with < 09/2023 data),
+# entropy encoding/decoding mode, '' is equivalent to '--ans-version compat' (compatible with < 09/2023 data),
 # use '--ans-version 1.0 --ctf-dict none' for the new per-TF dictionary mode
-[[ $EPNSYNCMODE == 1 && -z ${RANS_OPT:-} ]] && RANS_OPT="--ans-version 1.0 --ctf-dict none"
-: ${RANS_OPT:=""}
+: ${RANS_OPT:="--ans-version 1.0 --ctf-dict none"}
 
 workflow_has_parameter CTF && export SAVECTF=1
 workflow_has_parameter GPU && { export GPUTYPE=HIP; export NGPUS=4; }
diff --git a/prodtests/full-system-test/start_tmux.sh b/prodtests/full-system-test/start_tmux.sh
index 9c1a6e1a473ef..e56514196afe3 100755
--- a/prodtests/full-system-test/start_tmux.sh
+++ b/prodtests/full-system-test/start_tmux.sh
@@ -53,7 +53,6 @@ export SYNCMODE=1
 export SHMTHROW=0
 export IS_SIMULATED_DATA=1
 export DATADIST_NEW_DPL_CHAN=1
-export RANS_OPT="--ans-version 1.0 --ctf-dict none" # Use new RANS coding scheme without dictionary
 
 [[ -z $GEN_TOPO_MYDIR ]] && GEN_TOPO_MYDIR="$(dirname $(realpath $0))"
 source $GEN_TOPO_MYDIR/setenv.sh || { echo "setenv.sh failed" 1>&2 && exit 1; }
diff --git a/prodtests/full_system_test.sh b/prodtests/full_system_test.sh
index 5a3b3a86b1d5b..f1c40f4194143 100755
--- a/prodtests/full_system_test.sh
+++ b/prodtests/full_system_test.sh
@@ -198,7 +198,7 @@ if [[ $ENABLE_GPU_TEST != "0" ]]; then
 fi
 STAGES+=" ASYNC"
 
-if [[ ! $RANS_OPT =~ (--ctf-dict +)(none) ]] ; then
+if [[ ${RANS_OPT:-} =~ (--ans-version +)(compat) ]] ; then
   # Give a possibility to run the FST with external existing dictionary (i.e. with CREATECTFDICT=0 full_system_test.sh)
   # In order to use CCDB dictionaries, pass CTFDICTFILE=ccdb CREATECTFDICT=0
   [[ ! -z "$CREATECTFDICT" ]] && SYNCMODEDOCTFDICT="$CREATECTFDICT" || SYNCMODEDOCTFDICT=1