Startup

script/Devices/Elements.py

@@ -167,6 +167,17 @@ elements = (
     (DBPM, "SARBD02-DBPM040", 598.3943),
 )
 
+def get_section(element):
+    return element[1:3]
+
+def get_section_type(element):
+    section = get_section(element)
+    if section == "AR": return "ARAMIS"
+    if section == "AT": return "ATH0S"
+    if section == "IN": return "INJECTOR"
+    if section in["10", "20", "30"] : return "LINAC"
+    return None
+    
 
 def get_bpms():
     ret = []
@@ -184,17 +195,20 @@ def get_wire_scans():
 
 
 
-def get_wire_scans_bpms(wire_scans):
+def get_wire_scans_bpms(wire_scan):
     last = None 
     ret = []
     for element in elements:
-        if element[0]==DWSC and element[1] == wire_scans:
+        if element[0]==DWSC and element[1] == wire_scan:
             ret = [last,]
         else: 
-            if len(ret) > 0:
-                return [ret[0],element[1]]
-            last = element[1]
+            if get_section_type(element[1]) == get_section_type(wire_scan):
+                if len(ret) > 0:
+                    return [ret[0],element[1]]              
+                last = element[1]
     return None
 
 
+#for w in get_wire_scans():
+#    print w, get_wire_scans_bpms(w)