Index: leahi_dialin/dd/modules/conductivity_sensors.py
===================================================================
diff -u -r96c3a69c442803a410554ad38f52705b0fad2707 -rb7c705d752b93af15ec6a625c21371af065601ae
--- leahi_dialin/dd/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision 96c3a69c442803a410554ad38f52705b0fad2707)
+++ leahi_dialin/dd/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision b7c705d752b93af15ec6a625c21371af065601ae)
@@ -130,20 +130,20 @@
         @return: None
         """
         sensor_list =[]
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D17_COND.name, dd_enum_repository.DDConcentratePumpAttributes.RAW_RESISTANCE.name,     DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D27_COND.name, dd_enum_repository.DDConcentratePumpAttributes.RAW_RESISTANCE.name,     DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D29_COND.name, dd_enum_repository.DDConcentratePumpAttributes.RAW_RESISTANCE.name,     DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D43_COND.name, dd_enum_repository.DDConcentratePumpAttributes.RAW_RESISTANCE.name,     DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D74_COND.name, dd_enum_repository.DDConcentratePumpAttributes.RAW_RESISTANCE.name,     DataTypes.F32))
-        sensor_list.append((fp_enum_repository.FPConductivitySensorNames.P9_COND.name, dd_enum_repository.DDConcentratePumpAttributes.RAW_RESISTANCE.name,     DataTypes.F32))
-        sensor_list.append((fp_enum_repository.FPConductivitySensorNames.P18_COND.name, dd_enum_repository.DDConcentratePumpAttributes.RAW_RESISTANCE.name,     DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D17_COND.name, dd_enum_repository.DDConcentratePumpAttributes.RTD_RESISTANCE.name,     DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D27_COND.name, dd_enum_repository.DDConcentratePumpAttributes.RTD_RESISTANCE.name,     DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D29_COND.name, dd_enum_repository.DDConcentratePumpAttributes.RTD_RESISTANCE.name,     DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D43_COND.name, dd_enum_repository.DDConcentratePumpAttributes.RTD_RESISTANCE.name,     DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D74_COND.name, dd_enum_repository.DDConcentratePumpAttributes.RTD_RESISTANCE.name,     DataTypes.F32))
-        sensor_list.append((fp_enum_repository.FPConductivitySensorNames.P9_COND.name, dd_enum_repository.DDConcentratePumpAttributes.RTD_RESISTANCE.name,     DataTypes.F32))
-        sensor_list.append((fp_enum_repository.FPConductivitySensorNames.P18_COND.name, dd_enum_repository.DDConcentratePumpAttributes.RTD_RESISTANCE.name,     DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D17_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RAW_RESISTANCE.name,     DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D27_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RAW_RESISTANCE.name,     DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D29_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RAW_RESISTANCE.name,     DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D43_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RAW_RESISTANCE.name,     DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D74_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RAW_RESISTANCE.name,     DataTypes.F32))
+        sensor_list.append((fp_enum_repository.FPConductivitySensorNames.P9_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RAW_RESISTANCE.name,     DataTypes.F32))
+        sensor_list.append((fp_enum_repository.FPConductivitySensorNames.P18_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RAW_RESISTANCE.name,     DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D17_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name,     DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D27_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name,     DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D29_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name,     DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D43_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name,     DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D74_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name,     DataTypes.F32))
+        sensor_list.append((fp_enum_repository.FPConductivitySensorNames.P9_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name,     DataTypes.F32))
+        sensor_list.append((fp_enum_repository.FPConductivitySensorNames.P18_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name,     DataTypes.F32))
 
         self.process_into_dict(dict_to_update = self.dd_conductivity_resistance,
                                decoder_list = sensor_list,