From 2e5642576d3141dfacff89c266ca68a5d1e3707e Mon Sep 17 00:00:00 2001
From: gac-S_Changer <gac-S_Changer@PC12288.psi.ch>
Date: Fri, 7 Jul 2017 16:08:44 +0200
Subject: [PATCH] Script execution

---
 script/setup/Layout.py | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/script/setup/Layout.py b/script/setup/Layout.py
index 8fd9e59..5fe04e1 100644
--- a/script/setup/Layout.py
+++ b/script/setup/Layout.py
@@ -36,9 +36,9 @@ puck_layout = (
 
 
 class Puck:
-    def __init__(self, number, element, index, angle, center, led_uni, led_mini):
+    def __init__(self, number, block, index, angle, center, led_uni, led_mini):
         self.number = number
-        self.element = element
+        self.block = block
         self.index = index
         self.angle = angle 
         self.center = center
@@ -46,26 +46,26 @@ class Puck:
         self.led_mini = led_mini
         
     def __str__(self):
-        return "Number: " + str(self.number) + "\nElement: " + str(self.element) + "\nIndex: " + str(self.index) + "\nAngle: " + str(self.angle)  + \
+        return "Number: " + str(self.number) + "\nBlock: " + str(self.block) + "\nIndex: " + str(self.index) + "\nAngle: " + str(self.angle)  + \
                "\nCenter: " + str(self.center) + "\nLed Unipuck: " + str(self.led_uni) + "\nLed Minispine: " + str(self.led_mini) 
         
 _puck_list = []   
-_element_list = []      
+_block_list = []      
 
 for p in(puck_layout):
     puck = Puck(p[0], p[1], p[3], p[8], (p[11],p[12]), (p[9],p[10]), (p[11],p[12]))
     _puck_list.append(puck)    
 
 
-def get_pucks(element = None):
+def get_pucks(block = None):
     ret = []
     for  p in _puck_list:
-        if (element is None) or (element==p.element):
+        if (block is None) or (block==p.block):
             ret.append(p)
     return ret
 
 
-class Element:
+class Block:
     def __init__(self, id, angle_range, x_range, y_range):
         self.id = id
         self.angle_range = angle_range
@@ -85,11 +85,11 @@ for id in ("A", "B", "C", "D", "E", "F"):
         x.append(p.led_mini[0])
         y.append(p.led_uni[1])
         y.append(p.led_mini[1])
-    el = Element(id,(min(angles), max(angles)), (min(x), max(x)), (min(y), max(y)))
-    _element_list.append(el)
+    el = Block(id,(min(angles), max(angles)), (min(x), max(x)), (min(y), max(y)))
+    _block_list.append(el)
     
-def get_element(id):
-    for  e in _element_list:
+def get_block(id):
+    for  e in _block_list:
         if id==e.id:
             return e
     return None