From 8d79089bc55d772a48eca80fc62f1349084a2df2 Mon Sep 17 00:00:00 2001
From: Mark Wolfman <canismarko@gmail.com>
Date: Fri, 10 Jan 2025 23:24:26 -0600
Subject: [PATCH] Updated example iconfig file.

---
 src/haven/catalog.py           |  2 +-
 src/haven/iconfig_testing.toml | 25 ++++++++++---------------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/haven/catalog.py b/src/haven/catalog.py
index 7ec4185a..3ad506a3 100644
--- a/src/haven/catalog.py
+++ b/src/haven/catalog.py
@@ -175,7 +175,7 @@ def tiled_client(
     entry_node=None, uri=None, cache_filepath=None, structure_clients="numpy"
 ):
     config = load_config()
-    tiled_config = config["database"].get("tiled", {})
+    tiled_config = config.get("tiled", {})
     # Create a cache for saving local copies
     if cache_filepath is None:
         cache_filepath = tiled_config.get("cache_filepath", "")
diff --git a/src/haven/iconfig_testing.toml b/src/haven/iconfig_testing.toml
index f7bc4deb..a5c28a1d 100644
--- a/src/haven/iconfig_testing.toml
+++ b/src/haven/iconfig_testing.toml
@@ -4,9 +4,6 @@ area_detector_root_path = "/tmp"
 # General name for the beamline, used for metadata.
 name = "SPC Beamline (sector unknown)"
 
-[database.databroker]
-catalog = "bluesky"
-
 [xray_source]
 type = "undulator"
 prefix = "ID255ds:"
@@ -16,27 +13,25 @@ prefix = "255idc:bss"
 beamline = "255-ID-C"
 
 
-#####################
-# Queueserver
-#####################
-
-# This section describes how to connect to the queueserver. It does
-# not generate any devices, but is intended to be read by the Firefly
-# GUI application to determine how to interact with the queue.
+###################
+# Data Acquisition
+###################
 
-[kafka]
-servers = ["fedorov.xray.aps.anl.gov:9092"]
-topic = "bluesky.documents.25idc-dev"
+# This section describes the means to connect the various parts of the
+# data acquisition system. It does not generate any devices.
 
 [queueserver]
-kafka_topic = "bluesky.documents.255idc"
 control_host = "localhost"
 control_port = "60615"
 info_host = "localhost"
 info_port = "60625"
 redis_addr = "localhost:6379"
 
-[database.tiled]
+[kafka]
+servers = ["fedorov.xray.aps.anl.gov:9092"]
+topic = "bluesky.documents.haven-dev"
+
+[tiled]
 uri = "http://localhost:8337/"
 entry_node = "255id_testing"
 cache_filterpath = "/tmp/tiled_cache/http_response_cache.db"