SUS_CUST_HAUX_MONITOR_OVERVIEW.adl had somehow missed out on the $(OPTIC) -> $(OPTIC)$(num) fix I applied to most HAUX screens the other day.
I redid the fix and committed the screen.
There had been white boxes in SUS_CUST_BSFM_DAC_MONITOR.adl due to confusion around different channel numbers for the same signal in the user and IOP models, e.g., F1=user_0_4 but iop_2_4. I changed it to show both user and IOP versions of the signals, and user and IOP versions of the channel numbers, using data from susbs_overview_macro.txt.
The change has been committed.
Today I pulled the required fiber at the mid stations to connect the new network switches installed in the vacuum racks, and connected them to the core switch. We now have network connectivity to all of the new switches in the outbuildings, so the next step is to migrate the vacuum, FMCS and any other ancillary systems to these switches so that the old legacy switching equipment may be removed. Besides less (aging) equipment to support, this should also reduce our power consumption a bit.
"Dumped" GV3 and GV4 gate annulus volumes into pump cart -> Leaving GV3 and GV4 gate annulus isolation valves open to adjacent annulus volumes overnight
SLC crew working at EX, Fiber Pulling in LSB lab
813 Justin refilling xtal chiller in diode room
925 Hugh shutting down purge air at EX for 10min
946 D. Barker powering down OAF
1000 Patrick increased alarm levels for dustmon9 in LVEA due to work conditions - will monitor
1200 T. Vo installing ethercat in CER
1300 Jim Warner working on BSC3
1341 Alastair working in Fiber Pulling lab in LSB
1400 RIck/Sheila/Robert working in HI PSL enclosure
1513 DAQ restart to integrate new PEM model from D Barker
1600 Justin restored dustmon9 alarm values to levels existing before the Patrick regime
Getting the channels sensed and in the frames show noisy pressure sensors at EndX. Comparing the same channels to EndY I see about 6x more swing of the data signal. I moved the EndX controller to manual and the pressure noise remained constant. See the first plot where the drive to the motor goes flat when placed in manual but the diff_Press signal remains noisy when compared to the EndY signals (graphs 3 & 4.) Under WP 4040, Kyle shut down the Purge Air System in the mechanical room (that was a relief) but it had no affect on the signal noise, see second plot. All the pressure sensors (there are four) on the pump station are noisy. The Pump/Motor of this Pump Station is especially noisy and this may be the source. It needs a bearing or something job. Whether the HEPI system cares about this we'll have to see.
While working on filter files for ITMX/ETMX/TMSX I noticed that the following SUS-related filter files in chans had not been symbolic links. I copied them to ${USERAPPS}/sus/h1/filterfiles and created links to them from chans. I then svn added them and committed them. All the SUS-related filter files are now links to version controlled files.
New models for ITMX, ETMX and TMSY were built and started a while back (alog 7031), but today I finished setup of filter files and safe.snap files.
I had previously adapted safe.snap files in userapps by adapting the corresponding Y-arm files but today I updated them by restoring all the OSEM gains and offsets to nominal values of 1 and -15000, and reverting the disabled matrix elements in ETMX L2 OSEMINF (inherited from Chris Wipf's workaround for a weak OSEM on ETMy).
They had not previously been symlinked (and thus had not taken effect) so I created links to them from the target area.
I created filter files by adapting the corresponding Y-arm files in userapps. Then I created symlinks to them from chans:
I then committed all the new files.
I added about 300 mL distilled water to the crystal chiller unit this morning.
I did cleanup on the HxTS screens in /opt/rtcds/userapps/trunk/sus/common/medm/hxts as for TMTS, OMCS, BSFM, HAUX, HTTS and QUAD.
As usual the main goal was to make all the link arguments look similar to the following (text editor view of .adl file), plus any other appropriate fixes:
args="%(read $(USERAPPS)/sus/common/medm/sus$(optic)_overview_macro.txt),USERAPPS=$(USERAPPS),SITE=$(SITE),site=$(site),IFO=$(IFO),ifo=$(ifo)"
Details:
No change (already OK): SUS_CUST_HLTS_M1_OPTICALIGN.adl, SUS_CUST_HLTS_M3_OPLEV_MTRX.adl, SUS_CUST_HLTS_M3_OPLEV_SEGS.adl, SUS_CUST_HXTS_M3_WD_OPLEV_BANDLIM.adl, SUS_CUST_BSFM_ODC.adl, SUS_CUST_HSTS_M1_OPTICALIGN.adl, SUS_CUST_BSFM_ODC.adl, SUS_CUST_HXTS_ADC_MONITOR.adl, SUS_CUST_HXTS_BIO.adl, SUS_CUST_HXTS_DAC_MONITOR.adl, SUS_CUST_HXTS_IPC.adl, SUS_CUST_HXTS_M1_CART2EUL.adl, SUS_CUST_HXTS_M1_CENTERING.adl, SUS_CUST_HXTS_M1_OSEM_ALIGN_??ZOOM.adl, SUS_CUST_HXTS_M1_COILOUTF.adl, SUS_CUST_HXTS_M1_DAMP.adl, SUS_CUST_HXTS_M1_DRIVEALIGN.adl, SUS_CUST_HXTS_M1_EUL2CART.adl, SUS_CUST_HXTS_M1_EUL2OSEM.adl, SUS_CUST_HXTS_M1_ISIINF.adl, SUS_CUST_HXTS_M1_LOCK.adl, SUS_CUST_HXTS_M1_OFFLOAD.adl, SUS_CUST_HXTS_M1_OPTICALIGN.adl, SUS_CUST_HXTS_M1_OSEM2EUL.adl, SUS_CUST_HXTS_M1_OSEMINF.adl, SUS_CUST_HXTS_M1_SENSALIGN.adl, SUS_CUST_HXTS_M1_TEST.adl, SUS_CUST_HXTS_M1_WD_ACT_BANDLIM.adl, SUS_CUST_HXTS_M1_WD_OSEMAC_BANDLIM.adl, SUS_CUST_HXTS_M1_WD_OSEMDC_BANDLIM.adl, SUS_CUST_HXTS_M2_COILOUTF.adl, SUS_CUST_HXTS_M2_DRIVEALIGN.adl, SUS_CUST_HXTS_M2_EUL2OSEM.adl, SUS_CUST_HXTS_M2_LOCK.adl, SUS_CUST_HXTS_M2_OSEM2EUL.adl, SUS_CUST_HXTS_M2_OSEMINF.adl, SUS_CUST_HXTS_M1_SENSALIGN.adl, SUS_CUST_HXTS_M2_TEST.adl, SUS_CUST_HXTS_M2_WD_ACT_BANDLIM.adl, SUS_CUST_HXTS_M2_WD_OSEMAC_BANDLIM.adl, SUS_CUST_HXTS_M2_WD_OSEMDC_BANDLIM.adl, SUS_CUST_HXTS_M3_COILOUTF.adl, SUS_CUST_HXTS_M3_DRIVEALIGN.adl, SUS_CUST_HXTS_M3_EUL2OSEM.adl, SUS_CUST_HXTS_M3_ISCINF.adl, SUS_CUST_HXTS_M3_LOCK.adl, SUS_CUST_HXTS_M3_OSEM2EUL.adl, SUS_CUST_HXTS_M3_OSEMINF.adl, SUS_CUST_HXTS_M3_OSEMOUTF.adl, SUS_CUST_HXTS_M3_SENSALIGN.adl, SUS_CUST_HXTS_M3_TEST.adl, SUS_CUST_QUAD_M3_WD_ACT_BANDLIM.adl, SUS_CUST_QUAD_M3_WD_OSEMAC_BANDLIM.adl, SUS_CUST_QUAD_M3_WD_OSEMDC_BANDLIM.adl, SUS_CUST_HXTS_MONITOR_OVERVIEW.adl, SUS_CUST_MC1_DAC_MONITOR.adl, SUS_CUST_MC2_DAC_MONITOR.adl, SUS_CUST_MC3_DAC_MONITOR.adl
Basic cleanup: SUS_CUST_HLTS_M3_OPLEV.adl, SUS_CUST_HLTS_M3_WD.adl, SUS_CUST_HLTS_OVERVIEW.adl, SUS_CUST_HSTS_M3_WD.adl, SUS_CUST_HSTS_OVERVIEW.adl, SUS_CUST_HXTS_DACKILL.adl, SUS_CUST_HXTS_M1_WD.adl, SUS_CUST_HXTS_M2_CENTERING.adl, SUS_CUST_HXTS_M2_WD.adl, SUS_CUST_HXTS_M3_CENTERING.adl, SUS_CUST_HXTS_M3_WD.adl
SUS_CUST_HXTS_M2_OSEM_ALIGN_??ZOOM.adl, SUS_CUST_HXTS_M3_OSEM_ALIGN_??ZOOM.adl: move to left screen
All updates were committed. This completes the screen cleanup. LLO can svn up the lot.
I did cleanup on the TMTS screens in /opt/rtcds/userapps/trunk/sus/common/medm/tmts as for OMCS, BSFM, HAUX, HTTS and QUAD.
As usual the main goal was to make all the link arguments look similar to the following (text editor view of .adl file), plus any other appropriate fixes:
args="%(read $(USERAPPS)/sus/common/medm/sus$(optic)_overview_macro.txt),USERAPPS=$(USERAPPS),SITE=$(SITE),site=$(site),IFO=$(IFO),ifo=$(ifo)"
Details:
No change (already OK): SUS_AUX_TMTS_OVERVIEW.adl, SUS_CUST_TMTS_BIO.adl, SUS_CUST_TMTS_DC_ALIGN.adl, SUS_CUST_TMTS_IPC.adl, SUS_CUST_TMTS_IPC.adl, SUS_CUST_TMTS_M1_CART2EUL.adl, SUS_CUST_TMTS_M1_OSEM_ALIGN_??ZOOM.adl, SUS_CUST_TMTS_M1_COILOUTF.adl, SUS_CUST_TMTS_M1_DAMP.adl, SUS_CUST_TMTS_M1_DCDRIVECAL.adl, SUS_CUST_TMTS_M1_DRIVEALIGN.adl, SUS_CUST_TMTS_M1_EUL2OSEM.adl, SUS_CUST_TMTS_M1_ISIINF.adl, SUS_CUST_TMTS_M1_LOCK.adl, SUS_CUST_TMTS_M1_OPTICALIGN.adl, SUS_CUST_TMTS_M1_OSEM2EUL.adl, SUS_CUST_TMTS_M1_OSEM_ALIGN.adl, SUS_CUST_TMTS_M1_OSEMINF.adl, SUS_CUST_TMTS_M1_SENSALIGN.adl, SUS_CUST_TMTS_M1_TEST.adl, SUS_CUST_TMTS_M1_WD_ACT_BANDLIM.adl, SUS_CUST_TMTS_M1_WD_OSEMAC_BANDLIM.adl, SUS_CUST_TMTS_M1_WD_OSEMDC_BANDLIM.adl, SUS_CUST_TMTS_ODC.adl
Basic cleanup: SUS_CUST_TMTS_DACKILL.adl, SUS_CUST_TMTS_M1_CENTERING.adl, SUS_CUST_TMTS_M1_WD.adl, SUS_CUST_TMTS_OVERVIEW.adl
SUS_CUST_TMTS_M1_CENTERING.adl, SUS_CUST_BSFM_M1_OSEM_ALIGN_F1ZOOM.adl: moved to left screen.
SUS_CUST_TMTS_ADC_MONITOR.adl, SUS_CUST_TMTS_DAC_MONITOR.adl: created, based on OMCS versions.
The new files were svn added and everything was committed.
I did cleanup on the OMCS screens in /opt/rtcds/userapps/trunk/sus/common/medm/omcs as for BSFM, HAUX, HTTS and QUAD.
As usual the main goal was to make all the link arguments look similar to the following (text editor view of .adl file), plus any other appropriate fixes:
args="%(read $(USERAPPS)/sus/common/medm/sus$(optic)_overview_macro.txt),USERAPPS=$(USERAPPS),SITE=$(SITE),site=$(site),IFO=$(IFO),ifo=$(ifo)"
Details:
No change (already OK): SUS_CUST_OMCS_ADC_MONITOR.adl, SUS_CUST_OMCS_BIO.adl, SUS_CUST_OMCS_IPC.adl, SUS_CUST_OMCS_M1_CART2EUL.adl, SUS_CUST_OMCS_M1_OSEM_ALIGN_??ZOOM.adl, SUS_CUST_OMCS_M1_COILOUTF.adl, SUS_CUST_OMCS_M1_DAMP.adl, SUS_CUST_OMCS_M1_DRIVEALIGN.adl, SUS_CUST_OMCS_M1_EUL2CART.adl, SUS_CUST_OMCS_M1_EUL2OSEM.adl, SUS_CUST_OMCS_M1_ISIINF.adl, SUS_CUST_OMCS_M1_LOCK.adl, SUS_CUST_OMCS_M1_OFFLOAD.adl, SUS_CUST_OMCS_M1_OPTICALIGN.adl, SUS_CUST_OMCS_M1_OSEM2EUL.adl, SUS_CUST_OMCS_M1_OSEMINF.adl, SUS_CUST_OMCS_M1_SENSALIGN.adl, SUS_CUST_OMCS_M1_TEST.adl, SUS_CUST_OMCS_M1_WD_ACT_BANDLIM.adl, SUS_CUST_OMCS_M1_WD_OSEMAC_BANDLIM.adl, SUS_CUST_OMCS_M1_WD_OSEMDC_BANDLIM.adl, SUS_CUST_HXTS_M2_ISCINF.adl, SUS_CUST_OMCS_MONITOR_OVERVIEW.adl, SUS_CUST_OMCS_ODC.adl
Basic cleanup: SUS_CUST_OMCS_OVERVIEW.adl, SUS_CUST_OMCS_DACKILL.adl, SUS_CUST_OMCS_DAC_MONITOR.adl, SUS_CUST_OMCS_M1_CENTERING.adl, SUS_CUST_OMCS_M1_WD.adl
Other: SUS_CUST_OMCS_M1_OSEM_ALIGN_T1ZOOM.adl (moved to left screen)
I committed the updates.
On Thursday and Friday, Emily, Terra, Vinny, Dominick, Brian and I got PEM channels going in the PSL, ISCT1 and Y-end. Dave got these channels into the frames. On Saturday, Daniel and I ran the HIFO and found coherence to be especially strong with sensors at the PSL periscope and ISCT1. Today I ran the HIFO with the PSL fans shut off, except for the makeup air. Figure 1 shows a substantial broad band improvement in the HIFO-Y error signal from shutting these fans down. We intend to run with the makeup air at a low rate, but I didnt feel any difference in the flow out of the PSL feed-throughs between 100% and 1% settings of the makeup air so we will have to look into this to make further improvements. The broad peak at 70 Hz is coherent with ISCT1 motion so we will look into this this week as well.
I did cleanup on the BSFM screens in /opt/rtcds/userapps/trunk/sus/common/medm/bsfm as for HAUX, HTTS and QUAD.
As usual the main goal was to make all the link arguments look similar to the following (text editor view of .adl file), plus any other appropriate fixes:
args="%(read $(USERAPPS)/sus/common/medm/sus$(optic)_overview_macro.txt),USERAPPS=$(USERAPPS),SITE=$(SITE),site=$(site),IFO=$(IFO),ifo=$(ifo)"
Details:
No change (already OK): SUS_CUST_BSFM_ADC_MONITOR.adl, SUS_CUST_BSFM_BIO.adl, SUS_CUST_BSFM_DAC_MONITOR.adl, SUS_CUST_BSFM_DC_ALIGN.adl, SUS_CUST_BSFM_IPC.adl, SUS_CUST_BSFM_M1_CART2EUL.adl, SUS_CUST_BSFM_M1_OSEM_ALIGN_??ZOOM.adl, SUS_CUST_BSFM_M1_COILOUTF.adl, SUS_CUST_BSFM_M1_DAMP.adl, SUS_CUST_BSFM_M1_DRIVEALIGN.adl, SUS_CUST_BSFM_M1_EUL2CART.adl, SUS_CUST_BSFM_M1_EUL2OSEM.adl, SUS_CUST_BSFM_M1_ISIINF.adl, SUS_CUST_BSFM_M1_LOCK.adl, SUS_CUST_BSFM_M1_OFFLOAD.adl, SUS_CUST_BSFM_M1_OPTICALIGN.adl, SUS_CUST_BSFM_M1_OSEM2EUL.adl, SUS_CUST_BSFM_M1_OSEM_ALIGN.adl, SUS_CUST_BSFM_M1_OSEMINF.adl, SUS_CUST_BSFM_M1_SENSALIGN.adl, SUS_CUST_BSFM_M1_TEST.adl, SUS_CUST_BSFM_M1_WD_ACT_BANDLIM.adl, SUS_CUST_BSFM_M1_WD_OSEMAC_BANDLIM.adl, SUS_CUST_BSFM_M1_WD_OSEMDC_BANDLIM.adl, SUS_CUST_BSFM_M2_OSEM_ALIGN_??ZOOM.adl, SUS_CUST_BSFM_M2_COILOUTF.adl, SUS_CUST_BSFM_M2_DRIVEALIGN.adl, SUS_CUST_BSFM_M2_EUL2OSEM.adl, SUS_CUST_BSFM_M2_LOCK.adl, SUS_CUST_BSFM_M2_OSEM2EUL.adl, SUS_CUST_BSFM_M2_OSEM_ALIGN.adl, SUS_CUST_BSFM_M2_OSEMINF.adl, SUS_CUST_BSFM_M2_SENSALIGN.adl, SUS_CUST_BSFM_M2_TEST.adl, SUS_CUST_BSFM_M2_WD.adl, SUS_CUST_BSFM_M2_WD_ACT_BANDLIM.adl, SUS_CUST_BSFM_M1_WD_OSEMAC_BANDLIM.adl, SUS_CUST_BSFM_M2_WD_OSEMDC_BANDLIM.adl, SUS_CUST_BSFM_M3_ISCINF.adl, SUS_CUST_BSFM_M3_LOCK.adl, SUS_CUST_BSFM_M3_OPLEV_MTRX.adl, SUS_CUST_BSFM_M3_OPLEVINF2.adl, SUS_CUST_BSFM_MONITOR_OVERVIEW.adl, SUS_CUST_BSFM_ODC.adl, SUS_CUST_BSFM_OSEMINF.adl, X1SUS_CUST_BSFM_OVERVIEW.adl
Basic cleanup: SUS_CUST_BSFM_OVERVIEW.adl, SUS_CUST_BSFM_DACKILL.adl, SUS_CUST_BSFM_M1_CENTERING.adl, SUS_CUST_BSFM_M1_WD.adl, SUS_CUST_BSFM_M2_CENTERING.adl, SUS_CUST_BSFM_M3_OPLEV.adl
Other: SUS_CUST_BSFM_ADC_MONITOR.adl: Fixed hardwiring to optic BS (to accomodate BSTST at LHO)
Unfixed: SUS_CUST_BSFM_MAIN_MENU.adl, SUS_CUST_FM_BIO.adl (H2-specific), X1SUS_CUST_BSFM_OVERVIEW.adl (X1-specific)
The changes have been committed. LLO should be able to svn up.
Responding to Daniel's report of issues with the ISS and FSS, I came in this morning to see what's up. I found the NPRO was in a large relaxation oscillation (frequency about 880 kHz) (see photo below) by displaying the ISS PDA signal at the monitor tee (see photo below) on an oscilloscope. This was cured by toggling the "Noise Eater" switch (off for a few seconds, then back on) on the front of the Innolight power supply in the PSL rack outside the Laser Area Enclosure (see photos below). I adjusted the ISS REFSIGNAL to -2.00 V, which gives us about 10% diffracted light (see photo below). I looked at the FSS OLTF and found the UGF to be about 500 kHz. I dropped the common gain by 3 dB (from 30 to 27) to give us a bit more gain margin and a little more phase margin. The UGF is now at about 325 kHz. The system seems to working properly now.
Looks like the PSL is developing problems. Right now the ref cav doesn't lock anymore. We gave up after about 2 hours. We noticed that the ISS started oscillating about 7h ago. Now, it looks like there might be an interaction between FSS and ISS.
After installing the new filters on ETMY suspension, I took an open loop gain transfer function of the top mass in the longitudinal degree of freedom, with the loop closed, and compared the measurements against the model.
The first pdf attached shows the measurement in blue, and the model in green. Except for the first pitch mode, at around 0.5/0.6Hz, they match really well.
The second pdf attached shows the open loop gain transfer function for different damping configurations that have been used during HIFO-Y commissioning. The old filters mentionned are refering to the one Jeff K. designed to reduce sensor noise contribution to test mass displacement added to the extra boost at .43Hz and .99Hz
The new filters are clearly more stable, providing the same damping at the lowest longitudinal mode than the previous filters with a phase margin of 36 @ 3.54Hz.
Attached is a plot of ETMY and ITMY oplev signal + reflected beam signal while the cavity was locked. The motion @ .43 Hz is still high. Although, looking at the plots from the previous aLog it seems like the ETMY ISI could provide a better isolation, as it did in May.
Today, while the cavity was locked, and the ISI was in "level 3 isolation" I took a spectra of ETMY M0 L1 and L2 stages in Long and Pitch.
I plotted the spectra against previous ones with the suspension damped and the chamber under vacuum for the three of them. The comparison shows different configuration of the ISI
1) in blue, ISI damped in may
2) in green ISI isolated in may
3) in red ISI isolated today
I did a major cleanup of the Tip-Tilt screens and linked them to the LHO SITEMAP.
I created argument macro files $(USERAPPS)/asc/common/medm/asc???_overview_macro.txt with all the optic-specific arguments (analogous to $(USERAPPS)/sus/common/medm/sus???_overview_macro.txt for SUS). I then went through all the screens in $(USERAPPS)/asc/common/medm/asctt with gedit, changing link arguments to look like the following:
args="%(read $(USERAPPS)/asc/common/medm/asc$(optic)$(num)_overview_macro.txt),USERAPPS=$(USERAPPS),SITE=$(SITE),site=$(site),IFO=$(IFO),ifo=$(ifo)"
Formerly some of the screens expected $(OPTIC) to be the full optic name, and some used $(OPTIC)$(num), so I changed everything to the latter convention.
Details of which files were touched are at end. I want to do one more round of checking for errors, so I haven't yet committed the changes yet.
No change:
ASC_CUST_TIPTILT_DAC_MONITOR.adl, ASC_CUST_TITPTILT_SAFE_SNAP_CMD.adl
Basic updates:
ASC_CUST_TIPTILT_BIO.adl, ASC_CUST_TIPTILT_DC_ALIGN.adl, ASC_CUST_TIPTILT_M1_COILOUTF.adl, ASC_CUST_TIPTILT_M1_DAMP.adl, ASC_CUST_TIPTILT_M1_DRIVEALIGN.adl, ASC_CUST_TIPTILT_M1_EUL2OSEM.adl, ASC_CUST_TIPTILT_M1_LOCK.adl, ASC_CUST_TIPTILT_M1_OPTICALIGN.adl, ASC_CUST_TIPTILT_M1_OSEM2EUL.adl, ASC_CUST_TIPTILT_M1_OSEM_ALIGN.adl, ASC_CUST_TIPTILT_M1_OSEM_ALIGN_counts.adl, ASC_CUST_TIPTILT_M1_OSEM_ALIGN_??ZOOM.adl, ASC_CUST_TIPTILT_M1_OSEMINF.adl, ASC_CUST_TIPTILT_M1_SENSALIGN.adl, ASC_CUST_TIPTILT_M1_WD.adl, ASC_CUST_TIPTILT_M1_WD_ACT_BANDLIM.adl, ASC_CUST_TIPTILT_M1_WD_OSEMAC_BANDLIM.adl, ASC_CUST_TIPTILT_M1_WD_OSEMDC_BANDLIM.adl, ASC_CUST_TIPTILT_MONITOR_OVERVIEW.adl, ASC_CUST_TIPTILT_OPLEVINF.adl, ASC_CUST_TIPTILT_OPLEVINF1.adl, ASC_CUST_TIPTILT_OSC.adl, ASC-TIPTILT_Main.adl, newDisplay.adl
More complicated fixes:
ASC_CUST_TIPTILT_DACKILL.adl: fixed broken link to GDS_TP screen.
Broken - needs redesign:
ASC_CUST_TIPTILT_M1_DEMOD.adl, ASC_CUST_TIPTILT_M1_TEST.adl: need to fix links to $(USERAPPS)/cds/common/medm/FILTALH.adl (2 places)
ASC_CUST_TIPTILT_BIO_all.adl, ASC_CUST_TIPTILT_MONITOR_OVERVIEW_all.adl, ASC_CUST_TIPTILT_OVERVIEW_all.adl: only allows for four (not five) TTs.
Additional fixes and non-fixes:
ASC_CUST_TIPTILT_ADC_MONITOR.adl: I removed display of /cvs/cds/llo/scripts/utilities/nova_logo.gif, which was not only LLO-specific but shouldn't have been in a custom screen.
ASC_CUST_TIPTILT_BIO_all.adl, ASC_CUST_TIPTILT_MONITOR_OVERVIEW_all.adl, ASC_CUST_TIPTILT_OVERVIEW_all.adl: did not attempt to add provision for fifth optic - no room on screen.
ASC_CUST_TIPTILT_M1_DAMP.adl, ASC_CUST_TIPTILT_M1_DEMOD.adl, ASC_CUST_TIPTILT_M1_TEST.adl: I got the L1-specific links from various "GUARDIAN SET" buttons pointing to the apparently intended screen, $(USERAPPS)/cds/common/medm/FILTALH.adl, and made the asgs list more standard, but there was a $(channel) argument missing, so I couldn't getting it working fully. It doesn't seem to work at LLO either, so I leave it to the Guardian folks to take further.
I svn added the macro.txt files and committed all the changes. LLO should hopefully be able to svn up with no breakage, although care should be exercised.
I made a few more last-minute fixes based on things I noted during the HAUX cleanup (TipTilt screens were adapted from HAUX):
ASC_CUST_TIPTILT_M1_DAMP.adl, ASC_CUST_TIPTILT_M1_DEMOD.adl, ASC_CUST_TIPTILT_M1_TEST.adl: I deleted several buttons that appeared to be an ancient attempt at a wiki-style help system at LLO (when clicked on they would try to edit files in /cvs/cds/llo).
ASC_CUST_TIPTILT_OSC.adl: I added a $(IFO) $(OPTIC)$(num) display string to screen to make it obvious what optic it related to.
ASC_CUST_TIPTILT_DAC_MONITOR.adl: I removed an attempt to display /cvs/cds/llo/scripts/utilities/nova_logo.gif, and moved the hidden date string display into the visible area of the window.
These fixes were also committed.