LLO has been using an offshoot of the ASC_MASTER simulink model that generates almost all of our ASC and ADS channels. It seems that the only thing they added was several extra ADS filter rows, so that they could use some of them for spot centering, and still have others available for other things.
By using an offshoot though, they have missed out on many of the upgrades that have gone into the LHO ASC.
This is something that has an issue tracker open in FRS 7287. Once we both do an svn checkout and are using the main ASC_MASTER block, this issue should be close-able.
I have replaced the LHO ADS part with the LLO version, which includes 10 each ADS filters for pitch and yaw, rather than 5 each. This also removes several inputs that we had been using for testing during commissioning time over the summer, but no longer need (AS36 channels). The modified ASC_MASTER part is checked into the svn, ready for LLO to pull.
Unfortunately, LLO also had re-ordered the input matrix to make the order make a bit more sense. Since they have calls to this matrix interleaved several places in their guardian, and we only use it in ENGAGE_SRC_ASC, I have prepped the guardian code to handle the change. In ISC_LOCK, lines 2470-2476 should be commented out (or deleted), while lines 2482-2489 should be un-commented. The first set of lines is our existing code, and the second set is the re-ordered version for the new input matrix. This must be done after the ASC model is restarted tomorrow, before we get to ENGAGE_SRC_ASC in the lock aquisition sequence.
Note that LLO should need to do no work, and make no code changes, to keep the same functionality that they currently have, since I've chosen LHO to be the ones to change the guardian code. The only thing they should need to do is change the link in l1asc.mdl to the ASC_MASTER block, rather than the offshoot they've been using. They'll have a few extra epics channels floating around that they won't use (like RF90 centering, which we will again use after the post-O2 vent), but everything should work as before.
If there are problems with ENGAGE_SRC_ASC tomorrow and I'm not in the control room, call me. But hopefully we'll finish maintenance early enough that we can go through that state before the end of the day.
This reconcilliation was done under work permit 6505. After we restart the ASC model and the DAQ, we can close out this permit.
MEDM screens are updated and ready now too.
I need to check the a2l script, since it uses the ADS system and will have a few channel name changes.
Hopefully after this, we can go back to having the same model and not diverging, so that we don't have to reconcile....
A2L script is prepped too. We'll need to copy ...uapps/isc/l1/guardian/isclib/matrices_newAsOf28Feb2017.py to ...uapps/isc/l1/guardian/isclib/matrices.py after the ASC model reboot, and then we can run the script with the new ASC code.