FST: Correct treadment of NTIMEFRAMES, add DD_STARTUP_DELAY setting

Author: davidrohr

prodtests/full-system-test/datadistribution.sh

@@ -10,20 +10,31 @@ fi
 
 # For benchmark only, do NOT copy&paste!
 export DATADIST_SHM_DELAY=30
-export DATADIST_FILE_READ_COUNT=$NTIMEFRAMES
 
-export TF_DIR=./raw/timeframe
+if [ ! -z $DD_STARTUP_DELAY ]; then
+  sleep $DD_STARTUP_DELAY
+fi
+
+if [ -z $INPUT_FILE_LIST ]; then
+  DD_INPUT_CMD="--data-source-dir ./raw/timeframe"
+else
+  DD_INPUT_CMD="--data-source-copy-cmd=\"XrdSecPROTOCOL=sss,unix xrdcp -N root://eosaliceo2.cern.ch/?src ?dst\" --data-source-file-list $INPUT_FILE_LIST"
+fi
+
+if [ $NTIMEFRAMES != -1 ]; then
+  export DATADIST_FILE_READ_COUNT=$NTIMEFRAMES
+  DD_INPUT_CMD+=" --data-source-repeat"
+fi
 export TFRATE=$(awk "BEGIN {printf \"%.6f\",1/$TFDELAY}")
 
 ARGS_ALL="--session default --severity $SEVERITY --shm-segment-id 2 --shm-segment-size 1000000 --no-cleanup"
 
 StfBuilder --id stfb --transport shmem \
   --dpl-channel-name dpl-chan --channel-config "name=dpl-chan,type=push,method=bind,address=ipc://@$INRAWCHANNAME,transport=shmem,rateLogging=1" \
-  --data-source-dir ${TF_DIR} \
+  $DD_INPUT_CMD \
   --data-source-rate=${TFRATE} \
-  --data-source-repeat \
   --data-source-regionsize=${DDSHMSIZE} \
-  --data-source-headersize=1024 \
+  --data-source-headersize=2048 \
   --data-source-enable \
   --data-source-preread 5 \
   --shm-no-cleanup on \

prodtests/full-system-test/dpl-workflow.sh

@@ -286,13 +286,15 @@ if [ $CTFINPUT == 1 ]; then
   if [[ -z $CTFName && $WORKFLOWMODE == "print" ]]; then
     CTFName='$CTFName'
   fi
-  WORKFLOW="o2-ctf-reader-workflow $ARGS_ALL --configKeyValues \"$ARGS_ALL_CONFIG\" --delay $TFDELAY --loop $TFLOOP --max-tf $NTIMEFRAMES --ctf-input ${CTFName} --ctf-dict ${CTF_DICT} --onlyDet $WORKFLOW_DETECTORS --pipeline tpc-entropy-decoder:$N_TPCENTDEC | "
+  if [ $NTIMEFRAMES == -1 ]; then NTIMEFRAMES_CMD= ; else NTIMEFRAMES_CMD="--max-tf $NTIMEFRAMES"; fi
+  WORKFLOW="o2-ctf-reader-workflow $ARGS_ALL --configKeyValues \"$ARGS_ALL_CONFIG\" --delay $TFDELAY --loop $TFLOOP $NTIMEFRAMES_CMD --ctf-input ${CTFName} --ctf-dict ${CTF_DICT} --onlyDet $WORKFLOW_DETECTORS --pipeline tpc-entropy-decoder:$N_TPCENTDEC | "
 elif [ $RAWTFINPUT == 1 ]; then
   TFName=`ls -t $FILEWORKDIR/o2_*.tf 2> /dev/null | head -n1`
   if [[ -z $TFName && $WORKFLOWMODE == "print" ]]; then
     TFName='$TFName'
   fi
-  WORKFLOW="o2-raw-tf-reader-workflow $ARGS_ALL --configKeyValues \"$ARGS_ALL_CONFIG\" --delay $TFDELAY --loop $TFLOOP --max-tf $NTIMEFRAMES --input-data ${TFName} --onlyDet $WORKFLOW_DETECTORS | "
+  if [ $NTIMEFRAMES == -1 ]; then NTIMEFRAMES_CMD= ; else NTIMEFRAMES_CMD="--max-tf $NTIMEFRAMES"; fi
+  WORKFLOW="o2-raw-tf-reader-workflow $ARGS_ALL --configKeyValues \"$ARGS_ALL_CONFIG\" --delay $TFDELAY --loop $TFLOOP $NTIMEFRAMES_CMD --input-data ${TFName} --onlyDet $WORKFLOW_DETECTORS | "
 elif [ $EXTINPUT == 1 ]; then
   PROXY_CHANNEL="name=readout-proxy,type=pull,method=connect,address=ipc://@$INRAWCHANNAME,transport=shmem,rateLogging=0"
   PROXY_INSPEC="dd:FLP/DISTSUBTIMEFRAME/0;eos:***/INFORMATION"
@@ -325,7 +327,8 @@ elif [ $EXTINPUT == 1 ]; then
   done
   WORKFLOW="o2-dpl-raw-proxy $ARGS_ALL --dataspec \"$PROXY_INSPEC\" --channel-config \"$PROXY_CHANNEL\" | "
 else
-  WORKFLOW="o2-raw-file-reader-workflow --detect-tf0 $ARGS_ALL --configKeyValues \"$ARGS_ALL_CONFIG;HBFUtils.nHBFPerTF=$NHBPERTF;\" --delay $TFDELAY --loop $NTIMEFRAMES --max-tf 0 --input-conf $FILEWORKDIR/rawAll.cfg | "
+  if [ $NTIMEFRAMES == -1 ]; then NTIMEFRAMES_CMD= ; else NTIMEFRAMES_CMD="--loop $NTIMEFRAMES"; fi
+  WORKFLOW="o2-raw-file-reader-workflow --detect-tf0 $ARGS_ALL --configKeyValues \"$ARGS_ALL_CONFIG;HBFUtils.nHBFPerTF=$NHBPERTF;\" --delay $TFDELAY $NTIMEFRAMES_CMD --max-tf 0 --input-conf $FILEWORKDIR/rawAll.cfg | "
 fi
 
 # ---------------------------------------------------------------------------------------------------------------------