Changes
Page history
Update Configuration Files Diff
authored
Apr 04, 2023
by
Martin Beroiz
Show whitespace changes
Inline
Side-by-side
Configuration-Files-Diff.md
View page @
c4954df2
TBD
\ No newline at end of file
# Diff between site/modes
## `monitor` vs `redundant` (same site: LLO)
Command:
`git diff --no-index --diff-filter=da mode-monitor mode-redundant`
```
shell
diff
--git
a/mode-monitor/pars/L-DQ+Gate_O3.json b/mode-redundant/pars/L-DQ+Gate_O3R.json
similarity index 100%
rename from mode-monitor/pars/L-DQ+Gate_O3.json
rename to mode-redundant/pars/L-DQ+Gate_O3R.json
diff
--git
a/mode-monitor/pars/L-DQmod_O3.json b/mode-redundant/pars/L-DQmod_O3R.json
similarity index 100%
rename from mode-monitor/pars/L-DQmod_O3.json
rename to mode-redundant/pars/L-DQmod_O3R.json
diff
--git
a/mode-monitor/procmgt/LLO_MonitorDQ_Initial b/mode-redundant/procmgt/LLO_RedundantDQ_Initial
similarity index 58%
rename from mode-monitor/procmgt/LLO_MonitorDQ_Initial
rename to mode-redundant/procmgt/LLO_RedundantDQ_Initial
index da9c07a..08eb939 100644
---
a/mode-monitor/procmgt/LLO_MonitorDQ_Initial
+++ b/mode-redundant/procmgt/LLO_RedundantDQ_Initial
@@
-1
,19 +1,19 @@
#
-# File:
$prefix
/procmgt/LLO_Monitor_Initial
+# File:
$prefix
/procmgt/LLO_RedundantDQ_Initial
#
# Purpose: This file contains the default environment variables
# for processes to be run under the process manager
-#
(
procmgt
)
on LLO DMT nodes l1dmt<n>.
+#
(
procmgt
)
on the redundant LLO node l1dmt2.
#
# Used by: procmgt
#
# Author: John G. Zweizig
#
-# Version: 3.1
+# Version: 2.1
#
# Date: 12-Feb-2019
#
-DMTHOME
/home/dmtexec/mode-monitor
+DMTHOME /home/dmtexec/mode-redundant
DMTVERSION
DMTIFOS
"L0 L1"
LIGOSITE LLO
@@
-23
,19 +23,21 @@ SMPBUFFCNT 128
RECV1PART LLO_Receive1
RECV2PART LLO_Receive2
RECVBUFFCNT 8
-DQGATEPART
LLO_DQGATE
-DQGATEBUFFLEN
100000
-DQGATEBUFFCNT
64
+DQGATEPART LLO_DQGATE
+DQGATEBUFFLEN 100000
+DQGATEBUFFCNT 64
HOFTSMPART LLO_hoft
-HOFTBUFFLEN
1000000
-HOFTBUFFCNT
32
-IDQPART
LLO_IDQ
+HOFTBUFFLEN 2000000
+HOFTBUFFCNT 16
+IDQPART LLO_IDQ
IDQBUFFLEN 100000
IDQBUFFCNT 32
-DQHOFTPART
LLO_DMTDQ
-DQHOFTBUFFLEN
1000000
-DQHOFTBUFFCNT
64
-DMTCOMNODE
l1dmt1
+DQHOFTPART LLO_DMTDQ
+DQHOFTBUFFLEN 1000000
+DQHOFTBUFFCNT 64
+DMTCOMNODE l1dmt2
+#
+# Note that the standard segment server name
(
ldas.ligo...
)
was changed 2/09
# DMTSEGSERVER segdb.ligo-la.caltech.edu
#
DMTINPUT /online/
$LIGOSMPART
@@
-47
,15 +49,15 @@ CALIBCONFIG /home/calibration/ifo/L1
#
# IP address of the frame broadcaster
# Note: DpushM uses this to find the broadcast interface
-LIGONDSIP
10.103.0.1
+LIGONDSIP 10.103.0.0
LOWLATENCY_HOST lowlatency-direct
GDSAPACHE /gds/dmt/html/gds
-PATH
/home/dmtexec/mode-monitor/bin:
$HOME
/bin:/usr/bin:/bin
-LD_LIBRARY_PATH
/home/dmtexec/mode-monitor/lib:
-DMTNAMESERVER
l1dmt1:23456
+PATH /home/dmtexec/mode-redundant/bin:
$HOME
/bin:/usr/bin:/bin
+LD_LIBRARY_PATH /home/dmtexec/mode-redundant/lib:
+DMTNAMESERVER l1dmt2:23456
DMTRENDIR /gds/dmt/trends
DMTRIGDIR /gds/dmt/triggers
-EWLINK_PORT
lowlatency.ligo.caltech.edu:31212
+DMTFRAMEDIR /gds/dmt/frames
TEMPLATE_TREND_SUBDIR
"L-M-%6r"
DMT_IGNORE_NAN 1
#
diff
--git
a/mode-monitor/procmgt/LLO_MonitorDQ_Start b/mode-redundant/procmgt/LLO_RedundantDQ_Start
similarity index 81%
rename from mode-monitor/procmgt/LLO_MonitorDQ_Start
rename to mode-redundant/procmgt/LLO_RedundantDQ_Start
index ad626cb..82cd323 100644
---
a/mode-monitor/procmgt/LLO_MonitorDQ_Start
+++ b/mode-redundant/procmgt/LLO_RedundantDQ_Start
@@
-1
,5 +1,5 @@
#
-# File: dmt-runtime-configuration/aLigo/LLO_Monitor_Start
+# File: dmt-runtime-configuration/aLigo/LLO_Redundant_Start.l1dmt2
#
# Installed: $prefix/procmgt
#
@@
-10
,13 +10,12 @@
#
# Author: John G. Zweizig
#
-# Version: aLigo LHO dual-broadcaster version.
-# Combined h
(
t
)
+
comm
nodes
+# Version: aLigo LHO dual-broadcaster version.
#
# Date: 21-Mar-2023
#
#----------------------------- Remove any Trigger processes
--wait
trigRmNode
$HOST
+#-wait trigRmNode
$HOST
#
#----------------------------- Receiver shared memory
-wait
smrepair
$RECV1PART
@@
-28
,7 +27,7 @@
-hup
FrTest
-p
$RECV2PART
#
#----------------------------- Initialize the shared memory
--wait
smrepair
+-wait smrepair
$LIGOSMPART
-wait
smcreate
$LIGOSMPART
-nbuf
$SMPBUFFCNT
-lbuf
$SMPBUFFLEN
-hup
FrTest
-p
$LIGOSMPART
#
@@
-37
,7 +36,7 @@
-wait
smcreate
$DQGATEPART
-nbuf
$DQGATEBUFFCNT
-lbuf
$DQGATEBUFFLEN
-hup
FrTest
-p
$DQGATEPART
#
-#----------------------------- Initialize the h
(
t
)
shared memory
+#----------------------------- Initialize the shared memory
-wait
smrepair
$HOFTSMPART
-wait
smcreate
$HOFTSMPART
-nbuf
$HOFTBUFFCNT
-lbuf
$HOFTBUFFLEN
-hup
FrTest
-p
$HOFTSMPART
@@
-47
,7 +46,7 @@
-wait
smcreate
$IDQPART
-nbuf
$IDQBUFFCNT
-lbuf
$IDQBUFFLEN
-hup
FrTest
-p
$IDQPART
#
-#----------------------------- Initialize the DQ shared memory
+#----------------------------- Initialize the shared memory
-wait
smrepair
$DQHOFTPART
-wait
smcreate
$DQHOFTPART
-nbuf
$DQHOFTBUFFCNT
-lbuf
$DQHOFTBUFFLEN
-hup
FrTest
-p
$DQHOFTPART
```
\ No newline at end of file
