From a326e1150b2badea1864264d04eba2f921347281 Mon Sep 17 00:00:00 2001
From: Patrick Godwin <patrick.godwin@ligo.org>
Date: Tue, 19 Feb 2019 15:47:28 -0800
Subject: [PATCH] update imports + Makefiles to deal with datamon lib name
 change to ligo-scald

---
 gstlal-burst/bin/gstlal_feature_aggregator    |  4 +-
 gstlal-burst/bin/gstlal_feature_monitor       |  2 +-
 .../Makefile.gstlal_feature_extractor_online  |  2 +-
 .../optimized/Makefile.ligosoftware_icc_idq   | 75 +------------------
 .../share/O3/Makefile.online_analysis         |  2 +-
 .../Makefile.ligosoftware_gcc_gstlal          | 46 ++++++------
 .../optimized/Makefile.ligosoftware_icc_all   | 46 ++++++------
 gstlal-ugly/bin/gstlal_ll_dq                  |  8 +-
 gstlal-ugly/bin/gstlal_ll_inspiral_aggregator |  4 +-
 9 files changed, 58 insertions(+), 131 deletions(-)

diff --git a/gstlal-burst/bin/gstlal_feature_aggregator b/gstlal-burst/bin/gstlal_feature_aggregator
index 1638238f7d..3c93c1c97b 100755
--- a/gstlal-burst/bin/gstlal_feature_aggregator
+++ b/gstlal-burst/bin/gstlal_feature_aggregator
@@ -37,8 +37,8 @@ import numpy
 
 from confluent_kafka import Consumer, KafkaError
 
-from datamon import aggregator
-from datamon import io
+from ligo.scald import aggregator
+from ligo.scald import io
 
 from gstlal.fxtools import utils
 
diff --git a/gstlal-burst/bin/gstlal_feature_monitor b/gstlal-burst/bin/gstlal_feature_monitor
index a5fd5d11cd..64ac33a789 100755
--- a/gstlal-burst/bin/gstlal_feature_monitor
+++ b/gstlal-burst/bin/gstlal_feature_monitor
@@ -35,7 +35,7 @@ import time
 
 from confluent_kafka import Consumer, KafkaError
 
-from datamon import io
+from ligo.scald import io
 
 from gstlal.fxtools import utils
 
diff --git a/gstlal-burst/share/feature_extractor/Makefile.gstlal_feature_extractor_online b/gstlal-burst/share/feature_extractor/Makefile.gstlal_feature_extractor_online
index bf3b013a77..927a115929 100644
--- a/gstlal-burst/share/feature_extractor/Makefile.gstlal_feature_extractor_online
+++ b/gstlal-burst/share/feature_extractor/Makefile.gstlal_feature_extractor_online
@@ -309,7 +309,7 @@ dag : $(CHANNEL_LIST) feature_extraction_monitor.yml online-web-deploy
 	fi ;
 
 online-web-deploy : feature_extraction_monitor.yml
-	datamon deploy -c feature_extraction_monitor.yml -o ~/public_html -e
+	scald deploy -c feature_extraction_monitor.yml -o ~/public_html -e
 
 feature_extraction_monitor.yml :
 	cp $(GSTLALSHAREDIR)/feature_extractor/monitoring/$@ .
diff --git a/gstlal-burst/share/feature_extractor/O3/optimized/Makefile.ligosoftware_icc_idq b/gstlal-burst/share/feature_extractor/O3/optimized/Makefile.ligosoftware_icc_idq
index 5156cf48cf..0098d6670e 100644
--- a/gstlal-burst/share/feature_extractor/O3/optimized/Makefile.ligosoftware_icc_idq
+++ b/gstlal-burst/share/feature_extractor/O3/optimized/Makefile.ligosoftware_icc_idq
@@ -31,46 +31,34 @@ else
 endif
 
 IDQ_REPO:=${PWD}/git/iDQ
-DATAMON_REPO:=${PWD}/git/datamon
 
 # Set the dependency directory:
 DEPS_DIR:=/path/to/deps/dir
 
 # Set to build from git (0 = tarball, 1 = git)
 IDQ_GIT=1
-DATAMON_GIT=1
 
 # Define which branch from git to build. Defaults to 'master', but the user can 
 # set the variable below. The git clone and compilation should fail if this is set to
 # an unknown branch.
 IDQ_GIT_BRANCH="master"
-DATAMON_GIT_BRANCH="master"
 
 # Set package release versions
 IDQ=idq-2.0.0
-DATAMON=0.1.0
-KAFKA_PYTHON=0.11.5
-LIBRDKAFKA=0.11.5
 SKLEARN=scikit-learn-0.18.2
 CYTHON=Cython-0.25.2
 
 # Specify target/dependency files
 IDQ_TARGET=$(INSTALL_DIR)/bin/idq-train
-DATAMON_TARGET=$(INSTALL_DIR)/bin/datamon.cgi
-KAFKA_PYTHON_TARGET=$(PYTHON_DIR)/confluent_kafka-$(KAFKA_PYTHON)-py2.7-linux-x86_64.egg/confluent_kafka/cimpl.so
-LIBRDKAFKA_TARGET=$(INSTALL_DIR)/lib/librdkafka.so
 SKLEARN_TARGET=$(PYTHON_DIR)/sklearn/_isotonic.so
 CYTHON_TARGET=$(INSTALL_DIR)/bin/cython
 
 # tarballs
-KAFKA_PYTHON_TAR_TARGET=$(TAR_DIR)/confluent-kafka-python-$(KAFKA_PYTHON).tar.gz
-LIBRDKAFKA_TAR_TARGET=$(TAR_DIR)/librdkafka-$(LIBRDKAFKA).tar.gz
 SKLEARN_TAR_TARGET=$(TAR_DIR)/$(SKLEARN).tar.gz
 CYTHON_TAR_TARGET=$(TAR_DIR)/$(CYTHON).tar.gz
 
 # git repos
 IDQ_GIT_TARGET=$(IDQ_REPO)/README.md
-DATAMON_GIT_TARGET=$(DATAMON_REPO)/README.md
 
 # Specify how many processors to run on
 #CORES:=$(shell echo `nproc --all`"-2" | bc -l)
@@ -129,10 +117,10 @@ check :
 # iDQ
 idq : logs/idq.txt
 
-logs/idq.txt : $(LOGS_DIR)/datamon.txt $(IDQ_TARGET)
+logs/idq.txt : $(LOGS_DIR)/sklearn.txt $(IDQ_TARGET)
 	@echo $^ | sed -e "s@ @\n@g" > $@
 
-$(IDQ_TARGET) : $(DATAMON_TARGET)
+$(IDQ_TARGET) : $(SKLEARN_TARGET)
 	@echo $(GREEN)iDQ$(WHITE) 1>&2
 	if [ "$(IDQ_GIT)" = "1" ]; then \
 		cd $(IDQ_REPO) && python setup.py install --prefix=$(INSTALL_DIR) ; \
@@ -144,39 +132,6 @@ $(IDQ_TARGET) : $(DATAMON_TARGET)
 	# not tied solely to iDQ install, but should be done at the end of all python installs
 	chmod og-w $(HOME)/.python-eggs
 
-# datamon
-datamon : logs/datamon.txt
-
-logs/datamon.txt : $(LOGS_DIR)/kafka-python.txt $(DATAMON_TARGET)
-	@echo $^ | sed -e "s@ @\n@g" > $@
-
-$(DATAMON_TARGET) : $(KAFKA_PYTHON_TARGET)
-	@echo $(GREEN)datamon$(WHITE) 1>&2
-	cd $(DATAMON_REPO) && python setup.py install --prefix=$(INSTALL_DIR) ; \
-
-# confluent-kafka-python
-kafka-python : logs/kafka-python.txt
-
-logs/kafka-python.txt : $(LOGS_DIR)/librdkafka.txt $(KAFKA_PYTHON_TARGET)
-	@echo $^ | sed -e "s@ @\n@g" > $@
-
-$(KAFKA_PYTHON_TARGET) : $(LIBRDKAFKA_TARGET)
-	@echo $(GREEN)kafka-python$(WHITE) 1>&2
-	tar -xzf $(TAR_DIR)/confluent-kafka-python-$(KAFKA_PYTHON).tar.gz -C $(SRC_DIR) ; \
-	cd $(SRC_DIR)/confluent-kafka-python-$(KAFKA_PYTHON) && CFLAGS="$(GCCFLAGS)" C_INCLUDE_PATH=$(INSTALL_DIR)/include LIBRARY_PATH=$(INSTALL_DIR)/lib python setup.py install --prefix=$(INSTALL_DIR) ; \
-
-# librdkafka
-librdkafka : logs/librdkafka.txt
-
-logs/librdkafka.txt : $(LOGS_DIR)/sklearn.txt $(LIBRDKAFKA_TARGET)
-	@echo $^ | sed -e "s@ @\n@g" > $@
-
-$(LIBRDKAFKA_TARGET) : $(SKLEARN_TARGET)
-	@echo $(GREEN)librdkafka$(WHITE) 1>&2
-	tar -xzf $(TAR_DIR)/librdkafka-$(LIBRDKAFKA).tar.gz -C $(SRC_DIR) ; \
-	cd $(SRC_DIR)/librdkafka-$(LIBRDKAFKA) && ./configure --prefix=$(INSTALL_DIR) ; \
-	cd $(SRC_DIR)/librdkafka-$(LIBRDKAFKA) && make -j$(CORES) && make install -j$(CORES) ; \
-#
 # scikit-learn
 sklearn : logs/sklearn.txt
 
@@ -210,16 +165,9 @@ logs/patch.txt : $(LOGS_DIR)/tar.txt
 	echo $^ | sed -e "s@ @\n@g" > $@
 
 #tarballs
-logs/tar.txt : $(CYTHON_TAR_TARGET) $(SKLEARN_TAR_TARGET) $(LIBRDKAFKA_TAR_TARGET) $(KAFKA_PYTHON_TAR_TARGET)
+logs/tar.txt : $(CYTHON_TAR_TARGET) $(SKLEARN_TAR_TARGET)
 	echo $^ | sed -e "s@ @\n@g" > $@
 
-$(KAFKA_PYTHON_TAR_TARGET) : $(LIBRDKAFKA_TAR_TARGET)
-	wget --no-check-certificate https://github.com/confluentinc/confluent-kafka-python/archive/v$(KAFKA_PYTHON).tar.gz --directory-prefix=$(TAR_DIR) -O $(TAR_DIR)/confluent-kafka-python-$(KAFKA_PYTHON).tar.gz -nc
-
-
-$(LIBRDKAFKA_TAR_TARGET) : $(SKLEARN_TAR_TARGET)
-	wget --no-check-certificate https://github.com/edenhill/librdkafka/archive/v$(LIBRDKAFKA).tar.gz --directory-prefix=$(TAR_DIR) -O $(TAR_DIR)/librdkafka-$(LIBRDKAFKA).tar.gz -nc
-
 $(SKLEARN_TAR_TARGET) : $(CYTHON_TAR_TARGET)
 	wget --no-check-certificate https://pypi.python.org/packages/26/c2/21c612f3a1b1ba97b7b4bbd1fcdc59b475a09e25efad13fec4565ab9d563/$(SKLEARN).tar.gz --directory-prefix=$(TAR_DIR)  -nc
 
@@ -237,14 +185,6 @@ $(LOGS_DIR) :
 			git clone -b $(IDQ_GIT_BRANCH) https://git.ligo.org/reed.essick/iDQ.git $(IDQ_REPO) ; \
 		fi ; \
 	fi ;
-	if [ "${DATAMON_GIT}" = "1" ]; then \
-		if [ -f $@ ] ; then \
-			echo "datamon git repo exists" ; \
-		else \
-			mkdir -p $(DATAMON_REPO) ; \
-			git clone -b $(DATAMON_GIT_BRANCH) https://git.ligo.org/gstlal-visualisation/datamon.git $(DATAMON_REPO) ; \
-		fi ; \
-	fi ;
 	mkdir -p $(LOGS_DIR)
 
 ############
@@ -262,15 +202,6 @@ clean-install :
 clean-idq :
 	rm -rf logs/idq.txt $(IDQ_TARGET)
 
-clean-datamon :
-	rm -rf logs/datamon.txt $(DATAMON_TARGET)
-
-clean-kafka-python :
-	rm -rf logs/kafka-python.txt $(KAFKA_PYTHON_TARGET)
-
-clean-librdkafka :
-	rm -rf logs/librdkafka.txt $(LIBRDKAFKA_TARGET)
-
 clean-sklearn :
 	rm -rf logs/sklearn.txt $(SKLEARN_TARGET)
 
diff --git a/gstlal-inspiral/share/O3/Makefile.online_analysis b/gstlal-inspiral/share/O3/Makefile.online_analysis
index 3944490255..f7a91d5879 100644
--- a/gstlal-inspiral/share/O3/Makefile.online_analysis
+++ b/gstlal-inspiral/share/O3/Makefile.online_analysis
@@ -145,7 +145,7 @@ dag : marginalized_likelihood.xml.gz prior.cache plots ll_simplify_and_cluster.s
 		--time-slide-file tisi.xml
 
 online-web-deploy : inspiral.yml
-	datamon deploy -c inspiral.yml -o ~/public_html
+	scald deploy -c inspiral.yml -o ~/public_html
 
 inspiral.yml:
 	wget https://git.ligo.org/lscsoft/gstlal/raw/master/gstlal-inspiral/share/O3/inspiral.yml
diff --git a/gstlal-inspiral/share/O3/optimized/Makefile.ligosoftware_gcc_gstlal b/gstlal-inspiral/share/O3/optimized/Makefile.ligosoftware_gcc_gstlal
index 13cfc327f3..29cbce7174 100644
--- a/gstlal-inspiral/share/O3/optimized/Makefile.ligosoftware_gcc_gstlal
+++ b/gstlal-inspiral/share/O3/optimized/Makefile.ligosoftware_gcc_gstlal
@@ -26,7 +26,7 @@ PATCH_DIR:=${PWD}/patches
 INSTALL_DIR:=${LAL_PATH}
 
 GSTLAL_REPO:=${PWD}/git/gstlal
-DATAMON_REPO:=${PWD}/git/datamon
+LIGOSCALD_REPO:=${PWD}/git/ligo-scald
 LIGOSEGMENTS_REPO:=${PWD}/git/ligo-segments
 PYTHONLIGOLW_REPO:=${PWD}/git/python-ligo-lw
 GLUE_REPO:=${PWD}/git/glue
@@ -37,7 +37,7 @@ DEPS_DIR:=/path/to/deps/dir
 
 # Set to build from git (0 = tarball, 1 = git)
 GSTLAL_GIT=1
-DATAMON_GIT=1
+LIGOSCALD_GIT=1
 LIGOSEGMENTS_GIT=0
 PYTHONLIGOLW_GIT=0
 GLUE_GIT=0
@@ -48,7 +48,7 @@ LALSUITE_GIT=0
 # an unknown branch.
 #
 GSTLAL_GIT_BRANCH="master"
-DATAMON_GIT_BRANCH="master"
+LIGOSCALD_GIT_BRANCH="master"
 LIGOSEGMENTS_GIT_BRANCH="master"
 PYTHONLIGOLW_GIT_BRANCH="master"
 GLUE_GIT_BRANCH="master"
@@ -60,7 +60,7 @@ GSTLALCALIBRATION=gstlal-calibration-1.2.1
 GSTLALBURST=gstlal-burst-0.0.5
 GSTLALUGLY=gstlal-ugly-1.5.5
 GSTLAL=gstlal-1.4.1
-DATAMON=datamon-0.1.0
+LIGOSCALD=ligo-scald-0.1.0
 LIGOSEGMENTS=ligo-segments-1.1.1
 PYTHONLIGOLW=python-ligo-lw-1.4.0
 GLUE=lscsoft-glue-1.60.0
@@ -80,7 +80,7 @@ GSTLALCALIB_TARGET=$(INSTALL_DIR)/bin/gstlal_compute_strain
 GSTLALBURST_TARGET=$(INSTALL_DIR)/lib/libgstlalburst.so
 GSTLALUGLY_TARGET=$(INSTALL_DIR)/lib/gstreamer-1.0/libgstnds.so
 GSTLAL_TARGET=$(INSTALL_DIR)/lib/libgstlal.so
-DATAMON_TARGET=$(INSTALL_DIR)/lib/python2.7/site-packages/datamon-0.1.0-py2.7.egg
+LIGOSCALD_TARGET=$(INSTALL_DIR)/lib/python2.7/site-packages/ligo_scald-0.1.0-py2.7.egg
 LIGOSEGMENTS_TARGET=$(INSTALL_DIR)/lib/python2.7/site-packages/ligo_segments-1.1.1-py2.7-linux-x86_64.egg
 PYTHONLIGOLW_TARGET=$(INSTALL_DIR)/lib/python2.7/site-packages/python_ligo_lw-1.4.0-py2.7.egg-info
 GLUE_TARGET=$(INSTALL_DIR)/bin/dmtdq_seg_insert
@@ -100,7 +100,7 @@ GSTLALCALIB_TAR_TARGET=$(TAR_DIR)/$(GSTLALCALIBRATION).tar.gz
 GSTLALBURST_TAR_TARGET=$(TAR_DIR)/$(GSTLALBURST).tar.gz
 GSTLALUGLY_TAR_TARGET=$(TAR_DIR)/$(GSTLALUGLY).tar.gz
 GSTLAL_TAR_TARGET=$(TAR_DIR)/$(GSTLAL).tar.gz
-DATAMON_TAR_TARGET=$(TAR_DIR)/$(DATAMON).tar.gz
+LIGOSCALD_TAR_TARGET=$(TAR_DIR)/$(LIGOSCALD).tar.gz
 LIGOSEGMENTS_TAR_TARGET=$(TAR_DIR)/$(LIGOSEGMENTS).tar.gz
 PYTHONLIGOLW_TAR_TARGET=$(TAR_DIR)/$(PYTHONLIGOLW).tar.gz
 GLUE_TAR_TARGET=$(TAR_DIR)/$(GLUE).tar.gz
@@ -116,7 +116,7 @@ LAL_TAR_TARGET=$(TAR_DIR)/$(LAL).tar.xz
 
 # git repos
 GSTLAL_GIT_TARGET=$(GSTLAL_REPO)/TODO.md
-DATAMON_GIT_TARGET=$(DATAMON_REPO)/README.md
+LIGOSCALD_GIT_TARGET=$(LIGOSCALD_REPO)/README.md
 LIGOSEGMENTS_GIT_TARGET=$(LIGOSEGMENTS_REPO)/README.rst
 PYTHONLIGOLW_GIT_TARGET=$(PYTHONLIGOLW_REPO)/MANIFEST.in
 GLUE_GIT_TARGET=$(GLUE_REPO)/README
@@ -187,7 +187,7 @@ check :
 # gstlal (all)
 gstlal : $(LOGS_DIR)/gstlal.txt
 
-$(LOGS_DIR)/gstlal.txt : $(LOGS_DIR)/datamon.txt $(GSTLAL_TARGET) $(GSTLALUGLY_TARGET) $(GSTLALBURST_TARGET) $(GSTLALCALIB_TARGET) $(GSTINSPIRAL_TARGET) $(GSTLALBURST_TARGET)
+$(LOGS_DIR)/gstlal.txt : $(LOGS_DIR)/ligo-scald.txt $(GSTLAL_TARGET) $(GSTLALUGLY_TARGET) $(GSTLALBURST_TARGET) $(GSTLALCALIB_TARGET) $(GSTINSPIRAL_TARGET) $(GSTLALBURST_TARGET)
 	@echo $^ | sed -e "s@ @\n@g" > $@
 
 # gstlal-inspiral
@@ -243,7 +243,7 @@ $(GSTLALUGLY_TARGET) : $(GSTLAL_TARGET)
 	fi ;
 
 # gstlal
-$(GSTLAL_TARGET) : $(DATAMON_TARGET)
+$(GSTLAL_TARGET) : $(LIGOSCALD_TARGET)
 	@echo $(GREEN)gstlal$(WHITE) 1>&2
 	if [ "${GSTLAL_GIT}" = "1" ]; then \
 		cd $(GSTLAL_REPO)/gstlal && echo | ./00init.sh ; \
@@ -255,19 +255,19 @@ $(GSTLAL_TARGET) : $(DATAMON_TARGET)
 		cd $(SRC_DIR)/$(GSTLAL) && make -j$(CORES) && make install -j$(CORES) ; \
 	fi ;
 
-# datamon
-datamon : $(LOGS_DIR)/datamon.txt
+# ligo-scald
+ligo-scald : $(LOGS_DIR)/ligo-scald.txt
 
-$(LOGS_DIR)/datamon.txt : $(LOGS_DIR)/ligo-segments.txt $(DATAMON_TARGET)
+$(LOGS_DIR)/ligo-scald.txt : $(LOGS_DIR)/ligo-segments.txt $(LIGOSCALD_TARGET)
 	@echo $^ | sed -e "s@ @\n@g" > $@
 
-$(DATAMON_TARGET) : $(LIGOSEGMENTS_TARGET)
-	@echo $(GREEN)datamon$(WHITE) 1>&2
-	if [ "${DATAMON_GIT}" = "1" ]; then \
-		cd $(DATAMON_REPO) && python setup.py install --prefix=$(INSTALL_DIR) ; \
+$(LIGOSCALD_TARGET) : $(LIGOSEGMENTS_TARGET)
+	@echo $(GREEN)ligo-scald$(WHITE) 1>&2
+	if [ "${LIGOSCALD_GIT}" = "1" ]; then \
+		cd $(LIGOSCALD_REPO) && python setup.py install --prefix=$(INSTALL_DIR) ; \
 	else \
-		tar -xzf $(TAR_DIR)/$(DATAMON).tar.gz -C $(SRC_DIR) ; \
-		cd $(SRC_DIR)/$(DATAMON) && python setup.py install --prefix=$(INSTALL_DIR) ; \
+		tar -xzf $(TAR_DIR)/$(LIGOSCALD).tar.gz -C $(SRC_DIR) ; \
+		cd $(SRC_DIR)/$(LIGOSCALD) && python setup.py install --prefix=$(INSTALL_DIR) ; \
 	fi ;
 
 # ligo-segments
@@ -478,15 +478,15 @@ $(PATCH_DIR)/gst1.14.patch : $(LOGS_DIR)
 # git repos
 $(LOGS_DIR) :
 	mkdir -p $(SRC_DIR) $(INSTALL_DIR) $(PATCH_DIR) $(TAR_DIR)
-	if [ "${DATAMON_GIT}" = "1" ]; then \
+	if [ "${LIGOSCALD_GIT}" = "1" ]; then \
 		if [ -f $@ ] ; then \
-			echo "datamon git repo exists" ; \
+			echo "ligo-scald git repo exists" ; \
 		else \
-			mkdir -p $(DATAMON_REPO) ; \
-			git clone -b $(DATAMON_GIT_BRANCH) https://git.ligo.org/gstlal-visualisation/datamon.git $(DATAMON_REPO) ; \
+			mkdir -p $(LIGOSCALD_REPO) ; \
+			git clone -b $(LIGOSCALD_GIT_BRANCH) https://git.ligo.org/gstlal-visualisation/ligo-scald.git $(LIGOSCALD_REPO) ; \
 		fi ; \
 	else \
-		wget --no-check-certificate http://software.ligo.org/lscsoft/source/$(DATAMON).tar.gz --directory-prefix=$(TAR_DIR) -nc ; \
+		wget --no-check-certificate http://software.ligo.org/lscsoft/source/$(LIGOSCALD).tar.gz --directory-prefix=$(TAR_DIR) -nc ; \
 	fi ;
 	if [ "${LALSUITE_GIT}" = "1" ]; then \
 		if [ -f $@ ] ; then \
diff --git a/gstlal-inspiral/share/O3/optimized/Makefile.ligosoftware_icc_all b/gstlal-inspiral/share/O3/optimized/Makefile.ligosoftware_icc_all
index de40f6857a..fe49cd30b6 100644
--- a/gstlal-inspiral/share/O3/optimized/Makefile.ligosoftware_icc_all
+++ b/gstlal-inspiral/share/O3/optimized/Makefile.ligosoftware_icc_all
@@ -37,7 +37,7 @@ else
 endif
 
 GSTLAL_REPO:=${PWD}/git/gstlal
-DATAMON_REPO:=${PWD}/git/datamon
+LIGOSCALD_REPO:=${PWD}/git/ligo-scald
 LIGOSEGMENTS_REPO:=${PWD}/git/ligo-segments
 PYTHONLIGOLW_REPO:=${PWD}/git/python-ligo-lw
 GLUE_REPO:=${PWD}/git/glue
@@ -45,7 +45,7 @@ LALSUITE_REPO:=${PWD}/git/lalsuite
 
 # Set to build from git (0 = tarball, 1 = git)
 GSTLAL_GIT=1
-DATAMON_GIT=1
+LIGOSCALD_GIT=1
 LIGOSEGMENTS_GIT=0
 PYTHONLIGOLW_GIT=0
 GLUE_GIT=0
@@ -56,7 +56,7 @@ LALSUITE_GIT=0
 # an unknown branch.
 #
 GSTLAL_GIT_BRANCH="master"
-DATAMON_GIT_BRANCH="master"
+LIGOSCALD_GIT_BRANCH="master"
 LIGOSEGMENTS_GIT_BRANCH="master"
 PYTHONLIGOLW_GIT_BRANCH="master"
 GLUE_GIT_BRANCH="master"
@@ -68,7 +68,7 @@ GSTLALCALIBRATION=gstlal-calibration-1.2.7
 GSTLALBURST=gstlal-burst-0.0.5
 GSTLALUGLY=gstlal-ugly-1.5.6
 GSTLAL=gstlal-1.4.1
-DATAMON=datamon-0.1.0
+LIGOSCALD=ligo-scald-0.1.0
 LIGOSEGMENTS=ligo-segments-1.2.0
 PYTHONLIGOLW=python-ligo-lw-1.4.0
 GLUE=lscsoft-glue-1.60.0
@@ -103,7 +103,7 @@ GSTLALCALIB_TARGET=$(INSTALL_DIR)/bin/gstlal_compute_strain
 GSTLALBURST_TARGET=$(INSTALL_DIR)/lib/libgstlalburst.so
 GSTLALUGLY_TARGET=$(INSTALL_DIR)/lib/gstreamer-1.0/libgstnds.so
 GSTLAL_TARGET=$(INSTALL_DIR)/lib/libgstlal.so
-DATAMON_TARGET=$(INSTALL_DIR)/lib/python2.7/site-packages/datamon-0.1.0-py2.7.egg
+LIGOSCALD_TARGET=$(INSTALL_DIR)/lib/python2.7/site-packages/ligo_scald-0.1.0-py2.7.egg
 LIGOSEGMENTS_TARGET=$(PYTHON_DIR)/ligo_segments-1.2.0-py2.7-linux-x86_64.egg
 PYTHONLIGOLW_TARGET=$(PYTHON_DIR)/python_ligo_lw-1.4.0-py2.7.egg-info
 GLUE_TARGET=$(INSTALL_DIR)/bin/dmtdq_seg_insert
@@ -139,7 +139,7 @@ GSTLALCALIB_TAR_TARGET=$(TAR_DIR)/$(GSTLALCALIBRATION).tar.gz
 GSTLALBURST_TAR_TARGET=$(TAR_DIR)/$(GSTLALBURST).tar.gz
 GSTLALUGLY_TAR_TARGET=$(TAR_DIR)/$(GSTLALUGLY).tar.gz
 GSTLAL_TAR_TARGET=$(TAR_DIR)/$(GSTLAL).tar.gz
-DATAMON_TAR_TARGET=$(TAR_DIR)/$(DATAMON).tar.gz
+LIGOSCALD_TAR_TARGET=$(TAR_DIR)/$(LIGOSCALD).tar.gz
 LIGOSEGMENTS_TAR_TARGET=$(TAR_DIR)/$(LIGOSEGMENTS).tar.gz
 PYTHONLIGOLW_TAR_TARGET=$(TAR_DIR)/$(PYTHONLIGOLW).tar.gz
 GLUE_TAR_TARGET=$(TAR_DIR)/$(GLUE).tar.gz
@@ -170,7 +170,7 @@ FFTW_TAR_TARGET=$(TAR_DIR)/$(FFTW).tar.gz
 
 # git repos
 GSTLAL_GIT_TARGET=$(GSTLAL_REPO)/TODO.md
-DATAMON_GIT_TARGET=$(DATAMON_REPO)/README.md
+LIGOSCALD_GIT_TARGET=$(LIGOSCALD_REPO)/README.md
 LIGOSEGMENTS_GIT_TARGET=$(LIGOSEGMENTS_REPO)/README.rst
 PYTHONLIGOLW_GIT_TARGET=$(PYTHONLIGOLW_REPO)/MANIFEST.in
 GLUE_GIT_TARGET=$(GLUE_REPO)/README
@@ -285,7 +285,7 @@ check :
 	@if [ -f $(LOGS_DIR)/gstlal.txt ] ; then ls $(LOGS_DIR)/gstlal.txt >> $(LOGS_DIR)/all.txt ; fi ;
 	@ls -ltrh $$(cat $(LOGS_DIR)/all.txt)
 
-$(LOGS_DIR)/gstlal.txt : $(LOGS_DIR)/datamon.txt $(GSTLAL_TARGET) $(GSTLALUGLY_TARGET) $(GSTLALBURST_TARGET) $(GSTLALCALIB_TARGET) $(GSTINSPIRAL_TARGET)
+$(LOGS_DIR)/gstlal.txt : $(LOGS_DIR)/ligo-scald.txt $(GSTLAL_TARGET) $(GSTLALUGLY_TARGET) $(GSTLALBURST_TARGET) $(GSTLALCALIB_TARGET) $(GSTINSPIRAL_TARGET)
 	@echo $^ | sed -e "s@ @\n@g" > $@
 
 # gstlal-inspiral
@@ -341,7 +341,7 @@ $(GSTLALUGLY_TARGET) : $(GSTLAL_TARGET)
 	fi ;
 
 # gstlal
-$(GSTLAL_TARGET) : $(DATAMON_TARGET)
+$(GSTLAL_TARGET) : $(LIGOSCALD_TARGET)
 	@echo $(GREEN)gstlal$(WHITE) 1>&2
 	if [ "${GSTLAL_GIT}" = "1" ]; then \
 		cd $(GSTLAL_REPO)/gstlal && echo | ./00init.sh ; \
@@ -353,19 +353,19 @@ $(GSTLAL_TARGET) : $(DATAMON_TARGET)
 		cd $(SRC_DIR)/$(GSTLAL) && make -j$(CORES) && make install -j$(CORES) ; \
 	fi ;
 
-# datamon
-datamon : $(LOGS_DIR)/datamon.txt
+# ligo-scald
+ligo-scald : $(LOGS_DIR)/ligo-scald.txt
 
-$(LOGS_DIR)/datamon.txt : $(LOGS_DIR)/ligo-segments.txt $(DATAMON_TARGET)
+$(LOGS_DIR)/ligo-scald.txt : $(LOGS_DIR)/ligo-segments.txt $(LIGOSCALD_TARGET)
 	@echo $^ | sed -e "s@ @\n@g" > $@
 
-$(DATAMON_TARGET) : $(LIGOSEGMENTS_TARGET)
-	@echo $(GREEN)datamon$(WHITE) 1>&2
-	if [ "${DATAMON_GIT}" = "1" ]; then \
-		cd $(DATAMON_REPO) && python setup.py install --prefix=$(INSTALL_DIR) ; \
+$(LIGOSCALD_TARGET) : $(LIGOSEGMENTS_TARGET)
+	@echo $(GREEN)ligo-scald$(WHITE) 1>&2
+	if [ "${LIGOSCALD_GIT}" = "1" ]; then \
+		cd $(LIGOSCALD_REPO) && python setup.py install --prefix=$(INSTALL_DIR) ; \
 	else \
-		tar -xzf $(TAR_DIR)/$(DATAMON).tar.gz -C $(SRC_DIR) ; \
-		cd $(SRC_DIR)/$(DATAMON) && python setup.py install --prefix=$(INSTALL_DIR) ; \
+		tar -xzf $(TAR_DIR)/$(LIGOSCALD).tar.gz -C $(SRC_DIR) ; \
+		cd $(SRC_DIR)/$(LIGOSCALD) && python setup.py install --prefix=$(INSTALL_DIR) ; \
 	fi ;
 
 # ligo-segments
@@ -797,15 +797,15 @@ $(FFTW_TAR_TARGET) : $(LOGS_DIR)
 # git repos
 $(LOGS_DIR) :
 	mkdir -p $(SRC_DIR) $(INSTALL_DIR) $(PATCH_DIR) $(TAR_DIR) $(PYTHON_DIR)
-	if [ "${DATAMON_GIT}" = "1" ]; then \
+	if [ "${LIGOSCALD_GIT}" = "1" ]; then \
 		if [ -f $@ ] ; then \
-			echo "datamon git repo exists" ; \
+			echo "ligo-scald git repo exists" ; \
 		else \
-			mkdir -p $(DATAMON_REPO) ; \
-			git clone -b $(DATAMON_GIT_BRANCH) https://git.ligo.org/gstlal-visualisation/datamon.git $(DATAMON_REPO) ; \
+			mkdir -p $(LIGOSCALD_REPO) ; \
+			git clone -b $(LIGOSCALD_GIT_BRANCH) https://git.ligo.org/gstlal-visualisation/ligo-scald.git $(LIGOSCALD_REPO) ; \
 		fi ; \
 	else \
-		wget --no-check-certificate http://software.ligo.org/lscsoft/source/$(DATAMON).tar.gz --directory-prefix=$(TAR_DIR) -nc ; \
+		wget --no-check-certificate http://software.ligo.org/lscsoft/source/$(LIGOSCALD).tar.gz --directory-prefix=$(TAR_DIR) -nc ; \
 	fi ;
 	if [ "${LALSUITE_GIT}" = "1" ]; then \
 		if [ -f $@ ] ; then \
diff --git a/gstlal-ugly/bin/gstlal_ll_dq b/gstlal-ugly/bin/gstlal_ll_dq
index f981afab4f..47715dc47c 100755
--- a/gstlal-ugly/bin/gstlal_ll_dq
+++ b/gstlal-ugly/bin/gstlal_ll_dq
@@ -36,8 +36,8 @@ from gi.repository import GObject, Gst
 GObject.threads_init()
 Gst.init(None)
 
-from datamon import aggregator
-from datamon import io
+from ligo.scald import aggregator
+from ligo.scald import io
 
 from gstlal import pipeparts, datasource, simplehandler, pipeio, reference_psd
 
@@ -49,10 +49,6 @@ from gstlal import pipeparts, datasource, simplehandler, pipeio, reference_psd
 # =============================================================================
 #
 
-
-from datamon import aggregator
-from datamon import io
-
 def parse_command_line():
 	parser = OptionParser(description = __doc__)
 
diff --git a/gstlal-ugly/bin/gstlal_ll_inspiral_aggregator b/gstlal-ugly/bin/gstlal_ll_inspiral_aggregator
index c4bf5969e1..867532ab84 100755
--- a/gstlal-ugly/bin/gstlal_ll_inspiral_aggregator
+++ b/gstlal-ugly/bin/gstlal_ll_inspiral_aggregator
@@ -28,8 +28,8 @@ import timeit
 
 import numpy
 
-from datamon import aggregator
-from datamon import io
+from ligo.scald import aggregator
+from ligo.scald import io
 
 
 #
-- 
GitLab