Merge branch 'pinhole_bugfix' into 'master'

Bug fix for 2 pinholes.

See merge request !3756

bliss/controllers/transfocator.py

@@ -197,7 +197,7 @@ class Transfocator(HasMetadataForScan):
 
             if self.nb_pinhole == 2:
                 # pinholes are always the first and the last channels
-                self.pinhole = [0, self.nb_lens - 1]
+                self.pinhole = [0, self.nb_lens + 1]
             elif self.nb_pinhole == 1:
                 # the pinhole is always the first channel
                 self.pinhole = [0]

tests/controllers_sw/test_transfocator.py

@@ -18,23 +18,26 @@ def test_transfocator(default_session):
 
 def test_transfocator_inout(default_session):
     transfocator = default_session.config.get("transfocator_simulator")
+    assert transfocator.nb_pinhole == 2
+    assert transfocator.nb_lens == 8
     transfocator[:] = 0
+
     assert transfocator.pos_read() == 0
     assert (
         transfocator.__info__()
-        == "Transfocator transfocator_simulator:\nP0   L1   L2   L3   L4   L5   L6   L7   L8\nOUT  OUT  OUT  OUT  OUT  OUT  OUT  OUT  OUT"
+        == "Transfocator transfocator_simulator:\nP0   L1   L2   L3   L4   L5   L6   L7   L8   P9\nOUT  OUT  OUT  OUT  OUT  OUT  OUT  OUT  OUT  OUT"
     )
 
     transfocator[:] = 1
-    assert transfocator.pos_read() == 0b111111111
+    assert transfocator.pos_read() == 0b1111111111
     assert (
         transfocator.__info__()
-        == "Transfocator transfocator_simulator:\nP0  L1  L2  L3  L4  L5  L6  L7  L8\nIN  IN  IN  IN  IN  IN  IN  IN  IN"
+        == "Transfocator transfocator_simulator:\nP0  L1  L2  L3  L4  L5  L6  L7  L8  P9\nIN  IN  IN  IN  IN  IN  IN  IN  IN  IN"
     )
 
     transfocator.set_all(False)
     assert transfocator.pos_read() == 0
     transfocator.set_all()
-    assert transfocator.pos_read() == 0b111111111
+    assert transfocator.pos_read() == 0b1111111111
     transfocator.set_pin(False)
-    assert transfocator.pos_read() == 0b111111110
+    assert transfocator.pos_read() == 0b0111111110

tests/test_configuration/transfocator.yml

@@ -3,7 +3,7 @@
     class: TransfocatorMockup
     name: transfocator_simulator
     lenses: 8                      # (1)
-    pinhole: 1                     # (2)
+    pinhole: 2                     # (2)
     safety: False                  # (3)
     controller_ip: localhost       # (4)
     read_mode: 0                   # (5)