Compare revisions

cd36eff6 · cd36eff6 · cd36eff6 · cd36eff6 · cd36eff6 · cd36eff6
--- a/Spi/test/spiMHeader_LLO.html
+++ b/Spi/test/spiMHeader_LLO.html
+<!DOCTYPE doctype PUBLIC "-//w3c//dtd html 4.0 transitional//en">
+<html>
+<head>
+  <meta http-equiv="Content-Type"
+ content="text/html; charset=iso-8859-1">
+  <meta name="Author" content="Szabolcs Marka/LIGO">
+  <meta name="GENERATOR"
+ content="Mozilla/4.77 [en] (Win95; U) [Netscape]">
+  <title>GDS DMT spi</title>
+  <meta http-equiv="Refresh" content="60; URL=spiM_LLO.html">
+  <meta http-equiv="Pragma" content="no-cache">
+</head>
+<body alink="#1111dd" bgcolor="#ffffff" link="#3333ff" text="#000000"
+ vlink="#2222ee">
+<center><b>&nbsp;<font size="+2"><font color="#ff6600"><big><big><big><big>
+<small><small>SPI</small></small> &nbsp;<small><small><small> by LLOTEST
+DMT </small></small></small></big></big></big></big> <a
+ href="http://www.ligo.caltech.edu/"> <br>
+</a></font></font></b><font size="+2"><font color="#ff6600"><a
+ href="http://www.ligo.caltech.edu/"> <small>LIGO</small></a><small> -
+</small></font> <small> <a href="http://www.ligo-wa.caltech.edu/gds/">GDS</a></small></font><small>
+</small> <font color="#000099"><small> <font size="+2"><small>&nbsp;<u>D</u>ata
+<u>M</u>onitoring <u>T</u>ool Observer</small></font></small></font></center>
+<big></big><br>
+<table bgcolor="#f0f0ff" border="0" width="100%">
+  <tbody>
+    <tr>
+      <td> <a
+ href="https://llodmt.ligo-la.caltech.edu/dmt/Monitors/MonTable.html">
+Existing DMT Monitors </a> </td>
+      <td> Alarms: <a
+ href="https://marble.ligo-wa.caltech.edu/dmt/test/Alarms/left.html"> LHO </a>&nbsp;
+      <a href="https://llodmt.ligo-la.caltech.edu/dmt/test/Alarms/left.html">
+LLO </a> </td>
+      <td> <a
+ href="https://llodmt.ligo-la.caltech.edu/dmt/WebViewer/test/WebIndex.html">
+WebViewer </a> </td>
+      <td> Online Data <a
+ href="http://www.ligo-la.caltech.edu/cgi-bin/data_retrieval/webdaq.pl">
+LLO </a>&nbsp; <a
+ href="http://www.ligo-la.caltech.edu/cgi-bin/data_retrieval/lho_webdaq.pl">
+LHO </a> </td>
+    </tr>
+    <tr>
+      <td> &nbsp; </td>
+    </tr>
+    <tr>
+      <td> Trigger Statistics <a
+ href="https://llodmt.ligo-la.caltech.edu/dmt/test/monitor_reports/TriggerManager_T/TrigMgr.html">LLO</a>
+      <a
+ href="https://marble.ligo-wa.caltech.edu/dmt/test/monitor_reports/TriggerManager_T/TrigMgr.html">LHO</a>&nbsp;
+Trigger Logs <a
+ href="https://llodmt.ligo-la.caltech.edu/dmt/test/monitor_reports/TriggerManager_T/TriggerLog.html">LLO</a>
+      <a
+ href="https://marble.ligo-wa.caltech.edu/dmt/test/monitor_reports/TriggerManager_T/TriggerLog.html">LHO</a><br>
+      </td>
+      <td> SPI pages&nbsp; &nbsp; <a
+ href="https://llodmt.ligo-la.caltech.edu/dmt/test/Monitors/spiM_LLO.html">LLO</a>
+&nbsp; <a
+ href="https://marble.ligo-wa.caltech.edu/dmt/test/Monitors/spiM_LHO.html">LHO</a>
+&nbsp; <a
+ href="https://llodmt.ligo-la.caltech.edu/dmt/test/Monitors/spiM.html">LIGO</a>
+&nbsp;Support &nbsp; &nbsp; <a
+ href="https://marble.ligo-wa.caltech.edu/dmt/test/Monitors/spiC.html">DMT</a>
+      <br>
+      </td>
+      <td> Recent Spectra &nbsp; <a
+ href="https://llodmt.ligo-la.caltech.edu/dmt/test/PSD/PSD.html">LLO</a> <a
+ href="https://marble.ligo-wa.caltech.edu/dmt/test/PSD/PSD.html">LHO</a><br>
+      </td>
+      <td> <a
+ href="https://ldas-sw.ligo.caltech.edu/cgi-bin/gnatsweb.cgi?database=gds">
+Bug reporting </a> </td>
+    </tr>
+  </tbody>
+</table>
+<br>
+<br>
--- a/aLigo/LHO_MonitorDQ_ProcList
+++ b/aLigo/LHO_MonitorDQ_ProcList
@@ -232,7 +232,8 @@ Omega_HOFT_H1 300 \
 	      		   $DMTRIGDIR/H-HOFT_Omega/%5g 0} \
 	      {$htpart} \
 	      {-no-output:trend:data -log} \
-	      {H1-HOFT_OMEGA.cfg H1-hoftStreamList.txt H1-htpart_in.txt}
+	      {H1-HOFT_OMEGA.cfg H1-hoftStreamList.txt \
+	      dq-stream-LHO_Online.txt dq-stream-LHO_hoft.txt}
 #
 #   PCalMon
 #   Parameters modified as requested by Greg 1/8/2015

--- a/aLigo/LHO_TestDQ_ProcList
+++ b/aLigo/LHO_TestDQ_ProcList
@@ -141,7 +141,8 @@ Omega_HOFT_H1_T 300 \
 	      		   $DMTRIGDIR/H-HOFT_Omega/%5g 0} \
 	      {$htpart} \
 	      {-no-output:trend:data -log} \
-	      {H1-HOFT_OMEGA_TEST.cfg H1-hoftStreamList.txt H1-htpart_in.txt}
+	      {H1-HOFT_OMEGA_TEST.cfg H1-hoftStreamList.txt \
+	      dq-stream-LHO_Online.txt dq-stream-LHO_hoft.txt}
 #
 #   NS Binary inspiral sensitivity
 #

--- a/aLigo/LLO_MonitorDQ_ProcList
+++ b/aLigo/LLO_MonitorDQ_ProcList
@@ -232,7 +232,8 @@ Omega_HOFT_L1 300 \
 	      		   $DMTRIGDIR/L-HOFT_Omega/%5g 0} \
 	      {$htpart} \
 	      {-no-output:trend:data -log} \
-	      {L1-HOFT_OMEGA.cfg L1-hoftStreamList.txt L1-htpart_in.txt}
+	      {L1-HOFT_OMEGA.cfg L1-hoftStreamList.txt \
+	      dq-stream-LLO_Online.txt dq-stream-LLO_hoft.txt}
 #
 #   PCalMon
 #   Parameters modified as requested by Greg 1/8/2015

--- a/aLigo/LLO_TestDQ_ProcList
+++ b/aLigo/LLO_TestDQ_ProcList
@@ -161,7 +161,8 @@ Omega_HOFT_L1_T 300 \
 	      		   $DMTRIGDIR/L-HOFT_Omega/%5g 0} \
 	      {$htpart} \
 	      {-no-output:trend:data -log} \
-	      {L1-HOFT_OMEGA_TEST.cfg L1-hoftStreamList.txt L1-htpart_in.txt}
+	      {L1-HOFT_OMEGA_TEST.cfg L1-hoftStreamList.txt \
+	       dq-stream-LLO_hoft.txt dq-stream-LLO_hoft.txt}
 #
 #   NS Binary inspiral sensitivity
 #

--- a/aLigo/scripts/crontab-h1dmt0-dmtexec.txt
+++ b/aLigo/scripts/crontab-h1dmt0-dmtexec.txt
-* * * * * /usr/bin/SPI.pl
-0,10,20,30,40,50 * * * * /usr/bin/USAGE.tcsh
+* * * * * /usr/bin/SPI.pl --gds-config=$HOME/dmtspi --cache=/gds-h1/dmt/dmtspi/cache
+*/10 * * * * /usr/bin/USAGE.tcsh --gds-config=$HOME/dmtspi
 * * * * * $HOME/status/status-monitor-h1dmt0
 3 8 * * 2 $HOME/scripts/condense_segments_LHO
 2 * * * * $HOME/scripts/place_trends "/gds-h1/dmt/trends/H-H1_DMT_C00_M-*.gwf" "/gds-h1/dmt/trends/trender_H1"
--- a/aLigo/scripts/crontab-h1dmt1-dmtexec.txt
+++ b/aLigo/scripts/crontab-h1dmt1-dmtexec.txt
-* * * * * /usr/bin/SPI.pl --cache=/gds-h1/dmt/dmtspi/cache
-*/10 * * * * /usr/bin/USAGE.tcsh
+* * * * * /usr/bin/SPI.pl --gds-config=$HOME/dmtspi --cache=/gds-h1/dmt/dmtspi/cache
+*/10 * * * * /usr/bin/USAGE.tcsh --gds-config=$HOME/dmtspi
 * * * * * $HOME/status/status-monitor-h1dmt1
 3 8 * * 2 $HOME/scripts/condense_segments_LHO
 */5 * * * * $HOME/status/all_files-lho

--- a/aLigo/scripts/crontab-h1dmt2-dmtexec.txt
+++ b/aLigo/scripts/crontab-h1dmt2-dmtexec.txt
-* * * * * /usr/bin/SPI.pl --cache=/gds-h1/dmt/dmtspi/cache
-*/10 * * * * /usr/bin/USAGE.tcsh
+* * * * * /usr/bin/SPI.pl --gds-config=$HOME/dmtspi --cache=/gds-h1/dmt/dmtspi/cache
+*/10 * * * * /usr/bin/USAGE.tcsh --gds-config=$HOME/dmtspi
 * * * * * $HOME/status/status-monitor-h1dmt2
--- a/aLigo/scripts/crontab-h1dmt3-dmtexec.txt
+++ b/aLigo/scripts/crontab-h1dmt3-dmtexec.txt
 3 8 * * 2 $HOME/scripts/condense_test_LHO
-* * * * * /usr/bin/SPI.pl --cache=$HOME/test/dmtspi/cache --local_html=/gds-h1/dmt/html/test --gds-config=$HOME/test/share
-0,5,10,15,20,25,30,35,40,45,50,55 * * * * /usr/bin/USAGE.tcsh --local_html=/gds-h1/dmt/html/test --gds-config=$HOME/test/share
+* * * * * /usr/bin/SPI.pl --gds-config=$HOME/dmtspi --local_html=/gds-h1/dmt/html/test
+*/10 * * * * /usr/bin/USAGE.tcsh --gds-config=$HOME/dmtspi --local_html=/gds-h1/dmt/html/test
--- a/aLigo/scripts/crontab-l1dmt0-dmtexec.txt
+++ b/aLigo/scripts/crontab-l1dmt0-dmtexec.txt
-* * * * * /usr/bin/SPI.pl
-0,10,20,30,40,50 * * * * /usr/bin/USAGE.tcsh
+* * * * * /usr/bin/SPI.pl --gds-config=$HOME/dmtspi --cache=/gds/dmt/dmtspi/cache
+*/10 * * * * /usr/bin/USAGE.tcsh --gds-config=$HOME/dmtspi
 * * * * * $HOME/status/status-monitor-l1dmt0
 2  * * * * /home/dmtexec/scripts/place_trends "/gds/dmt/trends/L-L1_DMT_C00_M-*.gwf" "/gds/dmt/trends/trender_L1"

--- a/aLigo/scripts/crontab-l1dmt1-dmtexec.txt
+++ b/aLigo/scripts/crontab-l1dmt1-dmtexec.txt
-* * * * * /usr/bin/SPI.pl --cache=/gds/dmt/dmtspi/cache
-*/10 * * * * /usr/bin/USAGE.tcsh
+* * * * * /usr/bin/SPI.pl --gds-config=$HOME/dmtspi --cache=/gds/dmt/dmtspi/cache
+*/10 * * * * /usr/bin/USAGE.tcsh --gds-config=$HOME/dmtspi
 * * * * * $HOME/status/status-monitor-l1dmt1
 */5 * * * * $HOME/status/all_files-llo
 3 * * * * $HOME/scripts/dpush-summary

--- a/aLigo/scripts/crontab-l1dmt2-dmtexec.txt
+++ b/aLigo/scripts/crontab-l1dmt2-dmtexec.txt
-* * * * * /usr/bin/SPI.pl --cache=/gds/dmt/dmtspi/cache
-*/10 * * * * /usr/bin/USAGE.tcsh
+* * * * * /usr/bin/SPI.pl --gds-config=$HOME/dmtspi --cache=/gds/dmt/dmtspi/cache
+*/10 * * * * /usr/bin/USAGE.tcsh --gds-config=$HOME/dmtspi
 * * * * * $HOME/status/status-monitor-l1dmt2
 3 8 * * 2 $HOME/scripts/condense_segments_LLO
--- a/aLigo/scripts/crontab-l1dmt3-dmtexec.txt
+++ b/aLigo/scripts/crontab-l1dmt3-dmtexec.txt
-* * * * * /usr/bin/SPI.pl --gds-config=$HOME/test/share/ --cache=$HOME/test/dmtspi/cache --local_html=/gds/dmt/html/test
-0,5,10,15,20,25,30,35,40,45,50,55 * * * * /usr/bin/USAGE.tcsh --gds-config=$HOME/test/share --local_html=/gds/dmt/html/test
+* * * * * /usr/bin/SPI.pl --gds-config=$HOME/dmtspi --local_html=/gds/dmt/html/test
+*/5 * * * * /usr/bin/USAGE.tcsh --gds-config=$HOME/dmtspi --local_html=/gds/dmt/html/test
 3 10 * * 2 /home/dmtexec/scripts/condense_test_LLO
--- a/configure.ac
+++ b/configure.ac
@@ -85,6 +85,7 @@ AC_CONFIG_FILES([
  Services/Makefile
  Services/TrigMgr/Makefile
  scripts/Makefile
+  Spi/Makefile
  status/Makefile
 ])


--- a/replay/scripts/lho_crontab-john.zweizig.txt
+++ b/replay/scripts/lho_crontab-john.zweizig.txt
-* * * * * PROCMGT_PROCESS_ROOT=o3replay SPI.pl >$HOME/o3replay/logs/spi.log 2>&1
+* * * * * PROCMGT_PROCESS_ROOT=o3replay SPI.pl --gds-config=/o3replay >$HOME/o3replay/logs/spi.log 2>&1
 0,10,20,30,40,50 * * * * /usr/bin/USAGE.tcsh

--- a/replay/scripts/llo_crontab.txt
+++ b/replay/scripts/llo_crontab.txt
@@ -3,8 +3,8 @@ MAILTO=patrick.brockill@ligo.org,john.zweizig@ligo.org
 CRON_TZ=UTC
 #
 40 3,7,11,15,19,23 * * * $HOME/scripts/split-wave > /dev/null 2>&1
-* * * * * /usr/bin/SPI.pl >/home/o3replay/logs/spi.log 2>&1
-0,10,20,30,40,50 * * * * /usr/bin/USAGE.tcsh
+* * * * * /usr/bin/SPI.pl --gds-config=$HOME/dmtspi >/home/o3replay/logs/spi.log 2>&1
+*/10 * * * * /usr/bin/USAGE.tcsh
 02 07 * * * PATH=/usr/bin:/bin $HOME/scripts/purgedir /o3replay/frames/O3/detchar/L1/ L-L1_Online 350
 45 13 * * * PATH=/usr/bin:/bin $HOME/scripts/next-flood
 25 18 * * * PATH=/usr/bin:/bin $HOME/scripts/next-flood
--- a/scripts/update
+++ b/scripts/update
+#!/bin/bash -e
+
+# This script updates the running config on the DMT machines
+
+echo "This script updates the runtime configuration on the LIGO DMT
+machines."
+
+HOST=`hostname`
+case $HOST in
+    h1*)
+	SITE=lho
+	;;
+    l1*)
+	SITE=llo
+	;;
+    *)
+	echo "ERROR: unknown SITE for host $HOST."
+	exit 1
+	;;
+esac
+case $HOST in
+    *dmt1)
+	MODE=monitor
+	;;
+    *dmt2)
+	MODE=redundant
+	;;
+    *dmt3)
+	MODE=test
+	;;
+    *)
+	echo "ERROR: unknown MODE for host $HOST"
+	exit 1
+esac
+
+echo "HOST: $HOST"
+echo "SITE: $SITE"
+echo "MODE: $MODE"
+read -p "system correct? type 'yes' to confirm and start update: "
+if [[ "$REPLY" !=  'yes' ]] ; then
+    echo "aborting."
+    exit 2
+fi
+
+set -x
+
+cd ~/dmt-runtime-configuration
+git pull
+
+autoreconf --install
+
+cd
+rm -rf build
+mkdir build
+cd build
+~/dmt-runtime-configuration/configure --enable-$SITE --enable-$MODE --prefix=$HOME
+
+make
+make install
+
+
+# FIXME: add procmgt restart
+
+# read -p "restart procmgt? type 'yes' to confirm: "
+# if [[ "$REPLY" !=  'yes' ]] ; then
+#     echo "aborting."
+#     exit 2
+# fi
+
+# su - dmtadmin
+# sudo systemctl stop dmt-procmgt
+
+# read -p "when all processes have stopped, hit enter to restart procmgt service: "
+
+# sudo systemctl start dmt-procmgt
No results found