fixed problem with empty sample description; use new sics.get_status(…

…) function;
Gumtree · Jul 12, 2017 · 92b8e16 · 92b8e16
1 parent b647083
commit 92b8e16
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/bragg/nbi/au.gov.ansto.bragg.nbi.scripts/scripts/bragg/quokka/quokka.py b/bragg/nbi/au.gov.ansto.bragg.nbi.scripts/scripts/bragg/quokka/quokka.py
@@ -194,11 +194,11 @@ def waitUntilSicsIs(status, dt=0.2):
     while repeat:
         sics.handleInterrupt()
 
-        while not sics.getSicsController().getServerStatus().equals(status):
+        while not sics.get_status().equals(status):
             time.sleep(dt)
 
         time.sleep(dt)
-        repeat = not sics.getSicsController().getServerStatus().equals(status)
+        repeat = not sics.get_status().equals(status)
 
     sics.handleInterrupt()
 
@@ -373,7 +373,7 @@ def setupMeasurement(parameters, meas_mode):
 def setupSample(parameters):
     # parameters
     name        = strOrDefault(parameters['Name'], "Unknown")
-    description = strOrDefault(parameters['Description'])
+    description = strOrDefault(parameters['Description'], "N.A.")
     thickness   = float(parameters['Thickness'])
     position    = float(parameters['Position'])