From c39e84a3678123cdceb4429f0a0211927c9a1117 Mon Sep 17 00:00:00 2001
From: tj710 <tom.james10@imperial.ac.uk>
Date: Fri, 3 Jun 2022 10:15:13 +0100
Subject: [PATCH] updated config parameters to work at p5 (#44)
Updated config parameters to work at p5
Co-authored-by: Thomas Owen James <tjames@cmd-scouting-ctrlhub.dyndns.cern.ch>
---
etc/scdaq/scdaq.conf | 11 +++++++----
scripts/run.sh | 2 +-
src/scdaq-gmt.conf | 2 +-
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/etc/scdaq/scdaq.conf b/etc/scdaq/scdaq.conf
index 214df555..6f93985c 100644
--- a/etc/scdaq/scdaq.conf
+++ b/etc/scdaq/scdaq.conf
@@ -25,6 +25,8 @@ dma_number_of_packet_buffers:1000
# Print report each N packets, use 0 to disable
packets_per_report:200000
+# number of orbits per DMA packet, in decimal
+NOrbitsPerDMAPacket:20
## Extra settings for "filedma" input
@@ -47,10 +49,10 @@ enable_stream_processor:yes
# Note: When changing the processing type, change also "output_filename_prefix"
# in the file output section.
#
-processor_type:PASS_THROUGH
+#processor_type:GMT
# Enable software zero-supression
-doZS:no
+doZS:yes
################################################################################
@@ -59,9 +61,10 @@ doZS:no
##
################################################################################
-output_filename_prefix:scout_pass_through
+#output_filename_prefix:scout_GMT
+
+#output_filename_base:/fff/BU0/ramdisk/scdaq
-output_filename_base:/fff/BU0/ramdisk/scdaq
max_file_size:8589934592
# Always write data to a file regardless of the run status, useful for debugging
diff --git a/scripts/run.sh b/scripts/run.sh
index 2500761d..7a2675d6 100755
--- a/scripts/run.sh
+++ b/scripts/run.sh
@@ -14,7 +14,7 @@ umask 000 # Files and folders we create should be world accessible
while true
do
echo "Starting scdaq..."
- /opt/scdaq/bin/scdaq /etc/scdaq/scdaq.conf 2>&1 | logger --tag scdaq --id -p user.debug
+ /opt/scdaq/bin/scdaq --config /etc/scdaq/scdaq.conf 2>&1 | logger --tag scdaq --id -p user.debug
echo "Resetting the board..."
../scripts/reset-firmware.sh
echo "Clearing caches..."
diff --git a/src/scdaq-gmt.conf b/src/scdaq-gmt.conf
index ad56e5c4..be558d90 100644
--- a/src/scdaq-gmt.conf
+++ b/src/scdaq-gmt.conf
@@ -61,7 +61,7 @@ doZS:yes
##
################################################################################
-output_filename_prefix:scout_gmt
+output_filename_prefix:scout_GMT
output_filename_base:/fff/BU0/ramdisk/scdaq
max_file_size:8589934592
--
GitLab