First round of matching

OpticsTools.py

@@ -11,7 +11,7 @@ from model import Model
 from machine import Machine
 from reference import ReferenceManager
 from sandbox import Sandbox
-
+from matching import Matching
 
 class OpticsTools(QtWidgets.QMainWindow, Ui_OpticsGUI):
     def __init__(self,phase=0, office = False):
@@ -26,11 +26,11 @@ class OpticsTools(QtWidgets.QMainWindow, Ui_OpticsGUI):
 
         # initialize online model
         self.model = Model(phase=phase,parent=self)
+        self.matching = Matching(parent=self,model = self.model)
         if phase > 0:
             office = True
         self.machine = Machine(parent = True, office = office)
         self.machine.initPVs(self.model.getElements())
-        self.reference = ReferenceManager(parent = self)
         self.sandbox = Sandbox(parent = self, machine = self.machine)
 
         title = "SwissFEL Optics Tools - Lattice %s (Phase %d)" % (self.model.getLatticeVersion(),phase)
@@ -41,6 +41,7 @@ class OpticsTools(QtWidgets.QMainWindow, Ui_OpticsGUI):
         # initialization
         self.loadSettingsdirect("/sf/data/applications/BD-OpticsTools/reference/settings/ReferenceSetting.json")
         self.sandbox.updateSandbox()
+        self.reference = ReferenceManager(parent=self)
 
 #        events handling
         self.actionOpen_2.triggered.connect(self.loadSettings)