diff --git a/src/EEHGMaster.py b/src/EEHGMaster.py
index e234f70260ce20f4484ec2c1e0379c8f47d37edb..2d5ff198cb2db4a12c42d7c07bfad0fb3e0b3620 100755
--- a/src/EEHGMaster.py
+++ b/src/EEHGMaster.py
@@ -1709,7 +1709,9 @@ class EEHGMaster(Device):
         r561 = utl.DispersiveSection(r56=0.0, lung = 3.0, dx=0.0, dt=0.0, r56_range=[0.0, 10e-3])
         R561_range = r561.r56_range
         
-        r562 = utl.DispersiveSection(r56=0.0, lung = 1.2, dx=0.0, dt=0.0, r56_range=[0.0, 300e-6]) #dovremmo aggiornare il valore massimo di r56 con la dipendenza dall'energia
+        print(float(self.r562.get_properties().max_value))
+        r562 = utl.DispersiveSection(r56=0.0, lung = 1.2, dx=0.0, dt=0.0, 
+                                     r56_range=[0.0, float(self.r562.get_properties().max_value) *1e-6]) #dovremmo aggiornare il valore massimo di r56 con la dipendenza dall'energia
         R562_range = r562.r56_range
 
 #        eehg_ora = utili.EEHGsetup(A1 = A1_curr, A2 = A2_curr, n= n_curr, m = m_curr, R56_1 = r561curr*1e-3, R56_2 = r562curr*1e-6)
@@ -1792,13 +1794,17 @@ class EEHGMaster(Device):
                 valore = self.sclmagnet_device.read_attribute("MagnetEnergy").value
                 
             except tango.DevFailed:
-                valore = 1.2
+                valore = 1.0
                 # self.error_stream('')
                 self.error_stream('failed to read beam energy')
                 self.set_state(tango.DevState.ALARM)
                 self.set_status('failed to read beam energy')
                 
             self._e_nrg_fel = valore
+            # vado a scrivere il limite max di R562 com la formula
+            att_pscl = self.r562.get_properties()
+            att_pscl.max_value = str((165/valore)**2*0.01469)
+            self.r562.set_properties(att_pscl)
             
         else:
             self.set_state(tango.DevState.ALARM)