stefan.ballmer@LIGO.ORG - posted 19:17, Saturday 19 October 2013 - last comment - 14:44, Sunday 20 October 2013(8183)
First round of cleanup for SUS ODC parts
Jeff Kissel, Stefan Ballmer
We started to modify to local svn copy of the suspension models to include a cleaned-up version of the ODC parts and an IPC sender to the ODC master
Modifications to ODC library:
- The ODC library parts were cleaned up and repackaged. They are in cds/common/model/ODC.mdl and cds/common/model/ODC_CHAN.mdl. There will be some further changes inside ODC.mdl, but the inputs and outputs won't change any more.
- We decided to give up full backwards compatibility of the parts to get them clean up. In particular:
- In ODC.mdl, we changed the number of inputs of the CHANS (bit combiner) block from 31 to 30, because the 31st bit cannot be used anyway (it is reserved for the parity bit)
- In ODC.mdl, for the COMBINE_ODC block, we added one input for the bitmask and one output for a latched version of the ODC channel for epics.
- ODC_CHAN.mdl contains a new all-in-one ODC block for use in front-end models (called CHANNEL). (see plots)
- Files
ODC_CHAN.mdl
ODC.mdl
Modifications to SUS master models:
- ODC_CHANNEL_OUT is now recorded as uint32 at full rate
- The new, all in one ODC library block (called CHANNEL) was installed (see plots).
- Its output is routed to the last output of the master model.
- Updated models:
OMCS_MASTER.mdl
HSTS_MASTER.mdl
TMTS_MASTER.mdl
QUAD_MASTER.mdl
HLTS_MASTER.mdl
BSFM_MASTER.mdl
MC_MASTER.mdl
- we also started to update
HAUX_MASTER.mdl
which did not have and ODC output at all. Jeff will finish this one tomorrow (as well as a possible merger with HTTS_MASTER.mdl)
Modifications to suspension models
- Added an ipc link (called H1:{OPTIC}_ODC_IPC) to the new ODC output from the master model
- Updated models:
h1sustmsx.mdl
h1sustmsy.mdl
h1susprm.mdl
h1sussrm.mdl
h1suspr2.mdl
h1susbs.mdl
h1suspr3.mdl
h1sussr2.mdl
h1sussr3.mdl
h1susetmx.mdl
h1susomc.mdl
h1susetmy.mdl
h1susmc1.mdl
h1susmc2.mdl
h1susitmx.mdl
h1susitmy.mdl
h1susmc3.mdl
- All of them did recompile, but we did not install or run any of them yet.
None of the listed files are in svn yet - Jeff will implement additional changes tomorrow.
Images attached to this report
Comments related to this report
I moved the new ODC library to a different file name to ensure backwards compatibility.
Old ODC library:
cds/common/ODC.mdl
New ODC library:
cds/common/ODC_CHAN.mdl : top level ODC part (called CHANNEL) with 30 bit inputs and a finished ODC channel output. It points to ODCV2.mdl intenally
cds/common/ODCV2.mdl : updated ODC parts, contains:
BITCOMBINE: for combining bits (bit-shifting); and
PACK: adds summary bit and parity bit and generates a latched version of the ODC_CHANNEL for epics consumption
Since all updated SUS models point to ODC_CHAN.mdl, they are now automatically up to date. I handed the SUS models off to Jeff for some more mods.
Next on the to do list: update ISI and HPI - this will require changes to
isi/common/models/isi2stagemaster.mdl
isi/common/models/isihammaster.mdl
hpi/common/models/hepitemplate.mdl