error handling

python/sls_detector/eiger.py

@@ -347,7 +347,6 @@ class Eiger(Detector):
             v = '0'
         self._api.setNetworkParameter('flow_control_10g', v, -1)
 
-    @error_handling
     def pulse_all_pixels(self, n):
         """
         Pulse each pixel of the chip **n** times using the analog test pulses.
@@ -371,7 +370,7 @@ class Eiger(Detector):
         """
         self._api.pulseAllPixels(n)
         
-    @error_handling
+
     def pulse_diagonal(self, n):
         """
         Pulse pixels in super colums in a diagonal fashion. Used for calibration
@@ -379,7 +378,7 @@ class Eiger(Detector):
         """
         self._api.pulseDiagonal(n)
 
-    @error_handling
+
     def pulse_chip(self, n):
         """
         Advance the counter by toggling enable. Gives 2*n+2 int the counter

python/sls_detector/jungfrau.py

@@ -74,7 +74,6 @@ class Jungfrau(Detector):
         return self._api.isChipPowered()
 
     @power_chip.setter
-    @error_handling
     def power_chip(self, value):
         self._api.powerChip(value)
 
@@ -84,7 +83,6 @@ class Jungfrau(Detector):
         return self._api.getDelay()/1e9
 
     @delay.setter
-    @error_handling
     def delay(self, t):
         ns_time = int(t * 1e9)
         self._api.setDelay(ns_time)
@@ -94,7 +92,6 @@ class Jungfrau(Detector):
         return self._api.getNumberOfGates()
 
     @n_gates.setter
-    @error_handling
     def n_gates(self, n):
         self._api.setNumberOfGates(n)
 
@@ -103,7 +100,6 @@ class Jungfrau(Detector):
         return self._api.getNumberOfProbes()
 
     @n_probes.setter
-    @error_handling
     def n_probes(self, n):
         self._api.setNumberOfProbes(n)
 
@@ -115,7 +111,6 @@ class Jungfrau(Detector):
         return self._api.getStoragecellStart()
 
     @storagecell_start.setter
-    @error_handling
     def storagecell_start(self, value):
         self._api.setStoragecellStart(value)
 
@@ -128,7 +123,6 @@ class Jungfrau(Detector):
         return self._api.getNumberOfStorageCells()
 
     @n_storagecells.setter
-    @error_handling
     def n_storagecells(self, value):
         self._api.setNumberOfStorageCells(value)
 
@@ -232,7 +226,6 @@ class Jungfrau(Detector):
 
 
     @rx_udpport.setter
-    @error_handling
     def rx_udpport(self, ports):
         """Requires iterating over elements two and two for setting ports"""
         for i, p in enumerate(ports):

python/sls_detector/jungfrau_ctb.py

@@ -175,6 +175,5 @@ class JungfrauCTB(Detector):
 
 
     @readout_clock.setter
-    @error_handling
     def readout_clock(self, value):
         self._api.setReadoutClockSpeed(value)

python/src/Detector.h

@@ -19,7 +19,7 @@ class Detector {
     Detector(int i)
         : det(i), multi_detector_id(i) {
         //Disable output from std::cout
-        // std::cout.setstate(std::ios_base::failbit);
+        std::cout.setstate(std::ios_base::failbit);
     }
 
     int getMultiDetectorId() { return multi_detector_id; }