diff --git a/launcher_es.conf b/launcher_es.conf
index 11a43fc49e239b29a5bd60659c6a03a6f8606831..5cbd0b454b289dabadefe0c1f8aba31b4aaa969a 100644
--- a/launcher_es.conf
+++ b/launcher_es.conf
@@ -31,12 +31,12 @@ LFO
 Aggregator for the Laser Heater operations
 essential
 
-@GTOOL
-Laser Heater (old panel)
-export PYTHONPATH=${HOME}/devel/utils/python/laser_heater; cd /home/fermi/devel/utils/python/laser_heater; ./laserHeater.py
-E. Ferrari
-Aggregator for the Laser Heater operations
-essential
+#@GTOOL
+#Laser Heater (old panel)
+#export PYTHONPATH=${HOME}/devel/utils/python/laser_heater; cd /home/fermi/devel/utils/python/laser_heater; ./laserHeater.py
+#E. Ferrari
+#Aggregator for the Laser Heater operations
+#essential
 
 @GTOOL
 SPINJ cycling
@@ -59,12 +59,12 @@ G. Penco
 Real time measurements at the gun exit of charge, laser energy and QE
 expert
 
-@GTOOL
-Cathode laser cleaning
-/home/fermi/devel/utils/matlab/CathodeCleaning/CathodePilCleaning.m
-M. Trovo'
-Special procedure for Q.E. restoring 
-expert
+#@GTOOL
+#Cathode laser cleaning
+#/home/fermi/devel/utils/matlab/CathodeCleaning/CathodePilCleaning.m
+#M. Trovo'
+#Special procedure for Q.E. restoring 
+#expert
 
 @YTOOL
 Laser Beam Quality
@@ -192,16 +192,16 @@ D. Castronovo
 Find the klystron phases or timing for maximum beam energy
 essential
 
-@GTOOL
-Energy Finder.py (beta)
-cd /home/fermi/devel/utils/python/creast_finder/; xterm -e python DBDprocedure.py;
-M. Trovo'
-Precedure aiming to find the DBD energy
-expert
+#@GTOOL
+#Energy Finder.py (beta)
+#cd /home/fermi/devel/utils/python/creast_finder/; xterm -e python DBDprocedure.py;
+#M. Trovo'
+#Precedure aiming to find the DBD energy
+#expert
 
 @GTOOL
 Set Quad/Steerer Energy
-/home/fermi/devel/utils/matlab/Ebeam/EnergieQuadSteererC8C9section.m
+/home/fermi/devel/utils/matlab/Ebeam/EnergieQuadSteererHGsections.m
 M. Trovo', L. Giannessi, O. Ferrando
 Set the energy on quads and steerers for calibration
 essential
@@ -234,6 +234,13 @@ L. Froehlich
 RT display of BPM positions + active steering through the linac via corrector coils
 expert
 
+@CTOOL
+Steering Adapted(BPM, Corrector Display)
+/home/fermi/devel/utils/matlab/steering_newFEL1/main.m
+L. Froehlich
+RT display of BPM positions + active steering through the linac via corrector coils
+expert
+
 @CTOOL
 Slice Energy Spread in DBD
 /home/fermi/devel/utils/matlab/Slice_En_Spread/Slice_En_Spread_GUI.m
@@ -255,12 +262,12 @@ E. Roussel
 Vertical Lerfd controller
 expert
 
-@CTOOL
-Charge Transmission
-/home/fermi/devel/utils/matlab/bunch_numb_tools/sync_read_bpm_charge_3.m
-M. Trovo'
-Displays transmission through the linac based on BPM charge readings
-expert
+#@CTOOL
+#Charge Transmission
+#/home/fermi/devel/utils/matlab/bunch_numb_tools/sync_read_bpm_charge_3.m
+#M. Trovo'
+#Displays transmission through the linac based on BPM charge readings
+#expert
 
 @CTOOL
 EnSteerer
@@ -358,6 +365,13 @@ M. Milloch
 Utility to move the SLEDs tuners (VERY DANGEROUS)
 expert
 
+@EXPERTTOOL
+RF logger
+/home/fermi/devel/utils/matlab/linac/logger/logger_v2.m
+M. Milloch
+Record RF waveforms vs drive/HV ramp
+expert
+
 @EXPERTTOOL
 RF conditioning macro
 /home/fermi/devel/utils/matlab/linac/cond_macro/conditioning_routine.m
@@ -379,6 +393,19 @@ M. Trovo'
 Panel to Open and Closed the Amplytude Loops of LLRF
 expert
 
+@CTOOL
+BOC termal support
+cd /home/fermi/devel/utils/python/Qf_tool/; xterm -e python3 BocTemperature.py;
+M. Trovo'
+Temperature trend 
+essential
+
+@CTOOL
+SPC termal setting
+cd /home/fermi/devel/utils/python/Qf_tool/; xterm -e python3 SPCtemperature.py;
+M. Trovo'
+Temperature settings 
+essential
 
 %%%%%%%%%%%%%%  FEL1 tools  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -449,12 +476,12 @@ E. Allaria
 Set and check the matching in the undulators
 expert
 
-@CTOOL
-FEL-1 State Reporter
-/home/fermi/devel/utils/tcl_tk/FEL-1_Status_Reporter  FEL1
-W. Fawley
-Tcl/TK-Python GUI to extract and list current linac&FEL-1 parameters
-expert
+#@CTOOL
+#FEL-1 State Reporter
+#/home/fermi/devel/utils/tcl_tk/FEL-1_Status_Reporter  FEL1
+#W. Fawley
+#Tcl/TK-Python GUI to extract and list current linac&FEL-1 parameters
+#expert
 
 @RTOOL
 FEL Intensity Monitor
@@ -470,19 +497,19 @@ E. Roussel
 Adjust wavelength and range in pC of the I0 monitors. Also show filters.
 expert
 
-@RTOOL
-FEL Spectrometer Profiler
-/home/fermi/devel/utils/matlab/bunch_numb_tools/spec_profile3.m
-M. Trovo'
-Displays the V/H profile of the PADReS spectrometer image
-essential
+#@RTOOL
+#FEL Spectrometer Profiler
+#cd /home/fermi/devel/utils/python/Qf_tool/; xterm -e python3 QfTool.py;
+#M. Trovo'
+#Displays the profiles of the PADReS spectrometers
+#essential
 
-@RTOOL
-PADRES Diagnostics
-/home/fermi/devel/utils/matlab/DiagnoPADRES/PADRES.m
-E. Ferrari
-An aggregator (& scan) tool for PADRES diagnostics
-essential
+#@RTOOL
+#PADRES Diagnostics
+#/home/fermi/devel/utils/matlab/DiagnoPADRES/PADRES.m
+#E. Ferrari
+#An aggregator (& scan) tool for PADRES diagnostics
+#3essential
 
 @BTOOL
 RT FEL-1 Data Acquisition (v17)
@@ -615,6 +642,13 @@ D. Castronovo
 Dispersive magnet setup tool
 essential
 
+@GTOOL
+PoCo
+/home/fermi/macros_matlab/roussel/polar_control_v3/PoCo.m
+E. Roussel
+Fine control of circular polarisation of FEL2 second stage
+expert
+
 @GTOOL
 FEL-2 Delay Line Magnet
 /home/fermi/devel/utils/matlab/GUI_DL_OR2018/GUI_DelayLine_OR.m
@@ -622,6 +656,14 @@ D. Castronovo
 FEL-2 Delay Line setup tool
 essential
 
+@GTOOL
+FEL-2 Delay Line Trim Coils
+cd /home/fermi/utenti/allaria/TrimCoils/; ./run_ControllerTrimCoils.sh
+E. Allaria
+FEL-2 Delay Line Trim Coils Controller
+essential
+
+
 @GTOOL
 Fixed Gap EPU
 export PYTHONPATH=${HOME}/macros_matlab/FIDs; cd /home/fermi/macros_matlab/FIDs; python FG-EPU_panel_tango.py
@@ -643,19 +685,12 @@ B. Diviacco
 Old BUNGAP tool to control FEL-2 *Second Stage* Undulators (MOD + 6 RADS)
 expert
 
-@GTOOL
-FEL2Hertz
-/home/fermi/macros_matlab/GDN/FELswitcher.m
-FCT
-FEL@2Hz
-expert
-
-@CTOOL
-FEL-2 State Reporter
-/home/fermi/devel/utils/tcl_tk/FEL-2_Status_Reporter
-v2.1 --- W. Fawley
-Tcl/TK-Python GUI to extract and list current linac&FEL-2 parameters
-expert
+#@CTOOL
+#FEL-2 State Reporter
+#/home/fermi/devel/utils/tcl_tk/FEL-2_Status_Reporter
+#v2.1 --- W. Fawley
+#Tcl/TK-Python GUI to extract and list current linac&FEL-2 parameters
+#expert
 
 @RTOOL
 FEL Intensity Monitor
@@ -678,34 +713,26 @@ M. Trovo'
 Viewer of FEL intensity estimated from CCD_POS_F02.01 intensity or PM2A current
 essential
 
-@RTOOL
-FEL Spectrometer Profiler
-/home/fermi/devel/utils/matlab/bunch_numb_tools/spec_profile3.m
-M. Trovo'
-Displays the V/H profile of the PADReS spectrometer image
-essential
-
-@RTOOL
-FEL2 NEW Spectrometer Profiler
-/home/fermi/devel/utils/matlab/bunch_numb_tools/spec_profile_Andor.m
-M. Trovo'
-Displays the V/H profile of the PRESTO with the NEW Andor camera
-essential
+#@RTOOL
+#FEL2 NEW Spectrometer Profiler
+#/home/fermi/devel/utils/matlab/bunch_numb_tools/spec_profile_Andor.m
+#M. Trovo'
+#Displays the V/H profile of the PRESTO with the NEW Andor camera
+#essential
 
-@RTOOL
-PADRES Diagnostics FEL-2
-/home/fermi/devel/utils/matlab/DiagnoPADRES_FEL2/PADRES.m
-E. Ferrari
-An aggregator (& scan) tool for PADRES diagnostics
-essential
+#@RTOOL
+#PADRES Diagnostics FEL-2
+#/home/fermi/devel/utils/matlab/DiagnoPADRES_FEL2/PADRES.m
+#E. Ferrari
+#An aggregator (& scan) tool for PADRES diagnostics
+#essential
 
-@RTOOL
-Spectrometer Grating Switcher
-export PYTHONPATH=${HOME}/devel/utils/python/pythonPesp; cd /home/fermi/devel/utils/python/pythonPesp/; ./pesp_gui.py
-E. Ferrari 
-Switch between PADReS spectrometer gratings applying the correct offsets
-essential
-#export PYTHONPATH=${HOME}/home/eugenio/pythonPesp; cd /home/fermi/home/eugenio/pythonPesp/; ./pesp_gui.py
+#@RTOOL
+#Spectrometer Grating Switcher
+#export PYTHONPATH=${HOME}/devel/utils/python/pythonPesp; cd /home/fermi/devel/utils/python/pythonPesp/; ./#pesp_gui.py
+#E. Ferrari 
+#Switch between PADReS spectrometer gratings applying the correct offsets
+#essential
 
 @RTOOL
 Second stage radiators
@@ -714,12 +741,12 @@ E. Ferrari
 Move only the selected second stage devices
 essential
 
-@BTOOL
-Spectra Movie Maker
-/home/fermi/devel/utils/matlab/bunch_numb_tools/MovieMakerGuiSpectrum.m
-M. Trovo'
-Create an AVI movie from PADReS spectrometer
-expert
+#@BTOOL
+#Spectra Movie Maker
+#/home/fermi/devel/utils/matlab/bunch_numb_tools/MovieMakerGuiSpectrum.m
+#M. Trovo'
+#Create an AVI movie from PADReS spectrometer
+#expert
 
 @BTOOL
 RT FEL-2 Data Acquisition (v17)
@@ -770,9 +797,16 @@ G. Penco
 Standard quad scan emittance measurement tool
 essential
 
+#@CTOOL
+#Emittance Measurement.py (beta)
+#quad-scan-gui
+#M. Trovo'
+#Quad scan emittance measurement tool
+#essential
+
 @CTOOL
 Emittance Measurement.py (beta)
-cd /home/fermi/devel/utils/python/quad_scan/; xterm -e python EmittanceGUI.py;
+cd /home/fermi/devel/utils/python/quad_scan/testQThread/; xterm -e python EmittanceGUI.py;
 M. Trovo'
 Scan the quadrupole and get CCD images
 essential
@@ -812,12 +846,6 @@ M. Trovo'
 Real-time quad scan acquisition for the standard SW emit with RF shift (beta version)
 essential
 
-#@CTOOL
-#ELOC 21
-#/home/fermi/devel/utils/matlab/matching_full/ELOC21.m
-#S. Di Mitri
-#ELegant Optics Control
-
 #@CTOOL
 #OM_LINAC_F - tmp_om_linac_F_test
 #/home/fermi/devel/utils/OM/tmp_om_linac_F_test/om_linac_f.sh
@@ -888,6 +916,20 @@ F. Iazzourene
 Program for matching e-beam optics along the transfer line of FEL-2 - tmp version
 expert
 
+@CTOOL
+FELINO
+python3 /home/fermi/devel/utils/python/brynes/felino/matching.py
+A. Brynes
+Transverse optics matching tool (beta version)
+expert
+
+@CTOOL
+FODOFix
+python3 /home/fermi/devel/utils/python/fodofix/fodofix.py
+A. Brynes
+Tool for tweaking the quads in UH to improve the optics
+expert
+
 @CTOOL
 BPQuad
 /home/fermi/devel/utils/matlab/BPQuad_v0/BPQuad_GUI.m
@@ -895,18 +937,11 @@ D. Castronovo
 Layout and calculation of the beam position at the quadrupoles
 expert
 
-@CTOOL
-Get Quadrupole Displacement
-/home/fermi/devel/utils/matlab/bunch_numb_tools/GetQuadDisp02.m
-F. Curbis, M. Trovo'
-Measure displacement@quads by scanning quad current and reading BPMs
-expert
-
 #@CTOOL
-#E-beam Envelope in UH OLD
-#/home/fermi/devel/utils/matlab/EnveloBeamSizesLINAC.mpe/BeamSizesUH_02.m
-#M. Trovo'
-#Measure e-beam sizes in UH region 
+#Get Quadrupole Displacement
+#/home/fermi/devel/utils/matlab/bunch_numb_tools/GetQuadDisp02.m
+#F. Curbis, M. Trovo'
+#Measure displacement@quads by scanning quad current and reading BPMs
 #expert
 
 @CTOOL
@@ -918,17 +953,13 @@ expert
 
 @CTOOL
 E-beam Envelope in UH Region
-/home/fermi/devel/utils/matlab/Envelope/BeamSizesUH_05.m
+/home/fermi/devel/utils/matlab/Envelope/BeamSizesUH_echo1.m
 M. Trovo'
 Measure e-beam sizes in UH region with RF shiftting.
 expert
 
-@CTOOL
-FELINO
-python3 /home/fermi/devel/utils/python/brynes/felino/matching.py
-A. Brynes
-Transverse optics matching tool (beta version)
-expert
+#/home/fermi/devel/utils/matlab/Envelope/BeamSizesUH_05.m
+
 
 @BTOOL
 Envelope Size Post-Process Tool
@@ -1019,40 +1050,40 @@ G. Penco
 Time jitter and current profile meas. with LERFD or HERFD 
 expert
 
-@CTOOL
-CBLM1 Bunch Length
-/home/fermi/devel/utils/matlab/BLM_gui/GUI_acquire_CBLM_data_v5.m
-R. Appio
-Measure the signals from CBLM1 detectors
-expert
+#@CTOOL
+#CBLM1 Bunch Length
+#/home/fermi/devel/utils/matlab/BLM_gui/GUI_acquire_CBLM_data_v5.m
+#R. Appio
+#Measure the signals from CBLM1 detectors
+#expert
 
-@CTOOL
-CBLM2 Bunch Length
-/home/fermi/devel/utils/matlab/BLM_gui/GUI_acquire_CBLM_data_BC2_v5.m
-R. Appio
-Measure the signals from CBLM2 detectors
-expert
+#@CTOOL
+#CBLM2 Bunch Length
+#/home/fermi/devel/utils/matlab/BLM_gui/GUI_acquire_CBLM_data_BC2_v5.m
+#R. Appio
+#Measure the signals from CBLM2 detectors
+#expert
 
-@CTOOL
-BPM Resolution
-/home/fermi/devel/utils/matlab/cbpm/resolution.m
-M. Dal Forno, P. Craievich
-Measure the BPMs resolution
-expert
+#@CTOOL
+#BPM Resolution
+#/home/fermi/devel/utils/matlab/cbpm/resolution.m
+#M. Dal Forno, P. Craievich
+#Measure the BPMs resolution
+#expert
 
-@CTOOL
-C-BPM Calibration
-/home/fermi/devel/utils/matlab/cbpm/calibration.m
-M. Dal Forno, P. Craievich
-Calibrate the C-BPM with the mover
-expert
+#@CTOOL
+#C-BPM Calibration
+#/home/fermi/devel/utils/matlab/cbpm/calibration.m
+#M. Dal Forno, P. Craievich
+#Calibrate the C-BPM with the mover
+#expert
 
-@CTOOL
-HERFD PW measurement
-/home/fermi/devel/utils/matlab/HERFD/herfd_xy_MW.m
-M. Dal Forno
-HERFD Power measurement (see HERFD wikipage for details)
-expert
+#@CTOOL
+#HERFD PW measurement
+#/home/fermi/devel/utils/matlab/HERFD/herfd_xy_MW.m
+#M. Dal Forno
+#HERFD Power measurement (see HERFD wikipage for details)
+#expert
 
 %@CTOOL
 %Open mbi oscilloscope
@@ -1060,41 +1091,42 @@ expert
 %E. Roussel
 %Open the mbi station oscilloscope with the IR photodiode
 
-@CTOOL
-Open CCD DiProi 05
-gigecam srv-diproi-srf:20000/diproi/diagnostics/ccd_diproi.05 diproi/diagnostics/ccd_diproi.05
-E. Roussel
-Open the CCD DiProi 05
-
-@CTOOL
-Fast FEL Quality Factor PRESTO 
-/home/fermi/devel/utils/matlab/FastFQF/Runner_FastFQF.m
-N. Bruchon
-Configuration and display of the Fast FEL Quality Factor for Timer, Timex, Diproi and Ldm
+@RTOOL
+Fast FEL Quality Factor 
+cd /home/fermi/devel/utils/python/Qf_tool/; xterm -e python3 QfTool.py;
+MT & GG 
+Configuration and display of the Fast FEL Quality Factor
 essential
 
-@CTOOL
-Fast FEL Quality Factor TARDI 
-/home/fermi/devel/utils/matlab/FastFQF-Mag/Runner_FastFQF.m
-N. Bruchon
-Configuration and display of the Fast FEL Quality Factor for Magnedyn
-essential
+#@CTOOL
+#Fast FEL Quality Factor PRESTO 
+#/home/fermi/devel/utils/matlab/FastFQF/Runner_FastFQF.m
+#N. Bruchon
+#Configuration and display of the Fast FEL Quality Factor for Timer, Timex, Diproi and Ldm
+#essential
 
-@RTOOL
+#@CTOOL
+#Fast FEL Quality Factor TARDI 
+#/home/fermi/devel/utils/matlab/FastFQF-Mag/Runner_FastFQF.m
+#N. Bruchon
+#Configuration and display of the Fast FEL Quality Factor for Magnedyn
+#essential
+
+@BTOOL
 SIMBAD
 cd /home/fermi/devel/utils/python/IR_Spec_EEHG/SIMBAD; xterm -e python3 -i GUI_syMBIote_v6.py
 S. Spampinati, G. Perosa
 Post process of IR spectrometer in EEHG
 expert
 
-@RTOOL
+@BTOOL
 SyMBIosis LH scan
 cd /home/fermi/devel/utils/python/IR_Spec_EEHG/; xterm -e python SpettrometroIRSweep_v70_LHscan.py;
 CarSpe, GioPer
 Spettrometro IR per ubuncing in EEHG LH scan
 expert
 
-@RTOOL
+@BTOOL
 SyMBIosis PYRO scan
 cd /home/fermi/devel/utils/python/IR_Spec_EEHG/; xterm -e python SpettrometroIRSweep_v70_PYROscan.py;
 CarSpe, GioPer
@@ -1114,90 +1146,69 @@ E. Ferrari
 Turn ON or put in STANDBY all the e-beam feedbacks of FEL lines, shows the status
 essential
 
-@RTOOL
+@GTOOL
 RMN Enable/Disable
 export PYTHONPATH=${HOME}//home/fermi/devel/utils/python/RNM; cd /home/fermi/devel/utils/python/RNM; ./rnm_gui.py
 E. Ferrari
 Enable/Disable the real time acquisitions for the klystrons. Use in conjunction with the feedbacks
 expert
 
-@GTOOL
+@CTOOL
 Trajectory Feedback Reload
 /home/fermi/devel/utils/matlab/trajec_corr/ResetTractoryRef.m
 M. Trovo'
 Reload and apply a saved trajectory feedback reference file
 expert
 
-@CTOOL
-Charge Feedback
-/home/fermi/bin/matlab/charge_feedback/main.m
-L. Froehlich, M. Trovo'
-Stabilize bunch charge by regulating the PIL attenuator
-essential
-
-@CTOOL
-Compression Feedback
-/home/fermi/devel/utils/matlab/compression_feedback/main.m
-L. Froehlich, M. Trovo'
-Stabilize bunch compression by regulating the phases of K3-K5
-expert
-
-@CTOOL
-Compression Feedback BC2
-/home/fermi/bin/matlab/compression_feedback_bc2/main.m
-L. Froehlich, M. Trovo'
-Stabilize bunch compression in BC2 by regulating the phases of K6-K9
-expert
-
-@CTOOL
-Energy Feedback @LH
-/home/fermi/bin/matlab/energy_feedback_lh/main.m
-L. Froehlich, M. Trovo'
-Stabilize beam energy in LH by regulating the amplitude of K2
-expert
-
-@CTOOL
-Energy Feedback @BC1
-/home/fermi/bin/matlab/energy_feedback/main.m
-L. Froehlich, M. Trovo'
-Stabilize beam energy in BC1 by regulating amplitudes K2, K3, K5, phase K4
-expert
+#@CTOOL
+#Charge Feedback
+#/home/fermi/bin/matlab/charge_feedback/main.m
+#L. Froehlich, M. Trovo'
+#Stabilize bunch charge by regulating the PIL attenuator
+#essential
 
-@CTOOL
-Energy Feedback @BC2
-/home/fermi/bin/matlab/energy_feedback_bc2/main.m
-L. Froehlich, M. Trovo'
-Stabilize beam energy in BC2 by regulating the amplitudes of K6-K9
-expert
+#@CTOOL
+#Compression Feedback
+#/home/fermi/devel/utils/matlab/compression_feedback/main.m
+#L. Froehlich, M. Trovo'
+#Stabilize bunch compression by regulating the phases of K3-K5
+#expert
 
-@CTOOL
-Energy Feedback @Spreader
-/home/fermi/bin/matlab/energy_feedback_scl/main.m
-L. Froehlich, M. Trovo'
-Stabilize beam energy in the spreader by regulating amplitudes K10-K14
-expert
+#@CTOOL
+#Compression Feedback BC2
+#/home/fermi/bin/matlab/compression_feedback_bc2/main.m
+#L. Froehlich, M. Trovo'
+#Stabilize bunch compression in BC2 by regulating the phases of K6-K9
+#expert
 
-@YTOOL
-Seed Laser Pointing Feedback
-/home/fermi/devel/utils/matlab/trajec_corr/SeedPointing.m
-M. Trovo'
-Uses the feedback reference to control seed pointing
-essential
+#@CTOOL
+#Energy Feedback @LH
+#/home/fermi/bin/matlab/energy_feedback_lh/main.m
+#L. Froehlich, M. Trovo'
+#Stabilize beam energy in LH by regulating the amplitude of K2
+#expert
 
-% @CTOOL
-% Trajectory Feedback
-% /home/fermi/macros_matlab/Magnus/generic_fb_v1.3/gui/Giulio.m
-% M. Sjostrom, S. Di Mitri, G. Gaio
-% Trajectory correction and feedback for the whole linac
-%expert
+#@CTOOL
+#Energy Feedback @BC1
+#/home/fermi/bin/matlab/energy_feedback/main.m
+#L. Froehlich, M. Trovo'
+#Stabilize beam energy in BC1 by regulating amplitudes K2, K3, K5, phase K4
+#expert
 
-#@TOOL
-#Trajectory2BPMs
-#/home/fermi/devel/utils/matlab/trajec_corr/ResetBpmOffset.m
-#M. Trovo'
-#Transfer the Feedback trajectory deviation into BPM offsets
+#@CTOOL
+#Energy Feedback @Spreader
+#/home/fermi/bin/matlab/energy_feedback_scl/main.m
+#L. Froehlich, M. Trovo'
+#Stabilize beam energy in the spreader by regulating amplitudes K10-K14
 #expert
 
+#% @CTOOL
+#% Trajectory Feedback
+#% /home/fermi/macros_matlab/Magnus/generic_fb_v1.3/gui/Giulio.m
+#% M. Sjostrom, S. Di Mitri, G. Gaio
+#% Trajectory correction and feedback for the whole linac
+#%expert
+
 @BTOOL
 Feedback Correlations
 /home/fermi/devel/utils/matlab/feedback_correlator/main.m
@@ -1308,12 +1319,12 @@ L. Froehlich, E. Ferrari
 Scan one or two Tango properties while recording others
 essential
 
-@BTOOL
-Measure Correlation of Devices
-/home/fermi/devel/utils/matlab/bunch_numb_tools/GetBpmCorrelation.m
-L. Giannessi, M. Trovo'
-Acquire a device couple synchronously and estimate the correlation
-essential
+#@BTOOL
+#Measure Correlation of Devices
+#/home/fermi/devel/utils/matlab/bunch_numb_tools/GetBpmCorrelation.m
+#L. Giannessi, M. Trovo'
+#Acquire a device couple synchronously and estimate the correlation
+#essential
 
 @BTOOL
 Beam Snapshot
@@ -1329,20 +1340,6 @@ M. Trovo'
 Create an AVI movie from screen images
 essential
 
-@CTOOL
-E-beam rate slower
-/home/fermi/devel/utils/matlab/Envelope/BeamSlower.m
-M. Trovo'
-Reduce the rep. rate of the e-beam with RF shiftting
-expert
-
-#@YTOOL
-#Laser Trigger Reset
-#/home/fermi/macros_matlab/GP/Trigger_reset/Trigger_reset.m
-#G. Penco
-#Laser trigger reset
-#expert
-
 @EXPERTTOOL
 Lock timing links
 /home/fermi/utenti/fabio.rossi/machine_files/pulsed_autolock/start.m
@@ -1371,7 +1368,7 @@ expert
 #Prints and saves on file the readouts of the undulator tilt-meters
 #expert
 
-@RTOOL
+@BTOOL
 Measure Correlation of Devices
 export PYTHONPATH=${HOME}/devel/utils/python/correlatorMonitor; cd /home/fermi/devel/utils/python/correlatorMonitor; ./main.py
 E. Ferrari
@@ -1392,28 +1389,28 @@ G. Gaio
 Plot historical correlation between machine and FEL diagnostics
 expert
 
-@EXPERTTOOL
-DB viewer
-cd ${HOME}/utenti/eugenio/sqlitebrowser; ./DB\ Browser\ for\ SQLite
-E. Ferrari
-Tool to visualize databases
+@CTOOL
+Restore magnets by goups
+cd /home/fermi/devel/utils/python/srTool/; xterm -e python3  contexts_restorer.py;
+Tro & Trip
+Restore Magnets by group from values of a saverestore snapshot
 expert
 
-@RTOOL
-OLD Save&Restore
-/runtime/bin/saverestore;
-Giacomo
-Backup of the old time machine
-essential
+#@EXPERTTOOL
+#DB viewer
+#cd ${HOME}/utenti/eugenio/sqlitebrowser; ./DB\ Browser\ for\ SQLite
+#E. Ferrari
+#Tool to visualize databases
+#expert
 
-@RTOOL
-NEW PSgroup
-/runtime/bin//psgroupmanager /home/fermi/etc/fermi_psgroups.xml;
-Giacomo
-Gruppi
-expert
+#@RTOOL
+#OLD Save&Restore
+#/runtime/bin/saverestore;
+#Giacomo
+#Backup of the old time machine
+#essential
 
-@RTOOL
+@CTOOL
 SPBC01 FFT Monitor
 cd /home/fermi/devel/utils/python/SPBC1_Monitor/; xterm -e python SPBC1_FFT_monitor.py;
 Carlo
@@ -1422,14 +1419,14 @@ expert
 
 @RTOOL
 UndAl Fel1 - Feedback
-cd /home/fermi/devel/utils/python/undal/; xterm -e python prestofitFel1trjfb.py;
+cd /home/fermi/devel/utils/python/undal/; xterm -e python prestofitFel1trjfbEEHG.py;
 Carlo
 Allineamento Ondulatore FEL1 muovendo il TrjFB
 expert
 
 @RTOOL
 UndAl Fel1 - Q_Movers
-cd /home/fermi/devel/utils/python/undal/; xterm -e python prestofitFel1qmov.py;
+cd /home/fermi/devel/utils/python/undal/; xterm -e python prestofitFel1qmovEEHG.py;
 Carlo
 Allineamento Ondulatore FEL1 muovendo i Q_Movers
 expert
@@ -1441,7 +1438,12 @@ Carlo
 Allineamento Ondulatore FEL2 muovendo il TrjFB
 expert
 
-
+@RTOOL
+UndAl Fel2 - Q_Movers
+cd /home/fermi/devel/utils/python/undal/; xterm -e python prestofitFel2qmov.py;
+Carlo
+Allineamento Ondulatore FEL2 muovendo i Q_Movers
+expert
 
 #@GTOOL
 #Diproi Browser
@@ -1450,26 +1452,26 @@ expert
 #Open diproi browser
 #expert
 
-@RTOOL
-LDM Spectrometer Profiler
-/home/fermi/devel/utils/matlab/bunch_numb_tools/spec3_andor_ldm.m
-M. Trovo'
-Displays the V/H profile of the ANDOR ccd of LDM spectrometer
-essential
+#@RTOOL
+#LDM Spectrometer Profiler
+#/home/fermi/devel/utils/matlab/bunch_numb_tools/spec3_andor_ldm.m
+#M. Trovo'
+#Displays the V/H profile of the ANDOR ccd of LDM spectrometer
+#essential
 
-@RTOOL
-LDM TOF
-/home/fermi/devel/utils/matlab/bunch_numb_tools/bottigla_magnetica.m
-M. Trovo'
-Displays the TOF channel 3 of LDM
-essential
+#@RTOOL
+#LDM TOF
+#/home/fermi/devel/utils/matlab/bunch_numb_tools/bottigla_magnetica.m
+#M. Trovo'
+#Displays the TOF channel 3 of LDM
+#essential
 
-@RTOOL
-LDM Rad6 POL SW
-cd /home/fermi/devel/utils/python/LDM_spec/; xterm -e python LdmPolarizationSwitch.py;
-M. Trovo'
-Tool per lo switch della pol. circolare del sesto radiatore 
-expert
+#@RTOOL
+#LDM Rad6 POL SW
+#cd /home/fermi/devel/utils/python/LDM_spec/; xterm -e python LdmPolarizationSwitch.py;
+#M. Trovo'
+#Tool per lo switch della pol. circolare del sesto radiatore 
+#expert
 
 
 %%%%%%%%%%%%%%%  LEGENDA  %%%%%%%%%%%%%%%%%%%%%%%%