Commit 2379f46a authored by Holger Brand's avatar Holger Brand
Browse files

Merge UTCS.ini in UTCS_HB.ini

parent 0490a335
......@@ -389,7 +389,7 @@ CSPP_GUIActor:CSPP_GUIActor.AssociatedPVProxy="TASCAGC-Proxy"
LVClassPath="UTCS_BMIL.lvlib:UTCS_BCIL.lvclass"
CSPP_BaseActor:CSPP_BaseActor.Settings="Ignore"
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=0.02
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=0.1
CSPP_BaseActor:CSPP_BaseActor.PVProxy="BMILProxy"
CSPP_BaseActor:CSPP_BaseActor.LaunchPVProxy=True
CSPP_DeviceActor:CSPP_DeviceActor.ResourceName="RIO1"
......@@ -504,6 +504,7 @@ Dipole-I="ni.var.psp://kcpc080/UTCS_BMIL_SV/BMIL_Dipole-I"
Dipole-V-IL-Enabled="ni.var.psp://kcpc080/UTCS_BMIL_SV/BMIL_Dipole-V-IL-Enabled"
Dipole-V-IL="ni.var.psp://kcpc080/UTCS_BMIL_SV/BMIL_Dipole-V-IL"
Dipole-V-I="ni.var.psp://kcpc080/UTCS_BMIL_SV/BMIL_Dipole-V-I"
Dipole-V-I-Mean="ni.var.psp://kcpc080/UTCS_BMIL_SV/BMIL_Dipole-V-I-Mean"
Dipole-IMin="ni.var.psp://kcpc080/UTCS_BMIL_SV/BMIL_Dipole-IMin"
Dipole-IMax="ni.var.psp://kcpc080/UTCS_BMIL_SV/BMIL_Dipole-IMax"
Dipole-V-IMin="ni.var.psp://kcpc080/UTCS_BMIL_SV/BMIL_Dipole-V-IMin"
......@@ -1137,13 +1138,13 @@ VGTP5_Status="ni.var.psp://kcpc080/UTCS_AE/VGTP5_Status"
LVClassPath="UTCS_BeamControlGUI.lvlib:UTCS_BeamControlGUI.lvclass"
#WebPubMode -1:Disabled; 0:Snapshot; 1:Monitored; 2:Embedded
CSPP_BaseActor:CSPP_BaseActor.WebPubMode=-1
CSPP_GUIActor:CSPP_GUIActor.AssociatedActor=""
UTCS_BeamControlGUI:UTCS_BeamControlGUI.BMIL="BMIL"
UTCS_BeamControlGUI:UTCS_BeamControlGUI.BMILProxy="BMILProxy"
UTCS_BeamControlGUI:UTCS_BeamControlGUI.BeamTrend="BeamTrend"
UTCS_BeamControlGUI:UTCS_BeamControlGUI.IGA140GUI="IGA140GUI"
[BeamControlGUI.URLs]
DetectorRate="ni.var.psp://kcpc080/UTCS_AE/DetectorRate"
DetectorCounts="ni.var.psp://kcpc080/UTCS_AE/DetectorCounts"
Pressure_HV1="ni.var.psp://kcpc080/UTCS_AE/Pressure_HV1"
Virtual_Accelerator="ni.var.psp://kcpc080/UTCS_AE/Virtual_Accelerator"
MP-Period="ni.var.psp://kcpc080/UTCS_AE/MP-Period"
MP-Length="ni.var.psp://kcpc080/UTCS_AE/MP-Length"
......@@ -1166,7 +1167,6 @@ UX8DT3_current="ni.var.psp://kcpc080/UTCS_AE/UX8DT3_current"
UX8DC4_range="ni.var.psp://kcpc080/UTCS_AE/UX8DC4_range"
UX8DC4_current="ni.var.psp://kcpc080/UTCS_AE/UX8DC4_current"
Chopper_status="ni.var.psp://kcpc080/UTCS_AE/Chopper_status"
Chopper_control="ni.var.psp://kcpc080/UTCS_AE/Chopper_control"
Chopper_output="ni.var.psp://kcpc080/UTCS_AE/Chopper_output"
Counting_Enabled="ni.var.psp://kcpc080/UTCS_AE/Counting_Enabled"
DMA_Enabled="ni.var.psp://kcpc080/UTCS_AE/DMA_Enabled"
......@@ -1179,12 +1179,12 @@ UX8QD11_current="ni.var.psp://kcpc080/UTCS_AE/UX8QD11_current"
UX8QD11_current_setpoint="ni.var.psp://kcpc080/UTCS_AE/UX8QD11_current_setpoint"
UX8QD12_current="ni.var.psp://kcpc080/UTCS_AE/UX8QD12_current"
UX8QD12_current_setpoint="ni.var.psp://kcpc080/UTCS_AE/UX8QD12_current_setpoint"
#UX8MU1_current="ni.var.psp://kcpc080/UTCS_AE/UX8MU1_current"
UX8MU1_current="ni.var.psp://kcpc080/UTCS_AE/DipoleCurrent-V"
UX8MU1_current="ni.var.psp://kcpc080/UTCS_AE/UX8MU1_current"
UX8MU1_current_setpoint="ni.var.psp://kcpc080/UTCS_AE/UX8MU1_current_setpoint"
ChargeState="ni.var.psp://kcpc080/UTCS_AE/ChargeState"
InterlockStatus="ni.var.psp://kcpc080/UTCS_AE/InterlockStatus"
InterlockReason="ni.var.psp://kcpc080/UTCS_AE/InterlockReason"
Energy="ni.var.psp://kcpc080/UTCS_AE/Energy"
ExpNumber="ni.var.psp://kcpc080/UTCS_AE/ExpNumber"
Projectile="ni.var.psp://kcpc080/UTCS_AE/Projectile"
Target="ni.var.psp://kcpc080/UTCS_AE/Target"
......@@ -1494,7 +1494,7 @@ Polling_Interval_Msg="ni.var.psp://localhost/UTCS_IGA140_SV/IGA140_Set-PollingIn
Polling_Iterations_Msg="ni.var.psp://localhost/UTCS_IGA140_SV/IGA140_Set-PollingIterations?.1"
Polling_Start_Stop_Msg="ni.var.psp://localhost/UTCS_IGA140_SV/IGA140_Set-PollingStartStop?.1"
Reset_Device_Msg="ni.var.psp://localhost/UTCS_IGA140_SV/IGA140_Reset"
Selftest_Device_Msg="ni.var.psp://kcpc080/UTCS_IGA140_SV/IGA140_SelfTest"
Selftest_Device_Msg="ni.var.psp://localhost/UTCS_IGA140_SV/IGA140_SelfTest"
Ambient_Temperature_Msg="ni.var.psp://localhost/UTCS_IGA140_SV/IGA140_Set-AmbientTemperature"
Clear_Max_Time_Msg="ni.var.psp://localhost/UTCS_IGA140_SV/IGA140_Set-ClearMaxTime"
Emissivity_Msg="ni.var.psp://localhost/UTCS_IGA140_SV/IGA140_Set-Emissivity"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment