J. Kissel, D. Macleod
ECR E1500386
WP 5553
II 1126

I've begun the necessary front-end code infrastructure changes to copy over the hardware injection infrastructure on to the h1calex (PCAL X) front-end model. I've copied over the 
/opt/rtcds/userapps/release/cal/common/models/CAL_INJ_MASTER.mdl
into the top level model,

/opt/rtcds/userapps/release/cal/h1/models/h1calex.mdl
and named the block "PINJX" to obey a similar naming convention as the X end model (in the event we eventually copy the infrastructure over to the Y-end as well). That means any X-end, photon calibrator injection channels will have the moniker of "PINJX" instead of the "standard" DARM injection channels that have "INJ," e.g.

        DARM Injection Channel         Equivalent PCALX Injection Channel
   H1:CAL-INJ_TRANSIENT_EXC                H1:CAL-PINJX_TRANSIENT_EXC
   H1:CAL-INJ_BLIND_OUT_DQ                 H1:CAL-PINJX_BLIND_OUT_DQ
   H1:CAL-INJ_ODC_HARDWARE_CTRL_EQ         H1:CAL-PINJX_ODC_HARDWARE_CTRL_EQ

etc.

I've also cleaned up the top level a little bit with busses and tags, and connected the ODCCHAN output of the CAL-PINJX block to the pre-existing SHMEM IPC block that ships the ODC vector over to the h1iscex model to be collated and shipped to the ODC MASTER model in the corner station. In this way no new IPC was needed. However, the ODC channel for EX (which was essentially a dead, unused channel structure, with prefixes like H1:CAL-EX_ODC_...) will now have inputs like the INJ block in the corner station, as shown in one of the examples from above.

Also note that, because we elected to *copy* the infrastructure instead of *move* the infrastructre, there will be 2 more 16 [kHz] channels in the science frames, and 2 more 16 [kHz] channels in the commissioning frames (plus the ODC channel stored at 256 [Hz]):
H1:CAL-PINJX_HARDWARE_OUT_DQ*                 -- the sum of all requested (unblinded) hardware injections
H1:CAL-PINJX_BLIND_OUT_DQ*                    -- the blind injection request
H1:CAL-PINJX_TRANSIENT_OUT_DQ                 -- the transient injection requested ouput (prior to the sum before HARDWARE bank)
H1:CAL-PINJX_CW_OUT_DQ                        -- the continuous wave requested output (prior to the sum before HARDWARE bank)
H1:CAL-PINJX_ODC_CHANNEL_OUT_DQ* uint32 256   -- the new name of the ODC channel

Finally, I've successful compiled the infrastructure and committed it to the userapps repo. I'll be working with Jim Batch to get the model installed first thing tomorrow morning, work with T.J. and Duncan to update the MEDM screen and fill out the ODC vector, Copy over the inverse actuation filter that Sudarshan has designed, then work with Eric, Peter, and Chris to update the various injection codes to absorb / handle the channel name changes.

Stay tuned!