Add i04 zebra mapping parameter (#1225)

* Add i04 zebra mapping parameter

* Make 2 default zebra and gate option

* Removed setting gate for auto shutter explicitly as we can use the default

---------

Co-authored-by: Dominic Oram <dominic.oram@diamond.ac.uk>

Author: jacob720

src/dodal/beamlines/i03.py

@@ -67,7 +67,6 @@
 I03_ZEBRA_MAPPING = ZebraMapping(
     outputs=ZebraTTLOutputs(TTL_DETECTOR=1, TTL_SHUTTER=2, TTL_XSPRESS3=3, TTL_PANDA=4),
     sources=ZebraSources(),
-    AND_GATE_FOR_AUTO_SHUTTER=2,
 )
 
 PREFIX = BeamlinePrefix(BL)

src/dodal/beamlines/i23.py

@@ -41,7 +41,6 @@
 I23_ZEBRA_MAPPING = ZebraMapping(
     outputs=ZebraTTLOutputs(TTL_DETECTOR=1, TTL_SHUTTER=4),
     sources=ZebraSources(),
-    AND_GATE_FOR_AUTO_SHUTTER=2,
 )
 
 

src/dodal/devices/zebra/zebra_constants_mapping.py

@@ -89,7 +89,7 @@ class ZebraMapping(ZebraMappingValidations):
     # Which of the Zebra's four AND gates is used to control the automatic shutter, if it's being used.
     # After defining, the correct GateControl device can be accessed with, eg,
     # zebra.logic_gates.and_gates[zebra.mapping.AND_GATE_FOR_AUTO_SHUTTER]. Set to -1 if not being used.
-    AND_GATE_FOR_AUTO_SHUTTER: int = Field(default=-1, ge=-1, le=4)
+    AND_GATE_FOR_AUTO_SHUTTER: int = Field(default=2, ge=-1, le=4)
 
 
 class UnmappedZebraException(Exception):