Made a modification to the library parts needed for adding an OSEM estimator to the Length degree of freedom for the HLTS models. The change comes with an addition of a few DQ channels, listed on the.txt attached. This work is part of the ECR summarized here: E2500251.
The library parts modified live in /opt/rtcds/userapps/trunk/sus/common/models/ , they are HLTS_MASTER_W_EST.mdl and SIXOSEM_T_STAGE_MASTER_W_EST.mdl.
The changes were committed to the userapps svn under revision 33319.
Summary of changes:
SIXOSEM_T_STAGE_MASTER_W_EST.mdl
- Replaced the two estimator blocks for ptich and yaw (named EST_P, and EST_Y, respectively) on the top level for a single subsystem called EST, which contains copies of the library parts for L, P, and Y. [See attached for the new layout]. The Length estimator (Inside EST>L) is new to the model and comes with a bunch of DQ channels listed in the .txt attached.
-
Changed the ADD block to fork the Longitudinal drive into a light-damping and an estimator path, in line with the rest of the estimator infrastructure already in place for Pitch and Yaw. Notably, we added epics outputs ADD_L_ISC_MON and ADD_L_EST_MON in addition to the old ADD_L_TOTAL_MON inside the ADD block.
-
Added a testpoint for the total longitudinal drive inside the ADD block. ADD_L_TOTAL
-
Changed the input wiring to the DELAY block so the estimator L drives are the ones that go into the block and back to the EST subsystem.
HLTS_MASTER_W_EST.mdl
- added 'M1_ADD_L_TOTAL_DQ' to the list of DQ channels.
List of new DQ channels:
The attached text file lists both the PR3 and SR3 channels that we will be adding with the aforementioned model changes.. All new DQ channels are sampled at 512 samples/second.
I have updated the MEDM screens to include the Length estimator, and I've fixed a few little things along the way.
You will need to $ svn up the ...userapps/trunk/sus/common/medm/ directory to get the changes
I've updated these screens:
sus/common/medm/
hxts/SUS_CUST_HLTS_OVERVIEW_W_EST.adl
estim/ESTIMATOR_OVERVIEW.adl
estim/FADE_CONTROL.adl
estim/CONTROL_6.adl
updated the SUS_CUST_HLTS_OVERVIEW_W_EST.adl screen
- fixed the indicator for the estimators. Green = ON, grey = off
- added Len estimator
- moved things just a bit so that everything fits
- left the 3 estim indicators as separate buttons because they launch separate related displays.
updated ESTIMATOR_OVERVIEW.adl
- fixed channel names for the indicator on the fader switch (was ...SWITCH_FADE_blah_blah_MON, now is ...SWTICH_MON_blah_blah)
This model change happened a while ago. I guess we missed the MEDM update then
fixed the FADE_CONTROL.adl screen with new names per the ESTIMATOR_OVERVIEW
(these are in revision 33320)
I also fixed the state indicators in the CONTROL_6 screen and the ESTIMATOR_OVERVIEW screen
The indicator is GREY if the output button is OFF
In the MEDM text file it looks like this:
"basic attribute" {
clr=7
}
"dynamic attribute" {
vis="calc"
calc="(A&1024) == 0"
chan="$(IFO):SUS-$(OPTIC)_M1_EST_$(DOF)_FUSION_MODL_SUSP_T_2GAP_SW2R"
This needs to be the top layer.
if the output is ON, then the display is green/ red if the state is good/bad.
The state indicator updates to the MEDM repo are -r 33321 for the CONTROL_6 screen and -r 33322 for the ESTIMATOR_OVERVIEW screen
share and enjoy!