Closedown

plugins/PowerSupply.java

@@ -43,7 +43,7 @@ public class PowerSupply extends DeviceBase implements  BitMask {
         super(name);
         this.setCache(10.0);
         this.prefix=prefix;
-        
+
         moduleVoltageRamp = new ChannelDouble(name + " moduleVoltageRamp", prefix + ":RAMP:2");        
         moduleCurrentRamp = new ChannelDouble(name + " moduleCurrentRamp", prefix + ":IRAMP:2");   
         
@@ -142,10 +142,9 @@ public class PowerSupply extends DeviceBase implements  BitMask {
         @Override
         protected void doUpdate() throws InterruptedException, DeviceException {
             super.doUpdate();
-            try {
-                
+            try {                
                 channelActualVoltage.update();
-                channelActualCurrent.update();
+                channelActualCurrent.update();                
                 setCache(new double[]{channelActualVoltage.getValue(), channelActualCurrent.getValue()});
             } catch (Exception ex) {
                 throw new DeviceException(ex);

plugins/TestingList.java

@@ -132,21 +132,13 @@ public class TestingList extends Panel {
      
      //enumeration of possible test statuses: text and related icon
      public enum TestStatus {
-        SUCCESS (0),
-        FAILURE (1),
-        PENDING (2),
-        DISABLED (3),
-        RUNNING (4);
+        SUCCESS,
+        FAILURE,
+        PENDING,
+        DISABLED,
+        RUNNING;
         
-        private int value;
 
-        private TestStatus(int value) {
-            this.value = value;
-        }
-        
-        public int index(){
-            return (int) value;
-        }
         
         public String IconFilename(){
             String iconFileName = "";

script/tests/tests/Collimator Tests/Motor Test 3/Motor Test 3.py

@@ -78,8 +78,8 @@ for setpoint1 in range(0, 20):
     #RegionPositioner idInkr
     for setpoint2 in frange(start, end, direction):
         readback1 = setpoint1
-        sleep( 0.2 ) # Settling time
         idInkr.put(setpoint2, timeout=None) # TODO: Set appropriate timeout
+        sleep( 0.2 ) # Settling time
         readback2 = idInkr.get()
         if abs(readback2 - setpoint2) > 1 : # TODO: Check accuracy
             ret = 'Actor idInkr could not be set to the value ' + str(setpoint2) + ' (current value: ' + str(readback2) + ')'