Startup

script/Diagnostics/WireScan.py

@@ -12,8 +12,8 @@ start    = args[2] if is_panel else -200
 end      = args[3] if is_panel else 200
 cycles   = args[4] if is_panel else 5
 velocity = args[5] if is_panel else 200
-bpm3     = args[6] if is_panel else None
-print "WireScan parameters: ", prefix, sel, start, end, cycles, cycles, bpm3
+bpms     = args[6] if is_panel else get_wire_scans_bpms(prefix)
+print "WireScan parameters: ", prefix, sel, start, end, cycles, cycles, bpms
 
 #Creating WireScanner object
 print "Creating scanner..."
@@ -27,11 +27,8 @@ scanner.waitValue("At start", 60000)
 channels = [("w_pos", scanner.motor_bs_readback.get_name()), 
             ("cur_cycle", scanner.curr_cycl.get_name()),
             ("scanning", scanner.status_channels[0].get_name())]    
-bpms = get_wire_scans_bpms(prefix)
-if bpms is None:
-    raise Exception("Cannot determine wire scan bpms: " + prefix)
-if bpm3 is not None: 
-    bpms.append(bpm3) 
+
+
 #bpms = ["SINDI01-DBPM060", "SINDI02-DBPM010"] #For testing
 for i in range (len(bpms)):
     for sensor in BPM_SENSORS: