wip

Author: TBThomas56

src/eiger_fastcs/eiger_controller.py

@@ -35,6 +35,11 @@ async def update(
 
 
 class EigerController(Controller):
+    detector_state = AttrR(
+        String(),
+        handler=EigerHandler("detector/api/1.8.0/status/state"),
+    )
+
     def __init__(self, settings: IPConnectionSettings) -> None:
         super().__init__()
         self._ip_settings = settings
@@ -80,8 +85,11 @@ async def initialise(self) -> None:
                         case _:
                             print(f"Could not process {parameter_name}")
 
-                    # finding appropriate naming to ensure repeats are not ovewritten
-                    if parameter_name in list(attributes.keys()):
+                    # finding appropriate naming to ensure repeats are not ovewritten and ensuring that PV has not been created already
+                    if (
+                        parameter_name in list(attributes.keys())
+                        and parameter_name not in self.__dict__.keys()
+                    ):
                         # Adding original instance of the duplicate into dictionary to rename original instance in attributes later
                         if parameter_name not in list(pv_clashes.keys()):
                             pv_clashes[
@@ -108,14 +116,28 @@ async def initialise(self) -> None:
                                 ),
                             )
 
-        # Renaming original instance of duplicate in Attribute
+        # Renaming original instance of duplicate in Attribute / Removing unique names already created
         for clash_name, unique_name in pv_clashes.items():
-            attributes[unique_name] = attributes.pop(clash_name)
-            print(f"Replacing the repeat,{clash_name}, with {unique_name}")
+            if unique_name in self.__dict__.keys():
+                del attributes[clash_name]
+                print(
+                    f"{unique_name} was already created before, {clash_name} is being deleted"
+                )
+
+            else:
+                attributes[unique_name] = attributes.pop(clash_name)
+                print(f"Replacing the repeat,{clash_name}, with {unique_name}")
 
         for name, attribute in attributes.items():
             setattr(self, name, attribute)
 
+        # Check current state of detector_state to see if initializing is required.
+        detector_state_val = await connection.get(self.detector_state.updater.name)
+        if detector_state_val["value"] == "na":
+            print("Initializing Detector")
+            await connection.put("detector/api/1.8.0/command/initialize", "")
+
+        a = 1
         await connection.close()
 
     async def close(self) -> None: