[CLIENT] Fixup after rebase

tango/py/Lima2/Client/Detector.py

@@ -434,7 +434,7 @@ class Detector:
     State = fsm.State
 
     def __init__(self, ctrl_dev, *recv_devs, timeout=DefaultTimeout):
-        self.__fsm = self.FSM(self)
+        self.__fsm = fsm.StateMachine()
         self.__tasks = {}
         self.__events = []
         self.__event_ids = {}

tango/py/Lima2/Client/Monitor.py

@@ -431,10 +431,11 @@ class Window(QMainWindow):
             },
 
             "gpu" :{
-                "device_idx": 0
+                "device_idx": 0,
+                "cl_source_path": fai_kernels_base,
             },
 
-            "jfrau" :{
+            "jfrau": {
                 "gain_path": params_base + "gains.h5",
                 "pedestal_path": params_base + "pedestals.h5",
                 "photon_energy": 9.06
@@ -452,8 +453,7 @@ class Window(QMainWindow):
                 "cycle": 5,
                 #"empty": -9999.0,
                 "noise": 1.0,
-                "cutoff_pick": 3.0,
-                "cl_source_path": fai_kernels_base,
+                "cutoff_pick": 3.0,                
                 "acc_update_freq": 1
             }
         }

tango/py/setup.py

@@ -8,6 +8,7 @@ packages = [
 
 console_scripts_entry_points = [
     "lima2_cli = Lima2.Client.Cli:main",
+    "lima2_monitor = Lima2.Client.Monitor:main",
 ]
 
 setup(name='Lima2.Client',