Skip to content

Changes

Page history
Update Configuration Files Diff authored by Martin Beroiz's avatar Martin Beroiz
Show whitespace changes
Inline Side-by-side
Configuration-Files-Diff.md
View page @ 5712e872
# Diff between site/modes
TOC
- [monitor vs redundant](#monitor-vs-redundant)
- [monitor vs test](#monitor-vs-test)
## `monitor` vs `redundant`
This is for the same site: LLO
......@@ -200,3 +205,406 @@ index ad626cb..82cd323 100644
-wait smcreate $DQHOFTPART -nbuf $DQHOFTBUFFCNT -lbuf $DQHOFTBUFFLEN
-hup FrTest -p $DQHOFTPART
```
## `monitor` vs `test`
Command: `diff -qr mode-monitor/ mode-test/`
```shell
L-DQ+Gate_O3.json -> L-DQ+Gate_O3T.json
L-DQmod_O3.json -> L-DQmod_O3T.json
L1-HOFT_OMEGA.cfg -> L1-HOFT_OMEGA_TEST.cfg
ReferenceCalibration_hoft_L1.xml -> ReferenceCalibration_hoft_L1_T.xml
LLO_MonitorDQ_Initial -> LLO_TestDQ_Initial
LLO_MonitorDQ_Run.l1dmt1 -> LLO_TestDQ_Run.l1dmt3
LLO_MonitorDQ_Start -> LLO_TestDQ_Start
--------
Only in mode-monitor/pars: EndTimes_L1.cfg
Only in mode-monitor/pars: LLO_SEI_blrms.conf
Only in mode-monitor/pars: LockLoss.osc
Only in mode-monitor/pars: PlaneMon_LLO.conf
Only in mode-monitor/pars: ReferenceCalibrationDarmCal_L1.xml
Only in mode-monitor/pars: STS_Seis_Blrms.filter
Only in mode-monitor/pars: SegGener_GRD_LLO.cnf
Only in mode-monitor/pars: SegGener_GRD_LLO.osc
Only in mode-monitor/pars: SegGener_HWINJ_LLO.cnf
Only in mode-monitor/pars: SegGener_HWINJ_LLO.osc
Only in mode-monitor/pars: SegGener_IOS_LLO.cnf
Only in mode-monitor/pars: SegGener_IOS_LLO.osc
Only in mode-monitor/pars: SegGener_LLO.cnf
Only in mode-monitor/pars: SegGener_LLO.osc
Only in mode-monitor/pars: SegGener_LSC_LLO.cnf
Only in mode-monitor/pars: SegGener_LSC_LLO.osc
Only in mode-monitor/pars: SegGener_PEM_LLO.cnf
Only in mode-monitor/pars: SegGener_PEM_LLO.osc
Only in mode-monitor/pars: SenseMonitor_BBH_30_30_L1.conf
Only in mode-monitor/pars: SenseMonitor_CAL_L1.conf
Only in mode-monitor/pars: SenseMonitor_hoft_L1.conf
Only in mode-test/pars: SenseMonitor_hoft_L1_T.conf
Only in mode-monitor/pars: TrigStream_LLO.cfg
Only in mode-test/pars: TrigTStream_LLO.cfg
Only in mode-monitor/pars: asq_set.filter
Only in mode-monitor/pars: blrms_ifo_LLO.conf
Only in mode-monitor/pars: blrmsconfig_LLO.conf
Only in mode-monitor/pars: dvTest_O3_LLO.cfg
Only in mode-monitor/pars: half_decade_set_2.filter
Only in mode-monitor/pars: half_decade_set_3.filter
Only in mode-monitor/pars: hoft_dq_flags.osc
Only in mode-test/pars: hoft_dq_flags_T.osc
Only in mode-monitor/pars: l1_locked.osc
```
Command: `git diff --no-index --diff-filter=da mode-monitor mode-test`
```shell
diff --git a/mode-monitor/pars/L-DQ+Gate_O3.json b/mode-test/pars/L-DQ+Gate_O3T.json
similarity index 100%
rename from mode-monitor/pars/L-DQ+Gate_O3.json
rename to mode-test/pars/L-DQ+Gate_O3T.json
diff --git a/mode-monitor/pars/L-DQmod_O3.json b/mode-test/pars/L-DQmod_O3T.json
similarity index 53%
rename from mode-monitor/pars/L-DQmod_O3.json
rename to mode-test/pars/L-DQmod_O3T.json
index 4ad460c..6badfc9 100644
--- a/mode-monitor/pars/L-DQmod_O3.json
+++ b/mode-test/pars/L-DQmod_O3T.json
@@ -1,10 +1,10 @@
{
- "config-version" : "LLO O3 DQ configuration $Id$",
+ "config-version" : "LLO O2 DQ configuration $Id$",
"stride" : 1.0,
"flag_step" : 0.0625,
"write_path" : "/online/LLO_DMTDQ",
"compression" : "zero-suppress-or-gzip",
- "timeout" : 12,
+ "timeout" : 10,
"input_flags" : [false, false, true],
"filters" : [
{"name" : "multiply",
@@ -19,36 +19,36 @@
}
],
"copy_channels" : [
- "1/L1:GDS-CALIB_F_CC",
- "1/L1:GDS-CALIB_F_CC_NOGATE",
- "1/L1:GDS-CALIB_F_S_SQUARED",
- "1/L1:GDS-CALIB_F_S_SQUARED_NOGATE",
- "1/L1:GDS-CALIB_KAPPA_C",
- "1/L1:GDS-CALIB_KAPPA_C_NOGATE",
- "1/L1:GDS-CALIB_KAPPA_PUM_IMAGINARY",
- "1/L1:GDS-CALIB_KAPPA_PUM_IMAGINARY_NOGATE",
- "1/L1:GDS-CALIB_KAPPA_PUM_REAL",
- "1/L1:GDS-CALIB_KAPPA_PUM_REAL_NOGATE",
- "1/L1:GDS-CALIB_KAPPA_TST_IMAGINARY",
- "1/L1:GDS-CALIB_KAPPA_TST_IMAGINARY_NOGATE",
- "1/L1:GDS-CALIB_KAPPA_TST_REAL",
- "1/L1:GDS-CALIB_KAPPA_TST_REAL_NOGATE",
- "1/L1:GDS-CALIB_KAPPA_UIM_IMAGINARY",
- "1/L1:GDS-CALIB_KAPPA_UIM_IMAGINARY_NOGATE",
- "1/L1:GDS-CALIB_KAPPA_UIM_REAL",
- "1/L1:GDS-CALIB_KAPPA_UIM_REAL_NOGATE",
- "1/L1:GDS-CALIB_SRC_Q_INVERSE",
- "1/L1:GDS-CALIB_SRC_Q_INVERSE_NOGATE",
- "1/L1:GDS-CALIB_STATE_VECTOR",
- "1/L1:GDS-CALIB_STRAIN",
- "1/L1:GDS-CALIB_STRAIN_NOLINES",
+ "1/L1:GDS-CALIB_F_CC_TEST",
+ "1/L1:GDS-CALIB_F_CC_NOGATE_TEST",
+ "1/L1:GDS-CALIB_F_S_SQUARED_TEST",
+ "1/L1:GDS-CALIB_F_S_SQUARED_NOGATE_TEST",
+ "1/L1:GDS-CALIB_KAPPA_C_TEST",
+ "1/L1:GDS-CALIB_KAPPA_C_NOGATE_TEST",
+ "1/L1:GDS-CALIB_KAPPA_PUM_IMAGINARY_TEST",
+ "1/L1:GDS-CALIB_KAPPA_PUM_IMAGINARY_NOGATE_TEST",
+ "1/L1:GDS-CALIB_KAPPA_PUM_REAL_TEST",
+ "1/L1:GDS-CALIB_KAPPA_PUM_REAL_NOGATE_TEST",
+ "1/L1:GDS-CALIB_KAPPA_TST_IMAGINARY_TEST",
+ "1/L1:GDS-CALIB_KAPPA_TST_IMAGINARY_NOGATE_TEST",
+ "1/L1:GDS-CALIB_KAPPA_TST_REAL_TEST",
+ "1/L1:GDS-CALIB_KAPPA_TST_REAL_NOGATE_TEST",
+ "1/L1:GDS-CALIB_KAPPA_UIM_IMAGINARY_TEST",
+ "1/L1:GDS-CALIB_KAPPA_UIM_IMAGINARY_NOGATE_TEST",
+ "1/L1:GDS-CALIB_KAPPA_UIM_REAL_TEST",
+ "1/L1:GDS-CALIB_KAPPA_UIM_REAL_NOGATE_TEST",
+ "1/L1:GDS-CALIB_SRC_Q_INVERSE_TEST",
+ "1/L1:GDS-CALIB_SRC_Q_INVERSE_NOGATE_TEST",
+ "1/L1:GDS-CALIB_STATE_VECTOR_TEST",
+ "1/L1:GDS-CALIB_STRAIN_TEST",
+ "1/L1:GDS-CALIB_STRAIN_NOLINES_TEST",
"0/L1:DMT-DQ_VECTOR",
"0/L1:DMT-DQ_VECTOR_GATED"
],
"processed-channels" : [
{"name" : "L1:GDS-GATED_STRAIN",
"filter" : "multiply",
- "x-input" : "1/L1:GDS-CALIB_STRAIN_NOLINES",
+ "x-input" : "1/L1:GDS-CALIB_STRAIN_NOLINES_TEST",
"y-input" : "0/L1:GDS-STRAIN_GATE"
},
{"name" : "L1:IDQ-OK_OVL_10_2048",
diff --git a/mode-monitor/pars/L1-HOFT_OMEGA.cfg b/mode-test/pars/L1-HOFT_OMEGA_TEST.cfg
similarity index 96%
rename from mode-monitor/pars/L1-HOFT_OMEGA.cfg
rename to mode-test/pars/L1-HOFT_OMEGA_TEST.cfg
index 53fa3c2..4b9c8e4 100644
--- a/mode-monitor/pars/L1-HOFT_OMEGA.cfg
+++ b/mode-test/pars/L1-HOFT_OMEGA_TEST.cfg
@@ -26,7 +26,7 @@ default {
triggerFormat: 'xml'
}
imc_16kHz {
- channelNames: {"L1:GDS-CALIB_STRAIN"}
+ channelNames: {"L1:GDS-CALIB_STRAIN_TEST"}
frameTypes: {"LLO_hoft"}
stateNames: {"L1:GRD-ISC_LOCK_OK"}
stateTypes: {"LLO_Online"}
diff --git a/mode-monitor/pars/ReferenceCalibration_hoft_L1.xml b/mode-test/pars/ReferenceCalibration_hoft_L1_T.xml
similarity index 57%
rename from mode-monitor/pars/ReferenceCalibration_hoft_L1.xml
rename to mode-test/pars/ReferenceCalibration_hoft_L1_T.xml
index 0a92c3a..b401784 100644
--- a/mode-monitor/pars/ReferenceCalibration_hoft_L1.xml
+++ b/mode-test/pars/ReferenceCalibration_hoft_L1_T.xml
@@ -2,7 +2,7 @@
<!DOCTYPE LIGO_LW SYSTEM "http://ldas-sw.ligo.caltech.edu/doc/ligolwAPI/html/ligolw_dtd.txt">
<LIGO_LW>
<LIGO_LW>
- <Param Name="Channel">L1:GDS-CALIB_STRAIN</Param>
+ <Param Name="Channel">L1:GDS-CALIB_STRAIN_TEST</Param>
<Param Name="Comment">L1 hoft unit calibration</Param>
<Time Name="StartTime" Type="GPS">800000000</Time>
<Param Name="Duration" Type="double">1000000000</Param>
@@ -10,74 +10,74 @@
<Dim Name="Frequency">5</Dim>
<Dim Name="Frequency_Modulus_Phase">3</Dim>
<Stream Type="Local" Delimiter=" ">
- 0 2 0
- 1000 2 0
- 2000 0.5 0
- 3000 0.5 0
- 4000 0.5 0
+ 0 0 0
+ 1000 0 0
+ 2000 0 0
+ 3000 0 0
+ 4000 0 0
</Stream>
</Array>
<Array Name="SensingFunction" Type="float">
<Dim Name="Frequency">5</Dim>
<Dim Name="Frequency_Modulus_Phase">3</Dim>
<Stream Type="Local" Delimiter=" ">
- 0 3 0
- 1000 3 0
- 2000 1.5 0
- 3000 1.5 0
- 4000 1.5 0
+ 0 1 0
+ 1000 1 0
+ 2000 1 0
+ 3000 1 0
+ 4000 1 0
</Stream>
</Array>
<Array Name="CavityFactor" Type="float">
<Dim Name="GPS">20</Dim>
<Dim Name="GPS_Value">2</Dim>
<Stream Type="Local" Delimiter=" ">
- 1030000000 1.0
- 1040000000 1.0
- 1050000000 1.0
- 1060000000 1.0
- 1070000000 1.0
- 1080000000 1.0
- 1090000000 1.0
- 1100000000 1.0
- 1110000000 1.0
- 1120000000 1.0
- 1130000000 1.0
- 1140000000 1.0
- 1150000000 1.0
- 1160000000 1.0
- 1170000000 1.0
- 1180000000 1.0
- 1190000000 1.0
- 1200000000 1.0
- 1210000000 1.0
- 1220000000 1.0
+ 1330000000 1.0
+ 1340000000 1.0
+ 1350000000 1.0
+ 1360000000 1.0
+ 1370000000 1.0
+ 1380000000 1.0
+ 1390000000 1.0
+ 1400000000 1.0
+ 1410000000 1.0
+ 1420000000 1.0
+ 1430000000 1.0
+ 1440000000 1.0
+ 1450000000 1.0
+ 1460000000 1.0
+ 1470000000 1.0
+ 1480000000 1.0
+ 1490000000 1.0
+ 1500000000 1.0
+ 1510000000 1.0
+ 1520000000 1.0
</Stream>
</Array>
<Array Name="OLoopFactor" Type="float">
<Dim Name="GPS">20</Dim>
<Dim Name="GPS_Value">2</Dim>
<Stream Type="Local" Delimiter=" ">
- 1030000000 1.0
- 1040000000 1.0
- 1050000000 1.0
- 1060000000 1.0
- 1070000000 1.0
- 1080000000 1.0
- 1090000000 1.0
- 1100000000 1.0
- 1110000000 1.0
- 1120000000 1.0
- 1130000000 1.0
- 1140000000 1.0
- 1150000000 1.0
- 1160000000 1.0
- 1170000000 1.0
- 1180000000 1.0
- 1190000000 1.0
- 1200000000 1.0
- 1210000000 1.0
- 1220000000 1.0
+ 1330000000 1.0
+ 1340000000 1.0
+ 1350000000 1.0
+ 1360000000 1.0
+ 1370000000 1.0
+ 1380000000 1.0
+ 1390000000 1.0
+ 1400000000 1.0
+ 1410000000 1.0
+ 1420000000 1.0
+ 1430000000 1.0
+ 1440000000 1.0
+ 1450000000 1.0
+ 1460000000 1.0
+ 1470000000 1.0
+ 1480000000 1.0
+ 1490000000 1.0
+ 1500000000 1.0
+ 1510000000 1.0
+ 1520000000 1.0
</Stream>
</Array>
</LIGO_LW>
diff --git a/mode-monitor/pars/TrigStream_LLO.cfg b/mode-test/pars/TrigTStream_LLO.cfg
similarity index 62%
rename from mode-monitor/pars/TrigStream_LLO.cfg
rename to mode-test/pars/TrigTStream_LLO.cfg
index e3777f6..94685f0 100644
--- a/mode-monitor/pars/TrigStream_LLO.cfg
+++ b/mode-test/pars/TrigTStream_LLO.cfg
@@ -1,3 +1,3 @@
S6Segs -type Segment -mode Timer -idletime 48 -maxtime 16 -mask 8 \
- -insert "$HOME/scripts/move_xml --file $Xml_File --target /gds/dmt/triggers/DQ_Segments" \
+ -insert "move_xml_r --file $Xml_File --target /gds/dmt/test/triggers/DQ_Segments" \
-out /var/spool/dmt-triggers/DQ_Segments/L-DQ_Segments-%5r/L-DQ_Segments-%g-%d.xml
diff --git a/mode-monitor/pars/hoft_dq_flags.osc b/mode-test/pars/hoft_dq_flags_T.osc
similarity index 73%
rename from mode-monitor/pars/hoft_dq_flags.osc
rename to mode-test/pars/hoft_dq_flags_T.osc
index 7b9a459..c972bdc 100644
--- a/mode-monitor/pars/hoft_dq_flags.osc
+++ b/mode-test/pars/hoft_dq_flags_T.osc
@@ -26,17 +26,15 @@
# 4 FILTERS_OK
# 5 GAMMA_OK
#
-H1:hoft_Science bitand "H1:GDS-CALIB_STATE_VECTOR" mask=0x02 fraction=1.0
-H1:hoft_Up bitand "H1:GDS-CALIB_STATE_VECTOR" mask=0x04 fraction=1.0
-H1:hoft_Calibrated bitand "H1:GDS-CALIB_STATE_VECTOR" mask=0x01 fraction=1.0
-H1:hoft_Ready bitand "H1:GDS-CALIB_STATE_VECTOR" mask=0x03 fraction=1.0
-H1:Always_OK boolean "H1:hoft_Ready | !H1:hoft_Ready"
+H1:hoft_Science bitand "H1:GDS-CALIB_STATE_VECTOR_TEST" mask=0x02 fraction=1.0
+H1:hoft_Up bitand "H1:GDS-CALIB_STATE_VECTOR_TEST" mask=0x04 fraction=1.0
+H1:hoft_Calibrated bitand "H1:GDS-CALIB_STATE_VECTOR_TEST" mask=0x01 fraction=1.0
+H1:hoft_Ready bitand "H1:GDS-CALIB_STATE_VECTOR_TEST" mask=0x03 fraction=1.0
#
-L1:hoft_Science bitand "L1:GDS-CALIB_STATE_VECTOR" mask=0x02 fraction=1.0
-L1:hoft_Up bitand "L1:GDS-CALIB_STATE_VECTOR" mask=0x04 fraction=1.0
-L1:hoft_Calibrated bitand "L1:GDS-CALIB_STATE_VECTOR" mask=0x01 fraction=1.0
-L1:hoft_Ready bitand "L1:GDS-CALIB_STATE_VECTOR" mask=0x03 fraction=1.0
-L1:Always_OK boolean "L1:hoft_Ready | !L1:hoft_Ready"
+L1:hoft_Science bitand "L1:GDS-CALIB_STATE_VECTOR_TEST" mask=0x02 fraction=1.0
+L1:hoft_Up bitand "L1:GDS-CALIB_STATE_VECTOR_TEST" mask=0x04 fraction=1.0
+L1:hoft_Calibrated bitand "L1:GDS-CALIB_STATE_VECTOR_TEST" mask=0x01 fraction=1.0
+L1:hoft_Ready bitand "L1:GDS-CALIB_STATE_VECTOR_TEST" mask=0x03 fraction=1.0
#
# Added for O2b 6/6/2017 by JGZ
V1:hoft_data_OK bitand "V1:DQ_ANALYSIS_STATE_VECTOR" mask=0x01 fraction=1.0
@@ -44,10 +42,10 @@ V1:hoft_Science bitand "V1:DQ_ANALYSIS_STATE_VECTOR" mask=0x02 fraction=1.0
#
# Flag for picking out when Calibration filters are bad: (bitnand fraction=0
# means any sample where this bit is zero activates the segment for a second)
-L1:DMT-CALIB_FILTER_NOT_OK_s bitnand "L1:GDS-CALIB_STATE_VECTOR" mask=0x10 fraction=0
+L1:DMT-CALIB_FILTER_NOT_OK_s bitnand "L1:GDS-CALIB_STATE_VECTOR_TEST" mask=0x10 fraction=0
# Flag for picking out when Calibration filters are bad: (bitnand fraction=0
# means any sample where this bit is zero activates the segment for a second)
-H1:DMT-CALIB_FILTER_NOT_OK_s bitnand "H1:GDS-CALIB_STATE_VECTOR" mask=0x10 fraction=0
+H1:DMT-CALIB_FILTER_NOT_OK_s bitnand "H1:GDS-CALIB_STATE_VECTOR_TEST" mask=0x10 fraction=0
# H1:DMT-DQ_VECTOR Channel Segments
H1:DMT_DQ_VECTOR_PARITY_OK_s testparity "H1:DMT-DQ_VECTOR" value=1
H1:DMT_DQ_VECTOR_BIT1_VETO_s bitnand "H1:DMT-DQ_VECTOR" mask=0x02 fraction=0
diff --git a/mode-monitor/procmgt/LLO_MonitorDQ_Start b/mode-test/procmgt/LLO_TestDQ_Start
similarity index 85%
rename from mode-monitor/procmgt/LLO_MonitorDQ_Start
rename to mode-test/procmgt/LLO_TestDQ_Start
index ad626cb..5be98f6 100644
--- a/mode-monitor/procmgt/LLO_MonitorDQ_Start
+++ b/mode-test/procmgt/LLO_TestDQ_Start
@@ -1,5 +1,5 @@
#
-# File: dmt-runtime-configuration/aLigo/LLO_Monitor_Start
+# File: Runfiles/aLigo/LLO_Test_Start.l1dmt2
#
# Installed: $prefix/procmgt
#
@@ -10,10 +10,7 @@
#
# Author: John G. Zweizig
#
-# Version: aLigo LHO dual-broadcaster version.
-# Combined h(t) + comm nodes
-#
-# Date: 21-Mar-2023
+# svn ID: $Id$
#
#----------------------------- Remove any Trigger processes
-wait trigRmNode $HOST
@@ -22,13 +19,12 @@
-wait smrepair $RECV1PART
-wait smcreate $RECV1PART -nbuf $RECVBUFFCNT -lbuf $SMPBUFFLEN
-hup FrTest -p $RECV1PART
-#
-wait smrepair $RECV2PART
-wait smcreate $RECV2PART -nbuf $RECVBUFFCNT -lbuf $SMPBUFFLEN
-hup FrTest -p $RECV2PART
#
-#----------------------------- Initialize the shared memory
--wait smrepair
+#----------------------------- Initialize the raw data shared memory
+-wait smrepair $LIGOSMPART
-wait smcreate $LIGOSMPART -nbuf $SMPBUFFCNT -lbuf $SMPBUFFLEN
-hup FrTest -p $LIGOSMPART
#
@@ -41,7 +37,6 @@
-wait smrepair $HOFTSMPART
-wait smcreate $HOFTSMPART -nbuf $HOFTBUFFCNT -lbuf $HOFTBUFFLEN
-hup FrTest -p $HOFTSMPART
-#
#----------------------------- Initialize the iDQ shared memory
-wait smrepair $IDQPART
-wait smcreate $IDQPART -nbuf $IDQBUFFCNT -lbuf $IDQBUFFLEN
```
\ No newline at end of file