I did a little bit of cleanup of the suspension POS inputs today, both in model and MEDM land.
model
sus_single_control.mdl was simplified such that now there are just two position inputs:
- POS: with LSC filter
- ALTPOS: unfiltered
The regular LSC inputs go into POS, and any optic-specific extra pos inputs go into ALTPOS after being properly filtered and summed.
So for instance, MC2_MCL and MC2_ALS are filtered and summed then go into MC2 ALTPOS. The ETM ALS inputs go into ALTPOS.
I modified the GLOBAL DAMPING outputs so that they are filtered in the GLOBAL block before being sent to be summed before going into ALTPOS for {I,E}TM{X,Y}.
All suspension models were rebuilt/installed/restarted.
MEDM
The SUS_SINGLE.adl template screen was modified such that the POS button now points to optic-specific POS filter screens at:
/opt/rtcds/caltech/c1/medm/master/sus/SUS_$(OPTIC)_POS.adl
For MC1, MC3, PRM, BS, SRM these are links to SUS_SINGLE_POS.adl. The rest of the suspensions (MC2, {I,E}TM{X,Y}) now have custom screens that are variations of SUS_SINGLE_POS but with their extra filter screens added in. For instance, here is the new SUS_ETMX_POS.adl:

This gets rid of all the white screen crap that was in here before.
All of this has been committed to the SVN. NOTE: symlinks were heavily used when sorting this stuff out, so check for symlinks when modifying in the future. |