From 14713c0d2f742eca69c2fa4bef7db24afe4028a5 Mon Sep 17 00:00:00 2001
From: appel_c <christian.appel@psi.ch>
Date: Mon, 21 Jul 2025 22:28:55 +0200
Subject: [PATCH] fix: remove old mcs card from config

---
 .../bec_device_config_sastt.yaml              | 28 +++++++++----------
 .../devices/epics/mcs_card/mcs_card_csaxs.py  | 24 +++++++---------
 2 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/csaxs_bec/device_configs/bec_device_config_sastt.yaml b/csaxs_bec/device_configs/bec_device_config_sastt.yaml
index 11784f1..cb75637 100644
--- a/csaxs_bec/device_configs/bec_device_config_sastt.yaml
+++ b/csaxs_bec/device_configs/bec_device_config_sastt.yaml
@@ -27,20 +27,20 @@ mokev:
   onFailure: buffer
   readoutPriority: baseline
   softwareTrigger: false
-mcs:
-  description: Mcs scalar card for transmission readout
-  deviceClass: csaxs_bec.devices.epics.mcs_csaxs.MCScSAXS
-  deviceConfig:
-    prefix: 'X12SA-MCS:'
-    mcs_config:
-      num_lines: 1
-  deviceTags:
-  - cSAXS
-  - mcs
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  softwareTrigger: false
+# mcs:
+#   description: Mcs scalar card for transmission readout
+#   deviceClass: csaxs_bec.devices.epics.mcs_csaxs.MCScSAXS
+#   deviceConfig:
+#     prefix: 'X12SA-MCS:'
+#     mcs_config:
+#       num_lines: 1
+#   deviceTags:
+#   - cSAXS
+#   - mcs
+#   onFailure: buffer
+#   enabled: true
+#   readoutPriority: monitored
+#   softwareTrigger: false
 eiger9m:
   description: Eiger9m HPC area detector 9M
   deviceClass: csaxs_bec.devices.epics.eiger9m_csaxs.Eiger9McSAXS
diff --git a/csaxs_bec/devices/epics/mcs_card/mcs_card_csaxs.py b/csaxs_bec/devices/epics/mcs_card/mcs_card_csaxs.py
index 0e32fd1..166a48e 100644
--- a/csaxs_bec/devices/epics/mcs_card/mcs_card_csaxs.py
+++ b/csaxs_bec/devices/epics/mcs_card/mcs_card_csaxs.py
@@ -41,13 +41,11 @@ class READYTOREAD(int, enum.Enum):
 class BPMDevice(Device):
     """Class for BPM device of the MCSCard."""
 
-    current1 = Cpt(Signal, name="current1", kind=Kind.normal, doc="Normalized current 1")
-    current2 = Cpt(Signal, name="current2", kind=Kind.normal, doc="Normalized current 2")
-    current3 = Cpt(Signal, name="current3", kind=Kind.normal, doc="Normalized current 3")
-    current4 = Cpt(Signal, name="current4", kind=Kind.normal, doc="Normalized current 4")
-    count_time = Cpt(
-        Signal, name="count_time", kind=Kind.normal, doc="Count time for bpm signal counts"
-    )
+    current1 = Cpt(Signal, kind=Kind.normal, doc="Normalized current 1")
+    current2 = Cpt(Signal, kind=Kind.normal, doc="Normalized current 2")
+    current3 = Cpt(Signal, kind=Kind.normal, doc="Normalized current 3")
+    current4 = Cpt(Signal, kind=Kind.normal, doc="Normalized current 4")
+    count_time = Cpt(Signal, kind=Kind.normal, doc="Count time for bpm signal counts")
     sum = Cpt(SumSignal, kind="hinted", doc="Sum of all currents")
     x = Cpt(
         DiffXYSignal,
@@ -72,11 +70,11 @@ class BPMDevice(Device):
 class MCSRaw(Device):
     """Class for BPM device of the MCSCard with normalized currents."""
 
-    mca1 = Cpt(Signal, name="current1", kind=Kind.normal, doc="Raw counts on mca1 channel")
-    mca2 = Cpt(Signal, name="current2", kind=Kind.normal, doc="Raw counts on mca2 channel")
-    mca3 = Cpt(Signal, name="current3", kind=Kind.normal, doc="Raw counts on mca3 channel")
-    mca4 = Cpt(Signal, name="current4", kind=Kind.normal, doc="Raw counts on mca4 channel")
-    mca5 = Cpt(Signal, name="current5", kind=Kind.normal, doc="Raw counts on mca5 channel")
+    mca1 = Cpt(Signal, kind=Kind.normal, doc="Raw counts on mca1 channel")
+    mca2 = Cpt(Signal, kind=Kind.normal, doc="Raw counts on mca2 channel")
+    mca3 = Cpt(Signal, kind=Kind.normal, doc="Raw counts on mca3 channel")
+    mca4 = Cpt(Signal, kind=Kind.normal, doc="Raw counts on mca4 channel")
+    mca5 = Cpt(Signal, kind=Kind.normal, doc="Raw counts on mca5 channel")
 
 
 class MCSCardCSAXS(PSIDeviceBase, MCSCard):
@@ -87,7 +85,6 @@ class MCSCardCSAXS(PSIDeviceBase, MCSCard):
 
     ready_to_read = Cpt(
         Signal,
-        name="ready_to_read",
         kind=Kind.omitted,
         doc="Signal that indicates if mcs card is ready to be read from after triggers. 0 not ready, 1 ready",
     )
@@ -180,7 +177,6 @@ class MCSCardCSAXS(PSIDeviceBase, MCSCard):
             mca_raw = getattr(self.mcs, signal.name.split("_")[-1], None)
             if mca_raw is None:
                 return
-            logger.info(f"Received update of type {type(value)} for {signal.name}")
             if isinstance(value, np.ndarray):
                 mca_raw.put(value.tolist())
                 if mapped_signal_name == "count_time":