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.