diff --git a/elettra.xml b/elettra.xml index a3164d3a4f9da8e8a90106633badc78ed7a8ac82..d0baeda14fbe1a8ca6ee08b28771af79f6a0d29d 100644 --- a/elettra.xml +++ b/elettra.xml @@ -2629,11 +2629,11 @@ <title>FRTND_S2.2</title> </element> - <element exename="frntend sr/vacuum/phbsh_s3.2 S3.2" executable="yes" > + <element exename="frntend-new-gui sr/vacuum/phbsh_s3.2 sr/vacuum/vlvfe_s3.2 sr/vacuum/sip120_s03.02" executable="yes" > <title>FRTND_S3.2</title> </element> - <element exename="frntend sr/vacuum/phbsh_s4.2 S4.2" executable="yes" > + <element exename="frntend-new-gui sr/vacuum/phbsh_s4.2 sr/vacuum/vlvfe_s4.2 sr/vacuum/sip120_s04.02" executable="yes" > <title>FRTND_S4.2</title> </element> @@ -2723,6 +2723,23 @@ <element exename="tpg_f sa/vacuum/vgpwr_s02.07" executable="yes"> <title>VGPWR_S2.07</title> </element> + + + <element exename="tpg_f sa/vacuum/vgpwr_s04.01" executable="yes"> + <title>VGPWR_S4.01</title> + </element> + + <element exename="tpg_f sa/vacuum/vgpwr_s04.02" executable="yes"> + <title>VGPWR_S4.02</title> + </element> + + <element exename="tpg_f sa/vacuum/vgpwr_s04.03" executable="yes"> + <title>VGPWR_S4.03</title> + </element> + + <element exename="tpg_f sa/vacuum/vgpwr_s04.04" executable="yes"> + <title>VGPWR_S4.04</title> + </element> <element exename="tpg_f sa/vacuum/vgpwr_s10.01" executable="yes"> <title>VGPWR_S10.01</title> @@ -2780,24 +2797,39 @@ <element exename="FourUHV sa/vacuum/sippwr_s02.07" executable="yes" > <title>SIPPWR_S02.07</title> </element> - <element exename="SIPPWR /home/elettra/etc/ELETTRA.cfg S4.1 SIPPWR 0" executable="yes" haslinks="yes" > - <title>SIPPWR_S4.1</title> - </element> - <element exename="SIPPWR /home/elettra/etc/ELETTRA.cfg S4.2 SIPPWR 0" executable="yes" haslinks="yes" > - <title>SIPPWR_S4.2</title> - </element> - <element exename="SIPPWR /home/elettra/etc/ELETTRA.cfg S4.3 SIPPWR 0" executable="yes" haslinks="yes" > - <title>SIPPWR_S4.3</title> - </element> - <element exename="SIPPWR /home/elettra/etc/ELETTRA.cfg S4.4 SIPPWR 0" executable="yes" haslinks="yes" > - <title>SIPPWR_S4.4</title> - </element> - <element exename="SIPPWR /home/elettra/etc/ELETTRA.cfg S4.5 SIPPWR 0" executable="yes" haslinks="yes" > - <title>SIPPWR_S4.5</title> - </element> - <element exename="SIPPWR /home/elettra/etc/ELETTRA.cfg S4.6 SIPPWR 0" executable="yes" haslinks="yes" > - <title>SIPPWR_S4.6</title> - </element> + + <element exename="FourUHV sa/vacuum/sippwr_s04.01" executable="yes" > + <title>SIPPWR_S04.01</title> + </element> + + <element exename="FourUHV sa/vacuum/sippwr_s04.02" executable="yes" > + <title>SIPPWR_S04.02</title> + </element> + + <element exename="FourUHV sa/vacuum/sippwr_s04.03" executable="yes" > + <title>SIPPWR_S04.03</title> + </element> + + <element exename="FourUHV sa/vacuum/sippwr_s04.04" executable="yes" > + <title>SIPPWR_S04.04</title> + </element> + + <element exename="FourUHV sa/vacuum/sippwr_s04.05" executable="yes" > + <title>SIPPWR_S04.05</title> + </element> + + <element exename="FourUHV sa/vacuum/sippwr_s04.06" executable="yes" > + <title>SIPPWR_S04.06</title> + </element> + + <element exename="FourUHV sa/vacuum/sippwr_s04.07" executable="yes" > + <title>SIPPWR_S04.07</title> + </element> + + <element exename="FourUHV sa/vacuum/sippwr_s04.08" executable="yes" > + <title>SIPPWR_S04.08</title> + </element> + <element exename="SIPPWR /home/elettra/etc/ELETTRA.cfg S6.1 SIPPWR 0" executable="yes" haslinks="yes" > <title>SIPPWR_S6.1</title> </element> @@ -2964,81 +2996,63 @@ <element exename="sip sr/vacuum/sip120_s03.05" executable="yes"> <title>SIP120_S3.5</title> </element> - <element exename="SIP120 /home/elettra/etc/ELETTRA.cfg S3.6 SIP120 0" executable="yes" haslinks="yes" > + <element exename="sip sr/vacuum/sip120_s03.06" executable="yes" haslinks="yes" > <title>SIP120_S3.6</title> - <link exename="SIPPWR /home/elettra/etc/ELETTRA.cfg S4.1 SIPPWR 0" executable="yes" >SIPPWR_S4.1</link> </element> - <element exename="SIP120 /home/elettra/etc/ELETTRA.cfg S3.7 SIP120 0" executable="yes" haslinks="yes" > + <element exename="sip sr/vacuum/sip120_s03.07" executable="yes" haslinks="yes" > <title>SIP120_S3.7</title> - <link exename="SIPPWR /home/elettra/etc/ELETTRA.cfg S4.5 SIPPWR 0" executable="yes" >SIPPWR_S4.5</link> </element> - <element exename="SIP120 /home/elettra/etc/ELETTRA.cfg S3.8 SIP120 0" executable="yes" haslinks="yes" > + <element exename="sip sr/vacuum/sip120_s03.08" executable="yes" haslinks="yes" > <title>SIP120_S3.8</title> - <link exename="SIPPWR /home/elettra/etc/ELETTRA.cfg S4.3 SIPPWR 0" executable="yes" >SIPPWR_S4.3</link> </element> - <element exename="SIP120 /home/elettra/etc/ELETTRA.cfg S3.9 SIP120 0" executable="yes" haslinks="yes" > + <element exename="sip sr/vacuum/sip120_s03.09" executable="yes" haslinks="yes" > <title>SIP120_S3.9</title> - <link exename="SIPPWR /home/elettra/etc/ELETTRA.cfg S4.1 SIPPWR 0" executable="yes" >SIPPWR_S4.1</link> </element> - <element exename="SIP120 /home/elettra/etc/ELETTRA.cfg S3.10 SIP120 0" executable="yes" haslinks="yes" > + <element exename="sip sr/vacuum/sip120_s03.10" executable="yes" haslinks="yes" > <title>SIP120_S3.10</title> - <link exename="SIPPWR /home/elettra/etc/ELETTRA.cfg S4.5 SIPPWR 0" executable="yes" >SIPPWR_S4.5</link> </element> - <element exename="SIP120 /home/elettra/etc/ELETTRA.cfg S4.1 SIP120 0" executable="yes" haslinks="yes" > + <element exename="sip sr/vacuum/sip120_s04.01" executable="yes" haslinks="yes" > <title>SIP120_S4.1</title> - <link exename="SIPPWR /home/elettra/etc/ELETTRA.cfg S4.3 SIPPWR 0" executable="yes" >SIPPWR_S4.3</link> </element> - <element exename="SIP120 /home/elettra/etc/ELETTRA.cfg S4.2 SIP120 0" executable="yes" haslinks="yes" > + <element exename="sip sr/vacuum/sip120_s04.02" executable="yes" haslinks="yes" > <title>SIP120_S4.2</title> - <link exename="SIPPWR /home/elettra/etc/ELETTRA.cfg S4.1 SIPPWR 0" executable="yes" >SIPPWR_S4.1</link> </element> - <element exename="SIP120 /home/elettra/etc/ELETTRA.cfg S4.3 SIP120 0" executable="yes" haslinks="yes" > + <element exename="sip sr/vacuum/sip120_s04.03" executable="yes" haslinks="yes" > <title>SIP120_S4.3</title> - <link exename="SIPPWR /home/elettra/etc/ELETTRA.cfg S4.5 SIPPWR 0" executable="yes" >SIPPWR_S4.5</link> </element> - <element exename="SIP120 /home/elettra/etc/ELETTRA.cfg S4.4 SIP120 0" executable="yes" haslinks="yes" > + <element exename="sip sr/vacuum/sip120_s04.04" executable="yes" haslinks="yes" > <title>SIP120_S4.4</title> - <link exename="SIPPWR /home/elettra/etc/ELETTRA.cfg S4.3 SIPPWR 0" executable="yes" >SIPPWR_S4.3</link> </element> - <element exename="SIP120 /home/elettra/etc/ELETTRA.cfg S4.5 SIP120 0" executable="yes" haslinks="yes" > + <element exename="sip sr/vacuum/sip120_s04.05" executable="yes" haslinks="yes" > <title>SIP120_S4.5</title> - <link exename="SIPPWR /home/elettra/etc/ELETTRA.cfg S4.1 SIPPWR 0" executable="yes" >SIPPWR_S4.1</link> </element> - <element exename="SIP120 /home/elettra/etc/ELETTRA.cfg S4.6 SIP120 0" executable="yes" haslinks="yes" > + <element exename="sip sr/vacuum/sip120_s04.06" executable="yes" haslinks="yes" > <title>SIP120_S4.6</title> - <link exename="SIPPWR /home/elettra/etc/ELETTRA.cfg S4.5 SIPPWR 0" executable="yes" >SIPPWR_S4.5</link> + <!-- <link exename="SIPPWR /home/elettra/etc/ELETTRA.cfg S4.5 SIPPWR 0" executable="yes" >SIPPWR_S4.5</link>--> </element> - <element exename="SIP120 /home/elettra/etc/ELETTRA.cfg S4.7 SIP120 0" executable="yes" haslinks="yes" > + <element exename="sip sr/vacuum/sip120_s04.07" executable="yes" haslinks="yes" > <title>SIP120_S4.7</title> - <link exename="SIPPWR /home/elettra/etc/ELETTRA.cfg S4.3 SIPPWR 0" executable="yes" >SIPPWR_S4.3</link> </element> - <element exename="SIP120 /home/elettra/etc/ELETTRA.cfg S4.8 SIP120 0" executable="yes" haslinks="yes" > + <element exename="sip sr/vacuum/sip120_s04.08" executable="yes" haslinks="yes" > <title>SIP120_S4.8</title> - <link exename="SIPPWR /home/elettra/etc/ELETTRA.cfg S4.1 SIPPWR 0" executable="yes" >SIPPWR_S4.1</link> </element> - <element exename="SIP120 /home/elettra/etc/ELETTRA.cfg S4.9 SIP120 0" executable="yes" haslinks="yes" > + <element exename="sip sr/vacuum/sip120_s04.09" executable="yes" haslinks="yes" > <title>SIP120_S4.9</title> - <link exename="SIPPWR /home/elettra/etc/ELETTRA.cfg S4.5 SIPPWR 0" executable="yes" >SIPPWR_S4.5</link> </element> - <element exename="SIP120 /home/elettra/etc/ELETTRA.cfg S5.1 SIP120 0" executable="yes" haslinks="yes" > + <element exename="sip sr/vacuum/sip120_s05.01" executable="yes" haslinks="yes" > <title>SIP120_S5.1</title> - <link exename="SIPPWR /home/elettra/etc/ELETTRA.cfg S4.3 SIPPWR 0" executable="yes" >SIPPWR_S4.3</link> </element> - <element exename="SIP120 /home/elettra/etc/ELETTRA.cfg S5.2 SIP120 0" executable="yes" haslinks="yes" > + <element exename="sip sr/vacuum/sip120_s05.02" executable="yes" haslinks="yes" > <title>SIP120_S5.2</title> - <link exename="SIPPWR /home/elettra/etc/ELETTRA.cfg S4.1 SIPPWR 0" executable="yes" >SIPPWR_S4.1</link> </element> - <element exename="SIP120 /home/elettra/etc/ELETTRA.cfg S5.3 SIP120 0" executable="yes" haslinks="yes" > + <element exename="sip sr/vacuum/sip120_s05.03" executable="yes" haslinks="yes" > <title>SIP120_S5.3</title> - <link exename="SIPPWR /home/elettra/etc/ELETTRA.cfg S4.5 SIPPWR 0" executable="yes" >SIPPWR_S4.5</link> </element> - <element exename="SIP120 /home/elettra/etc/ELETTRA.cfg S5.4 SIP120 0" executable="yes" haslinks="yes" > + <element exename="sip sr/vacuum/sip120_s05.04" executable="yes" haslinks="yes" > <title>SIP120_S5.4</title> - <link exename="SIPPWR /home/elettra/etc/ELETTRA.cfg S4.3 SIPPWR 0" executable="yes" >SIPPWR_S4.3</link> </element> - <element exename="SIP120 /home/elettra/etc/ELETTRA.cfg S5.5 SIP120 0" executable="yes" haslinks="yes" > + <element exename="sip sr/vacuum/sip120_s05.05" executable="yes" haslinks="yes" > <title>SIP120_S5.5</title> - <link exename="SIPPWR /home/elettra/etc/ELETTRA.cfg S4.1 SIPPWR 0" executable="yes" >SIPPWR_S4.1</link> </element> <element exename="SIP120 /home/elettra/etc/ELETTRA.cfg S5.6 SIP120 0" executable="yes" haslinks="yes" > <title>SIP120_S5.6</title> @@ -3332,21 +3346,17 @@ <element exename="sip sr/vacuum/sip400_s03.01" executable="yes"> <title>SIP400_S3.1</title> </element> - <element exename="SIP400 /home/elettra/etc/ELETTRA.cfg S3.2 SIP400 0" executable="yes" haslinks="yes" > + <element exename="sip sr/vacuum/sip400_s03.01" executable="yes" haslinks="yes" > <title>SIP400_S3.2</title> - <link exename="SIPPWR /home/elettra/etc/ELETTRA.cfg S4.4 SIPPWR 0" executable="yes" >SIPPWR_S4.4</link> </element> - <element exename="SIP400 /home/elettra/etc/ELETTRA.cfg S4.1 SIP400 0" executable="yes" haslinks="yes" > + <element exename="sip sr/vacuum/sip400_s04.01" executable="yes" haslinks="yes" > <title>SIP400_S4.1</title> - <link exename="SIPPWR /home/elettra/etc/ELETTRA.cfg S4.4 SIPPWR 0" executable="yes" >SIPPWR_S4.4</link> </element> - <element exename="SIP400 /home/elettra/etc/ELETTRA.cfg S4.2 SIP400 0" executable="yes" haslinks="yes" > + <element exename="sip sr/vacuum/sip400_s04.02" executable="yes" haslinks="yes" > <title>SIP400_S4.2</title> - <link exename="SIPPWR /home/elettra/etc/ELETTRA.cfg S4.2 SIPPWR 0" executable="yes" >SIPPWR_S4.2</link> </element> - <element exename="SIP400 /home/elettra/etc/ELETTRA.cfg S5.1 SIP400 0" executable="yes" haslinks="yes" > + <element exename="sip sr/vacuum/sip400_s05.01" executable="yes" haslinks="yes" > <title>SIP400_S5.1</title> - <link exename="SIPPWR /home/elettra/etc/ELETTRA.cfg S4.2 SIPPWR 0" executable="yes" >SIPPWR_S4.2</link> </element> <element exename="SIP400 /home/elettra/etc/ELETTRA.cfg S5.2 SIP400 0" executable="yes" haslinks="yes" > <title>SIP400_S5.2</title> @@ -3432,14 +3442,11 @@ <element exename="sip sr/vacuum/sipid_s03.03" executable="yes"> <title>SIPID_S3.3</title> </element> - <element exename="SIPID /home/elettra/etc/ELETTRA.cfg S5.1 SIPID 0" executable="yes" haslinks="yes" > + <element exename="sip sr/vacuum/sipid_s05.01" executable="yes" haslinks="yes" > <title>SIPID_S5.1</title> - - <link exename="SIPPWR /home/elettra/etc/ELETTRA.cfg S4.6 SIPPWR 0" executable="yes" >SIPPWR_S4.6</link> </element> - <element exename="SIPID /home/elettra/etc/ELETTRA.cfg S5.3 SIPID 0" executable="yes" haslinks="yes" > + <element exename="sip sr/vacuum/sipid_s05.03" executable="yes" haslinks="yes" > <title>SIPID_S5.3</title> - <link exename="SIPPWR /home/elettra/etc/ELETTRA.cfg S4.6 SIPPWR 0" executable="yes" >SIPPWR_S4.6</link> </element> <element exename="SIPID /home/elettra/etc/ELETTRA.cfg S6.1 SIPID 0" executable="yes" > <title>SIPID_S6.1</title> @@ -3464,15 +3471,6 @@ <folder folded="yes" exename="" executable="no" > <title>TPG</title> <description/> - <element exename="TPG /home/elettra/etc/ELETTRA.cfg S4.1 TPG 0" executable="yes" haslinks="yes" > - <title>TPG_S4.1</title> - </element> - <element exename="TPG /home/elettra/etc/ELETTRA.cfg S4.2 TPG 0" executable="yes" haslinks="yes" > - <title>TPG_S4.2</title> - </element> - <element exename="TPG /home/elettra/etc/ELETTRA.cfg S4.3 TPG 0" executable="yes" haslinks="yes" > - <title>TPG_S4.3</title> - </element> <element exename="TPG /home/elettra/etc/ELETTRA.cfg S6.1 TPG 0" executable="yes" haslinks="yes" > <title>TPG_S6.1</title> </element> @@ -3558,13 +3556,8 @@ <element exename="vg sr/vacuum/vgpe_s03.03" executable="yes" haslinks="yes" > <title>VGPE_S3.3</title>k> </element> - <element exename="VGPE /home/elettra/etc/ELETTRA.cfg S4.4 VGPE 0" executable="yes" haslinks="yes" > + <element exename="vg sr/vacuum/vgpe_s04.04" executable="yes" haslinks="yes" > <title>VGPE_S4.4</title> - <link exename="TPG /home/elettra/etc/ELETTRA.cfg S4.2 TPG 0" executable="yes" >TPG_S4.2</link> - </element> - <element exename="VGPE /home/elettra/etc/ELETTRA.cfg S5.5 VGPE 0" executable="yes" haslinks="yes" > - <title>VGPE_S5.5</title> - <link exename="TPG /home/elettra/etc/ELETTRA.cfg S4.2 TPG 0" executable="yes" >TPG_S4.2</link> </element> <element exename="VGPE /home/elettra/etc/ELETTRA.cfg S6.6 VGPE 0" executable="yes" haslinks="yes" > <title>VGPE_S6.6</title> @@ -3614,29 +3607,20 @@ <element exename="vg sr/vacuum/vgpeb_s02.02" executable="yes" haslinks="yes" > <title>VGPEB_S2.2</title> </element> - <element exename="vg sr/vacuum/vgpeb_s03.0`" executable="yes" haslinks="yes" > + <element exename="vg sr/vacuum/vgpeb_s03.01" executable="yes" haslinks="yes" > <title>VGPEB_S3.1</title> </element> - <element exename="VGPEB /home/elettra/etc/ELETTRA.cfg S4.1 VGPEB 0" executable="yes" haslinks="yes" > + <element exename="vg sr/vacuum/vgpeb_s04.01" executable="yes" haslinks="yes" > <title>VGPEB_S4.1</title> - <link exename="" executable="yes" >VACSEC_S.2</link> - <link exename="TPG /home/elettra/etc/ELETTRA.cfg S4.1 TPG 0" executable="yes" >TPG_S4.1</link> </element> - <element exename="VGPEB /home/elettra/etc/ELETTRA.cfg S4.2 VGPEB 0" executable="yes" haslinks="yes" > + <element exename="vg sr/vacuum/vgpeb_s04.02" executable="yes" haslinks="yes" > <title>VGPEB_S4.2</title> - - <link exename="" executable="yes" >VACSEC_S.2</link> - <link exename="TPG /home/elettra/etc/ELETTRA.cfg S4.3 TPG 0" executable="yes" >TPG_S4.3</link> </element> - <element exename="VGPEB /home/elettra/etc/ELETTRA.cfg S5.1 VGPEB 0" executable="yes" haslinks="yes" > + <element exename="vg sr/vacuum/vgpeb_s05.01" executable="yes" haslinks="yes" > <title>VGPEB_S5.1</title> - - <link exename="" executable="yes" >VACSEC_S.2</link> - <link exename="TPG /home/elettra/etc/ELETTRA.cfg S4.3 TPG 0" executable="yes" >TPG_S4.3</link> </element> <element exename="VGPEB /home/elettra/etc/ELETTRA.cfg S5.2 VGPEB 0" executable="yes" haslinks="yes" > <title>VGPEB_S5.2</title> - <link exename="" executable="yes" >VACSEC_S.3</link> <link exename="TPG /home/elettra/etc/ELETTRA.cfg S6.1 TPG 0" executable="yes" >TPG_S6.1</link> </element> @@ -3730,15 +3714,11 @@ <element exename="vg sr/vacuum/vgpeid_s03.03" executable="yes"> <title>VGPEID_S3.3</title> </element> - <element exename="VGPEID /home/elettra/etc/ELETTRA.cfg S5.2 VGPEID 0" executable="yes" haslinks="yes" > + <element exename="vg sr/vacuum/vgpeid_s05.02" executable="yes" haslinks="yes" > <title>VGPEID_S5.2</title> - - <link exename="TPG /home/elettra/etc/ELETTRA.cfg S4.1 TPG 0" executable="yes" >TPG_S4.1</link> </element> - <element exename="VGPEID /home/elettra/etc/ELETTRA.cfg S5.3 VGPEID 0" executable="yes" haslinks="yes" > + <element exename="vg sr/vacuum/vgpeid_s05.03" executable="yes" haslinks="yes" > <title>VGPEID_S5.3</title> - - <link exename="TPG /home/elettra/etc/ELETTRA.cfg S4.2 TPG 0" executable="yes" >TPG_S4.2</link> </element> <element exename="VGPEID /home/elettra/etc/ELETTRA.cfg S6.3 VGPEID 0" executable="yes" haslinks="yes" > <title>VGPEID_S6.3</title>