fixes in mb11/dil5

- no need fro second slot in TemperatureLoop, PressureLoop
- only ValvePos needs two slots
- added testwise heater to mix chamber

Change-Id: Iac4592d037a5e6a4f586041762992d75cc77e3de

secop_psi/mercury.py

@@ -343,7 +343,7 @@ class HeaterOutput(HasInput, MercuryChannel, Writable):
 
 
 class TemperatureLoop(TemperatureSensor, Loop, Drivable):
-    channel_type = 'TEMP,HTR'
+    channel_type = 'TEMP'
     output_module = Attached(HeaterOutput, mandatory=False)
     ramp = Parameter('ramp rate', FloatRange(0, unit='K/min'), readonly=False)
     enable_ramp = Parameter('enable ramp rate', BoolType(), readonly=False)
@@ -463,7 +463,7 @@ class ValvePos(HasInput, MercuryChannel, Drivable):
 
 
 class PressureLoop(HasInput, PressureSensor, Loop, Drivable):
-    channel_type = 'PRES,AUX'
+    channel_type = 'PRES'
     output_module = Attached(ValvePos, mandatory=False)
     tolerance = Parameter(default=0.1)
 

secop_psi/triton.py

@@ -175,7 +175,7 @@ class FlowMeter(MercuryChannel, Readable):
         return self.query('FLOW:SIG:FLOW')
 
 
-class TemperatureSensor(mercury.TemperatureSensor):
+class ScannerChannel:
     # TODO: excitation, enable
     # TODO: switch on/off filter, check
     filter_time = Parameter('filter time', FloatRange(1, 200, unit='sec'), readonly=False)
@@ -203,5 +203,13 @@ class TemperatureSensor(mercury.TemperatureSensor):
         return self.change('TEMP:MEAS:PAUS', value)
 
 
-class TemperatureLoop(mercury.TemperatureLoop):
+class TemperatureSensor(ScannerChannel, mercury.TemperatureSensor):
     pass
+
+
+class TemperatureLoop(ScannerChannel, mercury.TemperatureLoop):
+    pass
+
+
+class HeaterOutput(mercury.HeaterOutput):
+    pass  # not sure if we need special handling of triton heater output: to be checked!