From 0bf7bf8d3448d8a489af677e18d62d6924551837 Mon Sep 17 00:00:00 2001 From: Parker Fagrelius Date: Mon, 4 Nov 2024 12:52:22 -0700 Subject: [PATCH 1/3] conflict --- Reflector/v1/_init.yaml | 6 ++++++ Reflector/v1/_summit.yaml | 6 ++++++ Reflector/v1/_tucson.yaml | 6 ++++++ 3 files changed, 18 insertions(+) create mode 100644 Reflector/v1/_init.yaml create mode 100644 Reflector/v1/_summit.yaml create mode 100644 Reflector/v1/_tucson.yaml diff --git a/Reflector/v1/_init.yaml b/Reflector/v1/_init.yaml new file mode 100644 index 0000000..1749a2e --- /dev/null +++ b/Reflector/v1/_init.yaml @@ -0,0 +1,6 @@ +device_type: T4 +connection_type: TCP +identifier: 127.0.0.1 +sensor_name: local_ljm +channel_names: FIO7 +location: local_network diff --git a/Reflector/v1/_summit.yaml b/Reflector/v1/_summit.yaml new file mode 100644 index 0000000..1749a2e --- /dev/null +++ b/Reflector/v1/_summit.yaml @@ -0,0 +1,6 @@ +device_type: T4 +connection_type: TCP +identifier: 127.0.0.1 +sensor_name: local_ljm +channel_names: FIO7 +location: local_network diff --git a/Reflector/v1/_tucson.yaml b/Reflector/v1/_tucson.yaml new file mode 100644 index 0000000..1749a2e --- /dev/null +++ b/Reflector/v1/_tucson.yaml @@ -0,0 +1,6 @@ +device_type: T4 +connection_type: TCP +identifier: 127.0.0.1 +sensor_name: local_ljm +channel_names: FIO7 +location: local_network From 022e03edc89c30e1f167db2bf397e3417aaab952 Mon Sep 17 00:00:00 2001 From: Joseph Parsons Date: Fri, 21 Jun 2024 08:16:28 -0600 Subject: [PATCH 2/3] renaming reflector to mt reflector --- {Reflector => MTReflector}/v1/_init.yaml | 0 {Reflector => MTReflector}/v1/_summit.yaml | 0 {Reflector => MTReflector}/v1/_tucson.yaml | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename {Reflector => MTReflector}/v1/_init.yaml (100%) rename {Reflector => MTReflector}/v1/_summit.yaml (100%) rename {Reflector => MTReflector}/v1/_tucson.yaml (100%) diff --git a/Reflector/v1/_init.yaml b/MTReflector/v1/_init.yaml similarity index 100% rename from Reflector/v1/_init.yaml rename to MTReflector/v1/_init.yaml diff --git a/Reflector/v1/_summit.yaml b/MTReflector/v1/_summit.yaml similarity index 100% rename from Reflector/v1/_summit.yaml rename to MTReflector/v1/_summit.yaml diff --git a/Reflector/v1/_tucson.yaml b/MTReflector/v1/_tucson.yaml similarity index 100% rename from Reflector/v1/_tucson.yaml rename to MTReflector/v1/_tucson.yaml From be07ddc53603c8392db9362b9c082eb04e7300ca Mon Sep 17 00:00:00 2001 From: Eric Coughlin Date: Wed, 23 Oct 2024 10:51:58 -0300 Subject: [PATCH 3/3] Match config schema; Add MTReflector test case --- MTReflector/v1/_init.yaml | 7 +------ MTReflector/v1/_summit.yaml | 8 +++++--- MTReflector/v1/_tucson.yaml | 8 +++++--- tests/test_config_files.py | 8 ++++++++ 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/MTReflector/v1/_init.yaml b/MTReflector/v1/_init.yaml index 1749a2e..cbc2b4b 100644 --- a/MTReflector/v1/_init.yaml +++ b/MTReflector/v1/_init.yaml @@ -1,6 +1 @@ -device_type: T4 -connection_type: TCP -identifier: 127.0.0.1 -sensor_name: local_ljm -channel_names: FIO7 -location: local_network +# keep for git diff --git a/MTReflector/v1/_summit.yaml b/MTReflector/v1/_summit.yaml index 1749a2e..c1d0bec 100644 --- a/MTReflector/v1/_summit.yaml +++ b/MTReflector/v1/_summit.yaml @@ -1,6 +1,8 @@ device_type: T4 connection_type: TCP identifier: 127.0.0.1 -sensor_name: local_ljm -channel_names: FIO7 -location: local_network +topics: + - sensor_name: local_ljm + channel_name: FIO7 + location: local_network + topic_name: local diff --git a/MTReflector/v1/_tucson.yaml b/MTReflector/v1/_tucson.yaml index 1749a2e..c1d0bec 100644 --- a/MTReflector/v1/_tucson.yaml +++ b/MTReflector/v1/_tucson.yaml @@ -1,6 +1,8 @@ device_type: T4 connection_type: TCP identifier: 127.0.0.1 -sensor_name: local_ljm -channel_names: FIO7 -location: local_network +topics: + - sensor_name: local_ljm + channel_name: FIO7 + location: local_network + topic_name: local diff --git a/tests/test_config_files.py b/tests/test_config_files.py index 7f483b5..fbbcaf6 100644 --- a/tests/test_config_files.py +++ b/tests/test_config_files.py @@ -52,3 +52,11 @@ def test_TunableLaser(self): schema_name="CONFIG_SCHEMA", config_package_root=self.config_package_root, ) + + def test_MTReflector(self): + self.check_standard_config_files( + module_name="lsst.ts.mtreflector", + schema_name="CONFIG_SCHEMA", + sal_name="MTReflector", + config_package_root=self.config_package_root, + )