Merge remote-tracking branch 'origin/Ticket2593_ips' into Release_4.4.1

ISISComputingGroup · May 31, 2018 · a96b01a · a96b01a
2 parents fbc7248 + d36de56
commit a96b01a
Show file tree

Hide file tree

Showing 5 changed files with 6,038 additions and 0 deletions.
diff --git a/...s.ibex.devicescreens/src/uk/ac/stfc/isis/ibex/devicescreens/components/ComponentType.java b/...s.ibex.devicescreens/src/uk/ac/stfc/isis/ibex/devicescreens/components/ComponentType.java
@@ -48,6 +48,8 @@ public enum ComponentType {
     DANFYSIK,
     /** CAEN component type. */
 	CAEN,
+    /** IPS component type. */
+	IPS,
     /** CCD100 component type. */
     CCD100,
     /** Kepco component type. */