From bae057995f5be48fa5af1db183b47408f7c165bd Mon Sep 17 00:00:00 2001
From: gac-x07mb <gac-x07mb@x07mb-bec-001.psi.ch>
Date: Thu, 17 Oct 2024 17:43:04 +0200
Subject: [PATCH] Add channels for detector energy calibration to falcon

---
 phoenix_bec/devices/falcon_phoenix.py         | 46 +++++++++++++++----
 .../Code_to_test_devices/test_falcon.py       |  2 +-
 2 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/phoenix_bec/devices/falcon_phoenix.py b/phoenix_bec/devices/falcon_phoenix.py
index 66b1578..faa4884 100644
--- a/phoenix_bec/devices/falcon_phoenix.py
+++ b/phoenix_bec/devices/falcon_phoenix.py
@@ -2,6 +2,9 @@
 Implementation for falcon at PHOENIX, derived from
 implementation on csaxs (file falcon_csaxs.py)
 
+17.10.2024 try to streamline implementation with mca record
+
+
 Differences to implement
 
 1) we consider EPICS initialization as standard implementaion,
@@ -51,7 +54,12 @@ from bec_lib.logger import bec_logger
 
 from ophyd import Component as Cpt
 from ophyd import Device, EpicsSignal, EpicsSignalRO, EpicsSignalWithRBV
-from ophyd.mca import EpicsMCARecord
+
+# from ophyd.mca import EpicsMCARecord  # old import
+# now import ophyd.mca completely
+
+import ophyd.mca as Mca
+
 from ophyd_devices.interfaces.base_classes.psi_detector_base import (
     CustomDetectorMixin,
     PSIDetectorBase,
@@ -90,6 +98,17 @@ class MappingSource(enum.IntEnum):
     MAPPING = 1
 
 
+class EpicsMCARecordExtended(Mca.EpicsMCARecord):
+
+    # add parameters for detector energy calibration
+    # which are missing in mca.py
+
+    calo = Cpt(EpicsSignal, ".CALO")
+    cals = Cpt(EpicsSignal, ".CALS")
+    calq = Cpt(EpicsSignal, ".CALQ")
+    tth = Cpt(EpicsSignal, ".TTH")
+
+
 class EpicsDXPFalcon(Device):
     """
     DXP parameters for Falcon detector
@@ -107,9 +126,6 @@ class EpicsDXPFalcon(Device):
     detection_filter = Cpt(EpicsSignalWithRBV, "DetectionFilter", string=True)
     scale_factor = Cpt(EpicsSignalWithRBV, "ScaleFactor")
     risetime_optimisation = Cpt(EpicsSignalWithRBV, "RisetimeOptimization")
-
-    # Misc PVs
-    detector_polarity = Cpt(EpicsSignalWithRBV, "DetectorPolarity")
     decay_time = Cpt(EpicsSignalWithRBV, "DecayTime")
 
     current_pixel = Cpt(EpicsSignalRO, "CurrentPixel")
@@ -386,13 +402,24 @@ class FalconPhoenix(PSIDetectorBase):
 
     # Parameters for individual detector elements
     # Note: need to wrote 'dxp: here, but not dxp'
+
+    # dxp1 = Cpt(Mca.EpicsDXP, "dxp1:")
     dxp1 = Cpt(EpicsDXPFalcon, "dxp1:")
-    # dxp2 = Cpt(EpicsDXPFalcon, "dxp2:")
-    # dxp3 = Cpt(EpicsDXPFalcon, "dxp3:")
-    # dxp4 = Cpt(EpicsDXPFalcon, "dxp4:")
+    dxp2 = Cpt(EpicsDXPFalcon, "dxp2:")
+    dxp3 = Cpt(EpicsDXPFalcon, "dxp3:")
+    dxp4 = Cpt(EpicsDXPFalcon, "dxp4:")
+
+    #
+    # THIS IS NOT WELL-DONE as it take out one part of mca.py from ophy.py
+    #
+    #
+    mca1 = Cpt(EpicsMCARecordExtended, "mca1")
+    mca2 = Cpt(EpicsMCARecordExtended, "mca2")
+    mca3 = Cpt(EpicsMCARecordExtended, "mca3")
+    mca4 = Cpt(EpicsMCARecordExtended, "mca4")
 
     # need to write 'mca1', but not 'mca1:'
-    mca1 = Cpt(EpicsMCARecord, "mca1")
+    # mca1 = Cpt(EpicsMCARecord, "mca1")
     # mca2 = Cpt(EpicsMCARecord, "mca2")
     # mca3 = Cpt(EpicsMCARecord, "mca3")
     # mca4 = Cpt(EpicsMCARecord, "mca4")
@@ -431,7 +458,10 @@ class FalconPhoenix(PSIDetectorBase):
     auto_pixels_per_buffer = Cpt(EpicsSignal, "AutoPixelsPerBuffer")
     pixels_per_buffer = Cpt(EpicsSignal, "PixelsPerBuffer")
     pixels_per_run = Cpt(EpicsSignal, "PixelsPerRun")
+    # print(pixel_per_run
+    # if "SITORO" in prefix:
     nd_array_mode = Cpt(EpicsSignal, "NDArrayMode")
+    # endif
 
 
 if __name__ == "__main__":
diff --git a/phoenix_bec/local_scripts/Code_to_test_devices/test_falcon.py b/phoenix_bec/local_scripts/Code_to_test_devices/test_falcon.py
index 0a660e2..7ec6b72 100644
--- a/phoenix_bec/local_scripts/Code_to_test_devices/test_falcon.py
+++ b/phoenix_bec/local_scripts/Code_to_test_devices/test_falcon.py
@@ -9,7 +9,7 @@ from ophyd import Component as Cpt
 import phoenix_bec.devices.falcon_phoenix as ff
 
 falcon = ff.FalconPhoenix(name="falcon_hdf5", prefix="X07MB-SITORO:")
-
+# xmap = ff.FalconPhoenix(name="falcon_hdf5", prefix="X07MB-XMAP:")
 # make a 'get to read all epics channels
 # there will be an error message, if device contains a channel whcih does not exist
 w = falcon.get()