From 5ed1e1f43fe4276014b64e67094c049461e6d7f6 Mon Sep 17 00:00:00 2001
From: Erik Frojdh <erik.frojdh@gmail.com>
Date: Thu, 7 Oct 2021 10:59:00 +0200
Subject: [PATCH] added currentsource example for python

---
 python/examples/use_currentsource.py | 10 ++++++++++
 python/examples/using_scan.py        |  2 ++
 python/slsdet/detector.py            | 27 +++++++++++++++++++--------
 3 files changed, 31 insertions(+), 8 deletions(-)
 create mode 100644 python/examples/use_currentsource.py

diff --git a/python/examples/use_currentsource.py b/python/examples/use_currentsource.py
new file mode 100644
index 000000000..6df565f05
--- /dev/null
+++ b/python/examples/use_currentsource.py
@@ -0,0 +1,10 @@
+from slsdet import Detector, currentSrcParameters
+
+s = currentSrcParameters()
+s.enable_ = 1
+s.fix_= 1
+s.select_ = 10
+
+
+d = Detector()
+d.currentsource = s
\ No newline at end of file
diff --git a/python/examples/using_scan.py b/python/examples/using_scan.py
index 612cae754..2d8f5a74a 100644
--- a/python/examples/using_scan.py
+++ b/python/examples/using_scan.py
@@ -15,5 +15,7 @@ sp.dacSettleTime_ns = int(1e9)
 d = Mythen3()
 d.setScan(sp)
 
+#or d.scan = sp
+
 
 
diff --git a/python/slsdet/detector.py b/python/slsdet/detector.py
index ec14bb826..94f9ec483 100755
--- a/python/slsdet/detector.py
+++ b/python/slsdet/detector.py
@@ -362,6 +362,21 @@ class Detector(CppDetectorApi):
         """
         return self.getNumberOfFramesFromStart()
 
+
+    @property
+    @element
+    def scan(self):
+        """
+        Pass in a scanParameters object 
+        see python/examples/use_scan.py
+
+        """
+        return self.getScan()
+
+    @scan.setter
+    def scan(self, s):
+        ut.set_using_dict(self.setScan, s)
+
     @property
     @element
     def powerchip(self):
@@ -2213,18 +2228,14 @@ class Detector(CppDetectorApi):
         self.setGainMode(value)
 
     @property
+    @element
     def currentsource(self):
         """
-        [Gotthard2] 
-        currentsource [0|1]
-		Enable or disable current source. Default is disabled.
-
-        [Jungfrau]
-	    currentsource [0|1] [fix|nofix] [select source] [(only for chipv1.1)normal|low]
-		Disable or enable current source with some parameters. The select source is 0-63 for chipv1.0 and a 64 bit mask for chipv1.1. To disable, one needs only one argument '0'.
+        Pass in a currentSrcParameters object
+        see python/examples/use_currentsource.py
 
         """
-        return element_if_equal(self.getCurrentSource())
+        return self.getCurrentSource()
 
     @currentsource.setter
     def currentsource(self, cs):