From 38b5cba700f9d2fa89f908baddcf0bb1db6fd36c Mon Sep 17 00:00:00 2001
From: Tamas Gal <himself@tamasgal.com>
Date: Thu, 22 Mar 2018 08:19:40 +0100
Subject: [PATCH] Add detector id
---
Makefile.in | 4 ++--
configure | 10 +++++++++-
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index c209b17..e0b15dc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -41,9 +41,9 @@ start:
@tmux new-window -n doms -t ${SESSION_NAME}
@tmux split-window -v -t ${SESSION_NAME}:doms
@tmux send-keys -t ${SESSION_NAME}:doms.1 \
- "python scripts/dom_activity.py" Enter
+ "python scripts/dom_activity.py -d ${DETECTOR_ID}" Enter
@tmux send-keys -t ${SESSION_NAME}:doms.2 \
- "python scripts/dom_rates.py" Enter
+ "python scripts/dom_rates.py -d ${DETECTOR_ID}" Enter
@tmux select-layout even-vertical
diff --git a/configure b/configure
index fdec0a4..2044bc4 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,6 @@
#!/bin/sh
+detector_id=29
daq_ligier_ip="192.168.0.110"
daq_ligier_port=5553
monitoring_ligier_ip="127.0.0.1"
@@ -20,6 +21,10 @@ show_km3mon_banner()
for arg in "$@"; do
case "$arg" in
+ --detector-id=*)
+ detector_id=`echo $arg | sed 's/--detector-id=//'`
+ ;;
+
--daq-ligier-ip=*)
daq_ligier_ip=`echo $arg | sed 's/--daq-ligier-ip=//'`
;;
@@ -45,6 +50,7 @@ for arg in "$@"; do
echo 'Usage: ./configure [options]'
echo
echo ' OPTION DESCRIPTION DEFAULT'
+ echo " --detector-id Detector ID ${detector_id}"
echo " --daq-ligier-ip DAQ Ligier ${daq_ligier_ip}"
echo " --daq-ligier-port Port of the DAQ Ligier ${daq_ligier_port}"
echo " --monitoring-ligier-port Port of the monitoring Ligier ${monitoring_ligier_port}"
@@ -57,7 +63,8 @@ for arg in "$@"; do
esac
done
-echo "DAQ_LIGIER_IP = ${daq_ligier_ip}" > Makefile
+echo "DETECTOR_ID = ${detector_id}" > Makefile
+echo "DAQ_LIGIER_IP = ${daq_ligier_ip}" >> Makefile
echo "DAQ_LIGIER_PORT = ${daq_ligier_port}" >> Makefile
echo "MONITORING_LIGIER_PORT = ${monitoring_ligier_port}" >> Makefile
echo "WEBSERVER_PORT = ${webserver_port}" >> Makefile
@@ -66,6 +73,7 @@ echo "SESSION_NAME = ${tmux_session_name}" >> Makefile
cat Makefile.in >> Makefile
show_km3mon_banner
+echo "Detector ID: ${detector_id}"
echo "DAQ Ligier: ${daq_ligier_ip}:${daq_ligier_port}"
echo "Monitoring Ligier: ${monitoring_ligier_ip}:${monitoring_ligier_port}"
echo "Webserver: 0.0.0.0:${webserver_port}"
--
GitLab