diff --git a/src/EEHGMaster.py b/src/EEHGMaster.py
index 68fd5c0f3a94ee215aa5588e280e5a2377a6513f..559fe120ae16ff5daf52917281eb1749b8e22102 100755
--- a/src/EEHGMaster.py
+++ b/src/EEHGMaster.py
@@ -700,12 +700,12 @@ class EEHGMaster(Device):
         self._r561_curr = 2
         self._r562_curr = 100
         self._r561_fix = True
-        self._r561_off_abs = float('Nan')
-        self._r561_off_perc = float('Nan')
+        self._r561_off_abs = 0.0
+        self._r561_off_perc = 1.0
         self._r561_machine = float('Nan')
         self._r562_fix = False
-        self._r562_off_abs = float('Nan')
-        self._r562_off_perc = float('Nan')
+        self._r562_off_abs = 0.0
+        self._r562_off_perc = 1.0
         self._r562_machine = float('Nan')
         
         self._lambda_s1 = 259.0
@@ -1851,8 +1851,8 @@ class EEHGMaster(Device):
         # variabili locali
         A1_sol = solu[0]
         A2_sol = solu[1]
-        R561_sol = solu[2]
-        R562_sol = solu[3]
+        R561_sol = solu[2] * self._r561_off_perc + self._r561_off_abs * 1e-3
+        R562_sol = solu[3] * self._r562_off_perc + self._r562_off_abs * 1e-6
         Wls1_sol = solu[4]
         Wls2_sol = solu[5]
         N_sol = solu[6]
@@ -1891,9 +1891,11 @@ class EEHGMaster(Device):
 # energia calcolata per seed2 in uJ da applicare al device sl/master/seed_master_sl.01/energy2
         self._nrg_s2 = seed2.calc_seedpower_from_a(A2_sol_ap, ebeam, mod2, printout = printout)[1]*1e6 
 
-        self._r561 = solu[2][self._i_solution] * 1000 # non si applica perche' r561 e' fissa
+        self._r561 = (solu[2][self._i_solution] * self._r561_off_perc * 1e3
+                      + self._r561_off_abs) # non si applica perche' r561 e' fissa
 #        R562_sol_ap = solu[3][self._i_solution] # da applicare direttamente al device fel01/magnet/dispersive_magnet_fel01.01/R56
-        self._r562 = solu[3][self._i_solution] * 1e6
+        self._r562 = (solu[3][self._i_solution]  * self._r562_off_perc * 1e6
+                      + self._r562_off_abs)
         self._lambda_s1 = solu[4][self._i_solution] * 1e9 # non si applica! seed1 fixed wavelegth 
 #        Wls2_sol_ap = solu[5][self._i_solution] # da applicare direttamente al device sl/master/seed_master_sl.01/wavelength2
         self._lambda_s2 = solu[5][self._i_solution]  * 1e9
@@ -2278,7 +2280,10 @@ class EEHGMaster(Device):
 
         :return:None
         """
-        pass
+        
+        self.ApplySeeds()
+        self.ApplyIDs()
+        self.ApplyR56s()
         # PROTECTED REGION END #    //  EEHGMaster.ApplyAll
 
     def is_ApplyAll_allowed(self):