From 64e6a6cce073536da5cda4afc5935b32fc91ad47 Mon Sep 17 00:00:00 2001 From: Rory-Potter-Tessella Date: Wed, 15 Aug 2018 14:10:21 +0100 Subject: [PATCH 01/14] Add template OPI file --- .../.checkstyle | 7 + .../resources/kicker.opi | 36 + .../resources/opi_info.xml | 2993 +++++++++-------- 3 files changed, 1547 insertions(+), 1489 deletions(-) create mode 100644 base/uk.ac.stfc.isis.ibex.e4.client.product/.checkstyle create mode 100644 base/uk.ac.stfc.isis.ibex.opis/resources/kicker.opi diff --git a/base/uk.ac.stfc.isis.ibex.e4.client.product/.checkstyle b/base/uk.ac.stfc.isis.ibex.e4.client.product/.checkstyle new file mode 100644 index 0000000000..1d14d79f7e --- /dev/null +++ b/base/uk.ac.stfc.isis.ibex.e4.client.product/.checkstyle @@ -0,0 +1,7 @@ + + + + + + + diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/kicker.opi b/base/uk.ac.stfc.isis.ibex.opis/resources/kicker.opi new file mode 100644 index 0000000000..56ccaeacc8 --- /dev/null +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/kicker.opi @@ -0,0 +1,36 @@ + + + true + + -1fce3382:15fb9cec36d:-75d6 + true + false + + 600 + + true + $(P)$(KICKER): + + 3.1.4.201301231545 + true + Display + + false + -1 + -1 + + + + + 800 + -1 + + 6 + true + -1 + true + + + + + \ No newline at end of file diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml b/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml index 31f2849d4f..8d9da9f60e 100644 --- a/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml @@ -1,78 +1,78 @@ - - - Analyser - - - Monitors - - ANALYSER - analyser.opi - The OPI for the analyser. No properties required. - - - - - - Attenuator - - ATTENUATOR - attenuator.opi - The OPI for the attenuator. No properties required. - + + + Analyser + + + Monitors + + ANALYSER + analyser.opi + The OPI for the analyser. No properties required. + - - - - XY Beam-stop - - - Miscellaneous motion control - - BEAMSTOP - beamstop.opi - The OPI for the XY beam-stop. No properties required. - + + + + Attenuator + + ATTENUATOR + attenuator.opi + The OPI for the attenuator. No properties required. + - - - - Caen HV - - - Power supplies - - CAEN - HV/HVMonitorSummaryDisplay.opi - Summary display for Caens (maintenance of list via the button on this OPI). No properties required. - - - MAX_CRATES - The maximum number of crates to display (default: 2, max: 15) - - - MAX_SLOTS - The maximum number of slots to display per crate (default: 5) - - - MAX_CHANNELS - The maximum number of channels per slot per crate to display (default: 25) - + + + + XY Beam-stop + + + Miscellaneous motion control + + BEAMSTOP + beamstop.opi + The OPI for the XY beam-stop. No properties required. + - - - - CCD100 - - CCD100 - CCD100/CCD100.opi - The OPI for a Chell CCD100 - - Pressure sensors - Flow meters - - + + + + Caen HV + + + Power supplies + + CAEN + HV/HVMonitorSummaryDisplay.opi + Summary display for Caens (maintenance of list via the button on this OPI). No properties required. + + + MAX_CRATES + The maximum number of crates to display (default: 2, max: 15) + + + MAX_SLOTS + The maximum number of slots to display per crate (default: 5) + + + MAX_CHANNELS + The maximum number of channels per slot per crate to display (default: 25) + + + + + + CCD100 + + CCD100 + CCD100/CCD100.opi + The OPI for a Chell CCD100 + + Pressure sensors + Flow meters + + CCD_1 The PV prefix for the first CCD100 (e.g CCD100_01). @@ -89,16 +89,16 @@ CCD_4 The PV prefix for the fourth CCD100 (e.g CCD100_01). - - - - + + + + Double Monitor - - Monitors - - MONITOR + + Monitors + + MONITOR double_monitor.opi The OPI for a double fixed monitor. @@ -119,335 +119,1097 @@ CAEN HV channel for A (e.g. 0). - MBHVCHAN - CAEN HV channel for B (e.g. 1). + MBHVCHAN + CAEN HV channel for B (e.g. 1). + + + MAHVSLOT + CAEN HV slot for A (e.g. 0). + + + MBHVSLOT + CAEN HV slot for B (e.g. 1). + + + + + + Eurotherm + + + Temperature controllers + + EUROTHERM + Eurotherm.opi + The OPI for the Eurotherm crate connected to multiple Eurotherm temperature controllers. + + + EURO + The Eurotherm PV prefix (e.g. EUROTHRM_01). + + + + + + Mercury iTC + + + Temperature controllers + Cryogenics + + MERCURY + mercuryiTC\mercuryiTC.opi + The OPI for the Mercury temperature controller. + + + MERCURY + The Mercury PV prefix (e.g. MERCURY_01). + + + TEMP_NUM1 + The first temperature card number (e.g. 1, optional). + + + TEMP_NUM2 + The second temperature card number (e.g. 2, optional). + + + TEMP_NUM3 + The third temperature card number (e.g. 3, optional). + + + TEMP_NUM4 + The fourth temperature card number (e.g. 4, optional). + + + LEVEL_NUM1 + The first level card number (e.g. 1, optional). + + + LEVEL_NUM2 + The second level card number (e.g. 1, optional). + + + + + + In Out Monitor + + + Monitors + Miscellaneous motion control + + MOVINGMONITOR + inout_monitor.opi + The OPI for a moving monitor. + + + M + The monitor number (e.g. 1). + + + MM + The motor PV relating to the motor controlling the monitor (e.g. MOT:MTR0605). + + + MHVCHAN + CAEN HV channel for the monitor (default: 0). + + + MHVSLOT + CAEN HV slot for the monitor (default: 0). + + + + + + Jaws + + + Jaws and slits + + JAWS + jaws/jaws.opi + The OPI for a Jaw set. + + + J + The Jaws PV (e.g. MOT:JAWS1). + + + + + + Julabo FL300 + + + Water baths + Temperature controllers + + JULABO + JulaboFL300.opi + The OPI for the Julabo FL300 temperature controller. No properties required. + + + + + + Julabo FP50 + + + Water baths + Temperature controllers + + JULABO + JulaboFP50.opi + The OPI for the Julabo FP50 temperature controller.. + + + JULABO + The Julabo PV prefix (e.g. JULABO_01). + + + + + + Linkam 95 + + + Temperature controllers + + LINKAM95 + linkam95.opi + The OPI for the Linkam 95 temperature controller. + + + LINKAM95 + The Linkam 95 PV prefix (e.g. LINKAM95_01). + + + + + + Keithley 2400 + + + Multimeters + + KHLY2400 + Keithley2400/Keithley2400.opi + The OPI for the Keithley 2400 Source Meter. + + + KHLY2400 + The Keithley 2400 PV name (e.g. KHLY2400_01). + + + + + + Keithley 2700 + + + Multimeters + + KHLY2700 + Keithley2700/keithley_scanner_values.opi + The OPI for the Keithley 2700 Source Meter. + + + KHLY2700 + The Keithley 2700 PV name (e.g. KHLY2700_01). + + + + + + Kepco + + + Power supplies + + KEPCO + kepco.opi + The OPI for the Kepco power supply. + + + KEPCO + The Kepco PV name (e.g. KEPCO_01). + + + + + + Lakeshore 218 + + + Temperature controllers + + LAKESHORE + Lakeshore218.opi + The OPI for the Lakeshore 218 temperature controller. + + + LAKESHORE218 + The Lakeshore 218 PV prefix (e.g. LKSH218_01). + + + + + + Lakeshore 336 + + + Temperature controllers + + LAKESHORE + Lakeshore336/Lakeshore336.opi + The OPI for the Lakeshore 336 temperature controller. + + + LAKESHORE336 + The Lakeshore 336 PV prefix (e.g. LKSH336_01). + + + + + + Mk3 Chopper + + + Choppers + + CHOPPER + Mk3Chopper/multiple_choppers.opi + The OPI for the Mk3 chopper. No properties required. + + + + + + Mk2 Chopper + + + Choppers + + CHOPPER + Mk2Chopper.opi + The OPI for the Mk2 chopper. + + + MK2CHOPR + The Mk2 Chopper PV prefix (e.g. MK2CHOPR_01). + + + + + + Monitor + + + Monitors + + MONITOR + monitor.opi + The OPI for a fixed monitor. + + + M + The monitor number (e.g. 1). + + + MHVCHAN + CAEN HV channel for the monitor (default: 0). + + + MHVSLOT + CAEN HV slot for the monitor (default: 0). + + + + + + Pinhole Selector + + + Miscellaneous motion control + + PINHOLESELECTOR + pinhole_selector\pinhole_selector.opi + The OPI for the pinhole selector. + + + PH + The name of the device, as defined in the positions look-up file (e.g. PINHOLE) + + + MM + The motor PV to point at, as defined in the motionsetpoints file (e.g. MOT:MTR0605) + + + + + + PGC + + + Miscellaneous motion control + + PGC + pgc\pgc.opi + The OPI for the Polariser , Guide and Collimation ticket. + + + PGC + The name of the device, as defined in the positions look-up file (e.g. PGC)) + + + MM + The motor PV to point at (as defined in the motionsetpoints file (e.g. MOT:MTR0101)) + + + + + + Pixelman + + + Imaging cameras + + PIXELMAN + pixelman.opi + Description required. + + + Q + Description required. + + + + + + Polariser + + POLARISER + polariser.opi + The OPI for the polariser. No properties required. + + + + + + Rotating Bench + + + Miscellaneous motion control + + ROTATINGBENCH + rotating_bench.opi + The OPI for the LARMOR rotating bench. + + + MM + The PV for the motor controlling the bench rotation (e.g. MOT:MTR0605). + + + + + + Sample changer + + + Sample changers + + SAMPLECHANGER + stage/sample_changer.opi + The OPI for the sample changer. No properties required. + + + + + + Linear sample changer + + + Sample changers + + LINEARSAMPLECHANGER + stage/linear_sample_changer.opi + The OPI for the linear sample changer. No properties required. + + + + + + In Out Monitor + + + Monitors + Miscellaneous motion control + + MOVINGMONITOR + inout_monitor.opi + The OPI for a moving monitor. + + + M + The monitor number (e.g. 1). + + + MM + The motor PV relating to the motor controlling the monitor (e.g. MOT:MTR0605). + + + + + + Sample stage + + + Sample stacks and goniometers + + SAMPLESTACK + stage/sample.opi + The OPI for the sample stage. No properties required. + + + + + + SD Test + + UNCONFIRMED + SDTEST.opi + Software development test OPI. + + + DEV + The SDTest PV prefix (e.g. SDTEST_01) + + + + + + Single Stage + + + Sample stacks and goniometers + + SINGLESTAGE + single_stage.opi + The OPI displaying a single Motor along with a designated ID. + + + S + The name to display for the stage + + + MM + The motor PV relating to the motor controlling the stage (e.g. MOT:MTR0605). + + + + + + SKF G5 Chopper + + + Choppers + + CHOPPER + SKFG5Chopper/SKFChopper.opi + The OPI for the SKF G5 chopper controllers. + + + DEFAULT_ACTIVE_TAB + The tab which is displayed when the OPI is opened (1 to 5). + + + + + + Slit 1 + + + Jaws and slits + + JAWS + jaws/slit1.opi + The OPI for a 2D set of rectangular jaws controlled by 4 motors. + + + J + The Jaws PV (e.g. MOT:JAWS1). + + + M1 + The motor PV relating to motor 1 (e.g. MTR0601). + + + M2 + The motor PV relating to motor 2 (e.g. MTR0602). + + + M3 + The motor PV relating to motor 3 (e.g. MTR0603). + + + M4 + The motor PV relating to motor 4 (e.g. MTR0604). + + + + + + Coupled Slit + + + Jaws and slits + + JAWS + jaws/coupled_slit.opi + The OPI for a 2D set of rectangular jaws controlled by 2 motors. + + + J + The Jaws PV (e.g. MOT:JAWS1). + + + M1 + The motor PV relating to motor 1 (e.g. MTR0601). + + + M2 + The motor PV relating to motor 2 (e.g. MTR0602). + + + + + + Slit motors + + + Jaws and slits + + JAWS + slit_motors.opi + The OPI displaying the motors of a slit. + + + M1 + The motor PV relating to motor 1 (e.g. MTR0601). + + + M2 + The motor PV relating to motor 2 (e.g. MTR0602). + + + M3 + The motor PV relating to motor 3 (e.g. MTR0603). + + + M4 + The motor PV relating to motor 4 (e.g. MTR0604). + + + + + + TPG300 + + + Pressure sensors + + PRESSURE_GAUGE + TPG300.opi + The OPI for the PFEIFFER 300 Vacuum Gauge. + + + TPG300 + The TPG300 PV prefix (e.g. TPG300_01). + + + + + + TPG26x + + + Pressure sensors + + PRESSURE_GAUGE + TPG26x.opi + The OPI for the PFEIFFER 26x Vacuum Gauge. + + + TPG + The TPG26x PV prefix (e.g. TPG26X_01). + + + + + + LARMOR Spin Flipper + + UNCONFIRMED + SpinFlipper306015.opi + The OPI for the LARMOR Spin Flipper. + + + + + + TDK Lambda Genesys + + + Power supplies + + TDK_LAMBDA_GENESYS + genesys.opi + The OPI for the TDK Lambda Genesys PSU. + + + IOC_NUM + PSU IOC Number, two digits (e.g. 01). + + + PS_NUM + Number of the unit within the IOC (e.g. 3). + + + + + + Danfysik + + + Power supplies + + DANFYSIK + danfysik.opi + The OPI for the Danfysik power supply for magnets. + + + DFKPS + The Danfysik PV prefix (e.g. DFKPS_01). + + + + + + PDR2000 + + + Pressure sensors + + PDR2000 + pdr2000.opi + The OPI for the MKS PDR 2000 pressure transducer + + + PDR2000 + The MKS PDR 2000 PV prefix (e.g. PDR2000_01). + + + + + + Cryo valve + + + Cryogenics + + CRYVALVE + cryValve.opi + The OPI for the Iris cryo valve. + + + CRYVALVE + The cryo valve PV prefix (e.g. CRYVALVE_01). + + + + + + Slits (single motor) + + + Jaws and slits + + JAWS + slits_single_motor.opi + The OPI for a slit set with one degree of freedom. + + + MOT + The PV for this slit set's motor (e.g. MOT:MTR0101). + + + + + + SCIMAG3D + + + Magnets + + SCIMAG3D + scimag3D.opi + The OPI for the Scientific Magnetics 3D Magnet. + + + SCIMAG3D + The magnet PV prefix (e.g. SCIMAG3D_01). + + + + + + Detector motion system + + DETECTOR_MOTION_SYSTEM + detector_motion_system/detector_motion_system.opi + The OPI for the detector motion system. No properties required. + + + + + + Zoom sample stack + + + Sample stacks and goniometers + + ZOOM_SAMPLE_STACK + zoom_sample_stack/zoom_sample_stack.opi + The OPI for the ZOOM sample stack. No properties required. + + + + + + Neocera LTC21 + + + Temperature controllers + Cryogenics + + NEOCERA + neocera_ltc21.opi + The OPI for the Neocera LTC21. + + + NEOCERA + The neocera PV prefix (e.g. NEOCERA_01). + + + + + + Goniometer + + + Sample stacks and goniometers + + GONIOMETER + goniometer/goniometer.opi + The OPI for a goniometer. No properties required. + + + + + + Rotating Sample Changer + + + Sample changers + + ROT_SAMPLE_CHANGER + rot_sample_changer.opi + The OPI for the rotating sample changer on HRPD/GEM/POLARIS. No properties required. + + + + Omron PLC + + PLC + omron_plc.opi + The OPI for a PLC. No properties required. + + + + + + Mk3 Chopper (single) + + + Choppers + + CHOPPER + Mk3Chopper/single_chopper.opi + The OPI for a single Mk3 Chopper. + + + NUMBER + The chopper number (e.g. CH1). + + + + + + Polaris jaw set + + + Jaws and slits + + JAWS + jaws/polaris_jaws/Jaws_polaris.opi + The OPI for the Polaris jaw set. No properties required. + + + + + + Gem jaw set + + + Jaws and slits + + JAWS + jaws/gem_jaws/Jaws_gem.opi + The OPI for the Gem jaw set. No properties required. + + + + + + Instron stress rig + + + Loading rigs + + STRESS_RIG + stress_rig/stress_rig.opi + The OPI for the Instron stress rig. No properties required. + + + + + + Applied Measurements Int2-L + + + Pressure sensors + + PRESSURE_GAUGE + amint2l/amint2l.opi + The OPI for the Applied Measurements Int2-L pressure measurement system. + + + AMINT2L + The AM Int2-L PV prefix (e.g. AMINT2L_01). + + + + + + Muon Front End Overview + + MUON_FRONT_END + muon_overviews/muon_front_end_overview.opi + The OPI for the Muon front end. + + + MM_EMU + The motor PV relating to the EMU barndoors (e.g. MOT:MTR0101). + + + MM_MUSR + The motor PV relating to the MuSR barndoors (e.g. MOT:MTR0102). + + + MM_HIFI + The motor PV relating to the HiFi barndoors (e.g. MOT:MTR0103). + + + MM_MOMENTUM + The motor PV relating to the momentum slits (e.g. MOT:MTR0104). + + + + + + Riken Front End Overview + + MUON_FRONT_END + muon_overviews/riken_front_end_overview.opi + The OPI for the Riken front end. No properties required. + + + + Superlogics + + MERCURY + superlogics.opi + The OPI for the Superlogics data acquisition system. + + + SPRLG + The Superlogics PV prefix (e.g. SPRLG_01). + + + + + + XY Shutter Arm Beam-stop + + + Miscellaneous motion control + + BEAMSTOP + xyShutterArmBeamstop.opi + The OPI for the XY Arm Beam-stop with a shutter. + + + XYSHUTTERARMBEAMSTOP + The XY Arm Shutter Beamstop PV prefix (e.g. MOT). + + + + + + Engin-X sample postioning system + + + Sample stacks and goniometers + + SAMPLESTACK + enginx_sample_position_system.opi + The OPI for the Engin-X sample positioning system. + + + + + + Fermi chopper + + + Choppers + + FERMI_CHOPPER + fermi_chopper.opi + The OPI for the Fermi chopper. + + + FERMCHOP + The Fermi chopper PV prefix (e.g. FERMCHOP_01). + + + + + + Fermi chopper - Digital Drive + + + Choppers + + FERMI_CHOPPER + FZJ_DD_Fermi_Chopper.opi + The OPI for the FZJ Digital Drive Fermi Chopper. + + + + + + EnginX 3rd Jaw + + + Jaws and slits + + JAWS + jaws/enginx_jaws/jaw_overview.opi + The OPI for the 3rd Enginx Jawset. + + + J + The Jaws PV (e.g. MOT:JAWS1). + + + + + + Zoom FINS PLC + + PLC + PLCZoomVacuum.opi + The OPI for the Omron FINS PLC for the ZOOM vacuum. + + + Q + The Omron FINS PLC Zoom vacuum PV prefix (e.g. VACUUM). + + + + + + Engin-X collimators + + + Miscellaneous motion control + + JAWS + enginx_collimators/enginx_collimators.opi + The OPI for the Engin-X collimators. + + + + + + IEG system + + + Gas handling systems + + GAS_EXCHANGE + ieg_system.opi + The OPI for the gas exchange system. + + + IEG + The gas exchange system PV prefix (e.g. IEG_01). + + + + + + Cybaman + + + Sample stacks and goniometers + + GONIOMETER + cybaman.opi + The OPI for the cybaman. + + + CYBAMAN + The cybaman PV prefix (e.g. CYBAMAN_01). - - MAHVSLOT - CAEN HV slot for A (e.g. 0). - - - MBHVSLOT - CAEN HV slot for B (e.g. 1). - - + - - Eurotherm - - - Temperature controllers - - EUROTHERM - Eurotherm.opi - The OPI for the Eurotherm crate connected to multiple Eurotherm temperature controllers. - - - EURO - The Eurotherm PV prefix (e.g. EUROTHRM_01). - - - - - - Mercury iTC - - - Temperature controllers - Cryogenics - - MERCURY - mercuryiTC\mercuryiTC.opi - The OPI for the Mercury temperature controller. - - - MERCURY - The Mercury PV prefix (e.g. MERCURY_01). - - - TEMP_NUM1 - The first temperature card number (e.g. 1, optional). - - - TEMP_NUM2 - The second temperature card number (e.g. 2, optional). - - - TEMP_NUM3 - The third temperature card number (e.g. 3, optional). - - - TEMP_NUM4 - The fourth temperature card number (e.g. 4, optional). - - - LEVEL_NUM1 - The first level card number (e.g. 1, optional). - - - LEVEL_NUM2 - The second level card number (e.g. 1, optional). - - - - - - In Out Monitor - - - Monitors - Miscellaneous motion control - - MOVINGMONITOR - inout_monitor.opi - The OPI for a moving monitor. - - - M - The monitor number (e.g. 1). - - - MM - The motor PV relating to the motor controlling the monitor (e.g. MOT:MTR0605). - - - MHVCHAN - CAEN HV channel for the monitor (default: 0). - - - MHVSLOT - CAEN HV slot for the monitor (default: 0). - - - - - - Jaws - - - Jaws and slits - - JAWS - jaws/jaws.opi - The OPI for a Jaw set. - - - J - The Jaws PV (e.g. MOT:JAWS1). - - - - - - Julabo FL300 - - - Water baths - Temperature controllers - - JULABO - JulaboFL300.opi - The OPI for the Julabo FL300 temperature controller. No properties required. - - - - - - Julabo FP50 - - - Water baths - Temperature controllers - - JULABO - JulaboFP50.opi - The OPI for the Julabo FP50 temperature controller.. - - - JULABO - The Julabo PV prefix (e.g. JULABO_01). - - - - - - Linkam 95 - - - Temperature controllers - - LINKAM95 - linkam95.opi - The OPI for the Linkam 95 temperature controller. - - - LINKAM95 - The Linkam 95 PV prefix (e.g. LINKAM95_01). - - - - - - Keithley 2400 - - - Multimeters - - KHLY2400 - Keithley2400/Keithley2400.opi - The OPI for the Keithley 2400 Source Meter. - - - KHLY2400 - The Keithley 2400 PV name (e.g. KHLY2400_01). - - - - - - Keithley 2700 - - - Multimeters - - KHLY2700 - Keithley2700/keithley_scanner_values.opi - The OPI for the Keithley 2700 Source Meter. - - - KHLY2700 - The Keithley 2700 PV name (e.g. KHLY2700_01). - - - - - - Kepco - - - Power supplies - - KEPCO - kepco.opi - The OPI for the Kepco power supply. - - - KEPCO - The Kepco PV name (e.g. KEPCO_01). - - - - - - Lakeshore 218 - - - Temperature controllers - - LAKESHORE - Lakeshore218.opi - The OPI for the Lakeshore 218 temperature controller. - - - LAKESHORE218 - The Lakeshore 218 PV prefix (e.g. LKSH218_01). - - - - - - Lakeshore 336 - - - Temperature controllers - - LAKESHORE - Lakeshore336/Lakeshore336.opi - The OPI for the Lakeshore 336 temperature controller. - - - LAKESHORE336 - The Lakeshore 336 PV prefix (e.g. LKSH336_01). - - - - - - Mk3 Chopper - - - Choppers - - CHOPPER - Mk3Chopper/multiple_choppers.opi - The OPI for the Mk3 chopper. No properties required. - - - - - - Mk2 Chopper - - - Choppers - - CHOPPER - Mk2Chopper.opi - The OPI for the Mk2 chopper. - - - MK2CHOPR - The Mk2 Chopper PV prefix (e.g. MK2CHOPR_01). - - - - - - Monitor - - - Monitors - - MONITOR - monitor.opi - The OPI for a fixed monitor. - - - M - The monitor number (e.g. 1). - - - MHVCHAN - CAEN HV channel for the monitor (default: 0). - - - MHVSLOT - CAEN HV slot for the monitor (default: 0). - - - - - - Pinhole Selector - - - Miscellaneous motion control - - PINHOLESELECTOR - pinhole_selector\pinhole_selector.opi - The OPI for the pinhole selector. - - - PH - The name of the device, as defined in the positions look-up file (e.g. PINHOLE) - - - MM - The motor PV to point at, as defined in the motionsetpoints file (e.g. MOT:MTR0605) - + + Fermi chopper lifter + + + Miscellaneous motion control + + FERMI_CHOPPER + fermi_chopper_lift.opi + The OPI for the Fermi chopper lifter. + - + PGC @@ -538,27 +1300,18 @@ The OPI for the linear sample changer. No properties required. - - - - In Out Monitor - - - Monitors - Miscellaneous motion control - - MOVINGMONITOR - inout_monitor.opi - The OPI for a moving monitor. - - - M - The monitor number (e.g. 1). - - - MM - The motor PV relating to the motor controlling the monitor (e.g. MOT:MTR0605). - + + + + Pixelman + + + Imaging cameras + + PIXELMAN + pixelman.opi + Pixelman camera. + @@ -1020,1145 +1773,392 @@ The OPI for the Muon front end. - MM_EMU - The motor PV relating to the EMU barndoors (e.g. MOT:MTR0101). + MM_EMU + The motor PV relating to the EMU barndoors (e.g. MOT:MTR0101). + + + MM_MUSR + The motor PV relating to the MuSR barndoors (e.g. MOT:MTR0102). + + + MM_HIFI + The motor PV relating to the HiFi barndoors (e.g. MOT:MTR0103). + + + MM_MOMENTUM + The motor PV relating to the momentum slits (e.g. MOT:MTR0104). + + + + + + Riken Front End Overview + + MUON_FRONT_END + muon_overviews/riken_front_end_overview.opi + The OPI for the Riken front end. No properties required. + + + + Superlogics + + MERCURY + superlogics.opi + The OPI for the Superlogics data acquisition system. + + + SPRLG + The Superlogics PV prefix (e.g. SPRLG_01). + + + + + + XY Shutter Arm Beam-stop + + + Miscellaneous motion control + + BEAMSTOP + xyShutterArmBeamstop.opi + The OPI for the XY Arm Beam-stop with a shutter. + + + XYSHUTTERARMBEAMSTOP + The XY Arm Shutter Beamstop PV prefix (e.g. MOT). + + + + + + Engin-X sample postioning system + + + Sample stacks and goniometers + + SAMPLESTACK + enginx_sample_position_system.opi + The OPI for the Engin-X sample positioning system. + + + + + + Fermi chopper + + + Choppers + + FERMI_CHOPPER + fermi_chopper.opi + The OPI for the Fermi chopper. + + + FERMCHOP + The Fermi chopper PV prefix (e.g. FERMCHOP_01). + + + + + + Fermi chopper - Digital Drive + + + Choppers + + FERMI_CHOPPER + FZJ_DD_Fermi_Chopper.opi + The OPI for the FZJ Digital Drive Fermi Chopper. + + + + + + EnginX 3rd Jaw + + + Jaws and slits + + JAWS + jaws/enginx_jaws/jaw_overview.opi + The OPI for the 3rd Enginx Jawset. + + + J + The Jaws PV (e.g. MOT:JAWS1). + + + + + + Zoom FINS PLC + + PLC + PLCZoomVacuum.opi + The OPI for the Omron FINS PLC for the ZOOM vacuum. + + + Q + The Omron FINS PLC Zoom vacuum PV prefix (e.g. VACUUM). + + + + + + Engin-X collimators + + + Miscellaneous motion control + + JAWS + enginx_collimators/enginx_collimators.opi + The OPI for the Engin-X collimators. + + + + + + IEG system + + + Gas and liquid handling systems + + GAS_EXCHANGE + ieg_system.opi + The OPI for the gas exchange system. + + + IEG + The gas exchange system PV prefix (e.g. IEG_01). + + + + + + Cybaman + + + Sample stacks and goniometers + + GONIOMETER + cybaman.opi + The OPI for the cybaman. + + + CYBAMAN + The cybaman PV prefix (e.g. CYBAMAN_01). + + + + + + Fermi chopper lifter + + + Miscellaneous motion control + + FERMI_CHOPPER + fermi_chopper_lift.opi + The OPI for the Fermi chopper lifter. + + + + + + Sample stack + + + Sample stacks and goniometers + + SAMPLESTACK + sample_stack\sample_stack.opi + Generic sample stack OPI supporting up to 8 motors. PV prefixs are typically of the form MOT:STACK:Z + + + AXIS_PV_1 + The axis PV for motor 1 - MM_MUSR - The motor PV relating to the MuSR barndoors (e.g. MOT:MTR0102). + AXIS_PV_2 + The axis PV for motor 2 - MM_HIFI - The motor PV relating to the HiFi barndoors (e.g. MOT:MTR0103). + AXIS_PV_3 + The axis PV for motor 3 - MM_MOMENTUM - The motor PV relating to the momentum slits (e.g. MOT:MTR0104). + AXIS_PV_4 + The axis PV for motor 4 - - - - - Riken Front End Overview - - MUON_FRONT_END - muon_overviews/riken_front_end_overview.opi - The OPI for the Riken front end. No properties required. - - - - Superlogics - - MERCURY - superlogics.opi - The OPI for the Superlogics data acquisition system. - - SPRLG - The Superlogics PV prefix (e.g. SPRLG_01). + AXIS_PV_5 + The axis PV for motor 5 + + + AXIS_PV_6 + The axis PV for motor 6 + + + AXIS_PV_7 + The axis PV for motor 7 + + + AXIS_PV_8 + The axis PV for motor 8 - XY Shutter Arm Beam-stop + Galil Engineering View Miscellaneous motion control - BEAMSTOP - xyShutterArmBeamstop.opi - The OPI for the XY Arm Beam-stop with a shutter. + GALIL_ENGINEERING + galil/galil.opi + The OPI giving a detailed engineering view of a galil. - XYSHUTTERARMBEAMSTOP - The XY Arm Shutter Beamstop PV prefix (e.g. MOT). + M + The galil number to view. E.g. the galil at MOT:MTR0304 would be 03 - Engin-X sample postioning system + GEMOscillatingRadialCollimator - Sample stacks and goniometers + Miscellaneous motion control - SAMPLESTACK - enginx_sample_position_system.opi - The OPI for the Engin-X sample positioning system. - - + OSCILLATING_COLLIMATOR + gemorc.opi + The OPI for the GEM Oscillating Radial Collimator + - Fermi chopper + SKF MB350 Chopper Choppers - FERMI_CHOPPER - fermi_chopper.opi - The OPI for the Fermi chopper. + CHOPPER + skf_mb350.opi + The OPI for the SKF MB350 Chopper. - FERMCHOP - The Fermi chopper PV prefix (e.g. FERMCHOP_01). + SKFMB350 + The chopper PV prefix (e.g. SKFMB350_01). - Fermi chopper - Digital Drive + HLG - Choppers + Cryogenics - FERMI_CHOPPER - FZJ_DD_Fermi_Chopper.opi - The OPI for the FZJ Digital Drive Fermi Chopper. + HE_LEVEL_GAUGE + hlg.opi + The OPI for the helium level gauge. - + + HLG + The HLG PV prefix (e.g. HLG_01). + + - EnginX 3rd Jaw + OscillatingCollimator - Jaws and slits + Miscellaneous motion control - JAWS - jaws/enginx_jaws/jaw_overview.opi - The OPI for the 3rd Enginx Jawset. + OSCILLATING_COLLIMATOR + OscillatingCollimator/OscillatingCollimator.opi + The OPI for the LET oscillating collimator. - J - The Jaws PV (e.g. MOT:JAWS1). + MOT + The motor controlling the collimator (e.g. MOT:MTR0101) - Zoom FINS PLC + Motion Set Point - PLC - PLCZoomVacuum.opi - The OPI for the Omron FINS PLC for the ZOOM vacuum. + + Miscellaneous motion control + Sample stacks and goniometers + Sample changers + + MOTION_SET_POINTS + stage/motion_setpoint.opi + The OPI for motion setpoints - Q - The Omron FINS PLC Zoom vacuum PV prefix (e.g. VACUUM). + MOTION_SET_POINT + The motion setpoint to display (e.g. LKUP:SAMPLE) - Engin-X collimators + Motion Set Point (Few) Miscellaneous motion control - JAWS - enginx_collimators/enginx_collimators.opi - The OPI for the Engin-X collimators. + MOTION_SET_POINTS_FEW + stage/inout_motion_setpoints.opi + The OPI for motion setpoints for one to three setpoints. - + + MOTION_SET_POINT + The motion setpoint to display (e.g. LKUP:LSR) + + - IEG system + SM300 Sample Changer - Gas handling systems + Sample changers - GAS_EXCHANGE - ieg_system.opi - The OPI for the gas exchange system. + SM300_SAMPLE_CHANGER + sample_stack/sm300sampos.opi + The OPI for the SM300 Sample changer - IEG - The gas exchange system PV prefix (e.g. IEG_01). + MOTION_SET_POINT + The prefix of the Motion set points being used(e.g. LKUP:SAMPLE) - Cybaman + Lakeshore 460 - Sample stacks and goniometers + Gaussmeter - GONIOMETER - cybaman.opi - The OPI for the cybaman. + LKSH460 + Lakeshore460/lakeshore460.opi + The OPI for the Lakeshore 460 Gaussmeter. - CYBAMAN - The cybaman PV prefix (e.g. CYBAMAN_01). + LKSH460 + The Lakeshore460 PV prefix (e.g. LKSH460_01). - - Fermi chopper lifter - - - Miscellaneous motion control - - FERMI_CHOPPER - fermi_chopper_lift.opi - The OPI for the Fermi chopper lifter. - - - - - - PGC - - - Miscellaneous motion control - - PGC - pgc\pgc.opi - The OPI for the Polariser , Guide and Collimation ticket. - - - PGC - The name of the device, as defined in the positions look-up file (e.g. PGC)) - - - MM - The motor PV to point at (as defined in the motionsetpoints file (e.g. MOT:MTR0101)) - - - - - - Pixelman - - - Imaging cameras - - PIXELMAN - pixelman.opi - Description required. - - - Q - Description required. - - - - - - Polariser - - POLARISER - polariser.opi - The OPI for the polariser. No properties required. - - - - - - Rotating Bench - - - Miscellaneous motion control - - ROTATINGBENCH - rotating_bench.opi - The OPI for the LARMOR rotating bench. - - - MM - The PV for the motor controlling the bench rotation (e.g. MOT:MTR0605). - - - - - - Sample changer - - - Sample changers - - SAMPLECHANGER - stage/sample_changer.opi - The OPI for the sample changer. No properties required. - - - - - - Linear sample changer - - - Sample changers - - LINEARSAMPLECHANGER - stage/linear_sample_changer.opi - The OPI for the linear sample changer. No properties required. - - - - - - Pixelman - - - Imaging cameras - - PIXELMAN - pixelman.opi - Pixelman camera. - - - - - - Sample stage - - - Sample stacks and goniometers - - SAMPLESTACK - stage/sample.opi - The OPI for the sample stage. No properties required. - - - - - - SD Test - - UNCONFIRMED - SDTEST.opi - Software development test OPI. - - - DEV - The SDTest PV prefix (e.g. SDTEST_01) - - - - - - Single Stage - - - Sample stacks and goniometers - - SINGLESTAGE - single_stage.opi - The OPI displaying a single Motor along with a designated ID. - - - S - The name to display for the stage - - - MM - The motor PV relating to the motor controlling the stage (e.g. MOT:MTR0605). - - - - - - SKF G5 Chopper - - - Choppers - - CHOPPER - SKFG5Chopper/SKFChopper.opi - The OPI for the SKF G5 chopper controllers. - - - DEFAULT_ACTIVE_TAB - The tab which is displayed when the OPI is opened (1 to 5). - - - - - - Slit 1 - - - Jaws and slits - - JAWS - jaws/slit1.opi - The OPI for a 2D set of rectangular jaws controlled by 4 motors. - - - J - The Jaws PV (e.g. MOT:JAWS1). - - - M1 - The motor PV relating to motor 1 (e.g. MTR0601). - - - M2 - The motor PV relating to motor 2 (e.g. MTR0602). - - - M3 - The motor PV relating to motor 3 (e.g. MTR0603). - - - M4 - The motor PV relating to motor 4 (e.g. MTR0604). - - - - - - Coupled Slit - - - Jaws and slits - - JAWS - jaws/coupled_slit.opi - The OPI for a 2D set of rectangular jaws controlled by 2 motors. - - - J - The Jaws PV (e.g. MOT:JAWS1). - - - M1 - The motor PV relating to motor 1 (e.g. MTR0601). - - - M2 - The motor PV relating to motor 2 (e.g. MTR0602). - - - - - - Slit motors - - - Jaws and slits - - JAWS - slit_motors.opi - The OPI displaying the motors of a slit. - - - M1 - The motor PV relating to motor 1 (e.g. MTR0601). - - - M2 - The motor PV relating to motor 2 (e.g. MTR0602). - - - M3 - The motor PV relating to motor 3 (e.g. MTR0603). - - - M4 - The motor PV relating to motor 4 (e.g. MTR0604). - - - - - - TPG300 - - - Pressure sensors - - PRESSURE_GAUGE - TPG300.opi - The OPI for the PFEIFFER 300 Vacuum Gauge. - - - TPG300 - The TPG300 PV prefix (e.g. TPG300_01). - - - - - - TPG26x - - - Pressure sensors - - PRESSURE_GAUGE - TPG26x.opi - The OPI for the PFEIFFER 26x Vacuum Gauge. - - - TPG - The TPG26x PV prefix (e.g. TPG26X_01). - - - - - - LARMOR Spin Flipper - - UNCONFIRMED - SpinFlipper306015.opi - The OPI for the LARMOR Spin Flipper. - - - - - - TDK Lambda Genesys - - - Power supplies - - TDK_LAMBDA_GENESYS - genesys.opi - The OPI for the TDK Lambda Genesys PSU. - - - IOC_NUM - PSU IOC Number, two digits (e.g. 01). - - - PS_NUM - Number of the unit within the IOC (e.g. 3). - - - - - - Danfysik - - - Power supplies - - DANFYSIK - danfysik.opi - The OPI for the Danfysik power supply for magnets. - - - DFKPS - The Danfysik PV prefix (e.g. DFKPS_01). - - - - - - PDR2000 - - - Pressure sensors - - PDR2000 - pdr2000.opi - The OPI for the MKS PDR 2000 pressure transducer - - - PDR2000 - The MKS PDR 2000 PV prefix (e.g. PDR2000_01). - - - - - - Cryo valve - - - Cryogenics - - CRYVALVE - cryValve.opi - The OPI for the Iris cryo valve. - - - CRYVALVE - The cryo valve PV prefix (e.g. CRYVALVE_01). - - - - - - Slits (single motor) - - - Jaws and slits - - JAWS - slits_single_motor.opi - The OPI for a slit set with one degree of freedom. - - - MOT - The PV for this slit set's motor (e.g. MOT:MTR0101). - - - - - - SCIMAG3D - - - Magnets - - SCIMAG3D - scimag3D.opi - The OPI for the Scientific Magnetics 3D Magnet. - - - SCIMAG3D - The magnet PV prefix (e.g. SCIMAG3D_01). - - - - - - Detector motion system - - DETECTOR_MOTION_SYSTEM - detector_motion_system/detector_motion_system.opi - The OPI for the detector motion system. No properties required. - - - - - - Zoom sample stack - - - Sample stacks and goniometers - - ZOOM_SAMPLE_STACK - zoom_sample_stack/zoom_sample_stack.opi - The OPI for the ZOOM sample stack. No properties required. - - - - - - Neocera LTC21 - - - Temperature controllers - Cryogenics - - NEOCERA - neocera_ltc21.opi - The OPI for the Neocera LTC21. - - - NEOCERA - The neocera PV prefix (e.g. NEOCERA_01). - - - - - - Goniometer - - - Sample stacks and goniometers - - GONIOMETER - goniometer/goniometer.opi - The OPI for a goniometer. No properties required. - - - - - - Rotating Sample Changer - - - Sample changers - - ROT_SAMPLE_CHANGER - rot_sample_changer.opi - The OPI for the rotating sample changer on HRPD/GEM/POLARIS. No properties required. - - - - Omron PLC - - PLC - omron_plc.opi - The OPI for a PLC. No properties required. - - - - - - Mk3 Chopper (single) - - - Choppers - - CHOPPER - Mk3Chopper/single_chopper.opi - The OPI for a single Mk3 Chopper. - - - NUMBER - The chopper number (e.g. CH1). - - - - - - Polaris jaw set - - - Jaws and slits - - JAWS - jaws/polaris_jaws/Jaws_polaris.opi - The OPI for the Polaris jaw set. No properties required. - - - - - - Gem jaw set - - - Jaws and slits - - JAWS - jaws/gem_jaws/Jaws_gem.opi - The OPI for the Gem jaw set. No properties required. - - - - - - Instron stress rig - - - Loading rigs - - STRESS_RIG - stress_rig/stress_rig.opi - The OPI for the Instron stress rig. No properties required. - - - - - - Applied Measurements Int2-L - - - Pressure sensors - - PRESSURE_GAUGE - amint2l/amint2l.opi - The OPI for the Applied Measurements Int2-L pressure measurement system. - - - AMINT2L - The AM Int2-L PV prefix (e.g. AMINT2L_01). - - - - - - Muon Front End Overview - - MUON_FRONT_END - muon_overviews/muon_front_end_overview.opi - The OPI for the Muon front end. - - - MM_EMU - The motor PV relating to the EMU barndoors (e.g. MOT:MTR0101). - - - MM_MUSR - The motor PV relating to the MuSR barndoors (e.g. MOT:MTR0102). - - - MM_HIFI - The motor PV relating to the HiFi barndoors (e.g. MOT:MTR0103). - - - MM_MOMENTUM - The motor PV relating to the momentum slits (e.g. MOT:MTR0104). - - - - - - Riken Front End Overview - - MUON_FRONT_END - muon_overviews/riken_front_end_overview.opi - The OPI for the Riken front end. No properties required. - - - - Superlogics - - MERCURY - superlogics.opi - The OPI for the Superlogics data acquisition system. - - - SPRLG - The Superlogics PV prefix (e.g. SPRLG_01). - - - - - - XY Shutter Arm Beam-stop - - - Miscellaneous motion control - - BEAMSTOP - xyShutterArmBeamstop.opi - The OPI for the XY Arm Beam-stop with a shutter. - - - XYSHUTTERARMBEAMSTOP - The XY Arm Shutter Beamstop PV prefix (e.g. MOT). - - - - - - Engin-X sample postioning system - - - Sample stacks and goniometers - - SAMPLESTACK - enginx_sample_position_system.opi - The OPI for the Engin-X sample positioning system. - - - - - - Fermi chopper - - - Choppers - - FERMI_CHOPPER - fermi_chopper.opi - The OPI for the Fermi chopper. - - - FERMCHOP - The Fermi chopper PV prefix (e.g. FERMCHOP_01). - - - - - - Fermi chopper - Digital Drive - - - Choppers - - FERMI_CHOPPER - FZJ_DD_Fermi_Chopper.opi - The OPI for the FZJ Digital Drive Fermi Chopper. - - - - - - EnginX 3rd Jaw - - - Jaws and slits - - JAWS - jaws/enginx_jaws/jaw_overview.opi - The OPI for the 3rd Enginx Jawset. - - - J - The Jaws PV (e.g. MOT:JAWS1). - - - - - - Zoom FINS PLC - - PLC - PLCZoomVacuum.opi - The OPI for the Omron FINS PLC for the ZOOM vacuum. - - - Q - The Omron FINS PLC Zoom vacuum PV prefix (e.g. VACUUM). - - - - - - Engin-X collimators - - - Miscellaneous motion control - - JAWS - enginx_collimators/enginx_collimators.opi - The OPI for the Engin-X collimators. - - - - - - IEG system - - - Gas and liquid handling systems - - GAS_EXCHANGE - ieg_system.opi - The OPI for the gas exchange system. - - - IEG - The gas exchange system PV prefix (e.g. IEG_01). - - - - - - Cybaman - - - Sample stacks and goniometers - - GONIOMETER - cybaman.opi - The OPI for the cybaman. - - - CYBAMAN - The cybaman PV prefix (e.g. CYBAMAN_01). - - - - - - Fermi chopper lifter - - - Miscellaneous motion control - - FERMI_CHOPPER - fermi_chopper_lift.opi - The OPI for the Fermi chopper lifter. - - - - - - Sample stack - - - Sample stacks and goniometers - - SAMPLESTACK - sample_stack\sample_stack.opi - Generic sample stack OPI supporting up to 8 motors. PV prefixs are typically of the form MOT:STACK:Z - - - AXIS_PV_1 - The axis PV for motor 1 - - - AXIS_PV_2 - The axis PV for motor 2 - - - AXIS_PV_3 - The axis PV for motor 3 - - - AXIS_PV_4 - The axis PV for motor 4 - - - AXIS_PV_5 - The axis PV for motor 5 - - - AXIS_PV_6 - The axis PV for motor 6 - - - AXIS_PV_7 - The axis PV for motor 7 - - - AXIS_PV_8 - The axis PV for motor 8 - - - - - - Galil Engineering View - - - Miscellaneous motion control - - GALIL_ENGINEERING - galil/galil.opi - The OPI giving a detailed engineering view of a galil. - - - M - The galil number to view. E.g. the galil at MOT:MTR0304 would be 03 - - - - - - GEMOscillatingRadialCollimator - - - Miscellaneous motion control - - OSCILLATING_COLLIMATOR - gemorc.opi - The OPI for the GEM Oscillating Radial Collimator - - - - - SKF MB350 Chopper - - - Choppers - - CHOPPER - skf_mb350.opi - The OPI for the SKF MB350 Chopper. - - - SKFMB350 - The chopper PV prefix (e.g. SKFMB350_01). - - - - - - HLG - - - Cryogenics - - HE_LEVEL_GAUGE - hlg.opi - The OPI for the helium level gauge. - - - HLG - The HLG PV prefix (e.g. HLG_01). - - - - - - OscillatingCollimator - - - Miscellaneous motion control - - OSCILLATING_COLLIMATOR - OscillatingCollimator/OscillatingCollimator.opi - The OPI for the LET oscillating collimator. - - - MOT - The motor controlling the collimator (e.g. MOT:MTR0101) - - - - - - Motion Set Point - - - Miscellaneous motion control - Sample stacks and goniometers - Sample changers - - MOTION_SET_POINTS - stage/motion_setpoint.opi - The OPI for motion setpoints - - - MOTION_SET_POINT - The motion setpoint to display (e.g. LKUP:SAMPLE) - - - - - - Motion Set Point (Few) - - - Miscellaneous motion control - - MOTION_SET_POINTS_FEW - stage/inout_motion_setpoints.opi - The OPI for motion setpoints for one to three setpoints. - - - MOTION_SET_POINT - The motion setpoint to display (e.g. LKUP:LSR) - - - - - - SM300 Sample Changer - - - Sample changers - - SM300_SAMPLE_CHANGER - sample_stack/sm300sampos.opi - The OPI for the SM300 Sample changer - - - MOTION_SET_POINT - The prefix of the Motion set points being used(e.g. LKUP:SAMPLE) - - - - - - Lakeshore 460 - - - Gaussmeter - - LKSH460 - Lakeshore460/lakeshore460.opi - The OPI for the Lakeshore 460 Gaussmeter. - - - LKSH460 - The Lakeshore460 PV prefix (e.g. LKSH460_01). - - - - Sample stack @@ -2419,12 +2419,12 @@ - + SP2XX - Gas and liquid handling systems - + Gas and liquid handling systems + SYRINGE_PUMP sp2xx.opi The OPI for the SP2XX @@ -2437,20 +2437,20 @@ - Keyence TM-3001P - - KEYENCE - kynctm3k.opi - The OPI for the Keyence TM-3001P optical micrometer - - - KEYENCE - The Keyence PV prefix (e.g. KYNCTM3K_01) - - - - - + Keyence TM-3001P + + KEYENCE + kynctm3k.opi + The OPI for the Keyence TM-3001P optical micrometer + + + KEYENCE + The Keyence PV prefix (e.g. KYNCTM3K_01) + + + + + Live View @@ -2461,7 +2461,7 @@ The OPI for a live view of the detector - + Matplotlib viewer @@ -2473,5 +2473,20 @@ - + + KICKER + + + UNKNOWN + kicker.opi + The OPI for the KICKER + + + KICKER + The KICKER PV prefix (e.g. KICKER_01) + + + + + From 1430b59e16946eed2d657f49b4d701d074722987 Mon Sep 17 00:00:00 2001 From: Rory-Potter-Tessella Date: Tue, 21 Aug 2018 11:54:31 +0100 Subject: [PATCH 02/14] Added voltage viewer to Kicker OPI --- .../resources/TDS3000_trace.opi | 254 +- .../resources/TDS3000_trace_web_interface.opi | 286 ++ .../resources/kicker.opi | 216 +- .../resources/template.opi | 4329 ----------------- 4 files changed, 392 insertions(+), 4693 deletions(-) create mode 100644 base/uk.ac.stfc.isis.ibex.opis/resources/TDS3000_trace_web_interface.opi delete mode 100644 base/uk.ac.stfc.isis.ibex.opis/resources/template.opi diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/TDS3000_trace.opi b/base/uk.ac.stfc.isis.ibex.opis/resources/TDS3000_trace.opi index f2cf594b0c..3a1fd6c279 100644 --- a/base/uk.ac.stfc.isis.ibex.opis/resources/TDS3000_trace.opi +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/TDS3000_trace.opi @@ -30,7 +30,7 @@ Display 800 -336ad6f:141c65e96ed:-7fff - 18 + 0 30 @@ -69,32 +69,36 @@ Label 391 true - 4fdc1aa2:158de06471b:-7a02 + -3622cb5:1655c0e9d06:-7f29 6 - -12 + 6 - + - 0 - + - + - 0 + 13 1 true + + ISIS_GroupBox_NEW + - + - 649 - true + + 696 true + 1 - 10 - Tabbed Container + + TDS3000_trace_web_interface.opi + 1 true @@ -102,226 +106,12 @@ false - - - - true - - ISIS_TabTitle_NEW - - - - - - View trace - - - - true - - ISIS_TabTitle_NEW - - - - - - Configuration - 2 true - Tabbed Container - 684 - 1a251549:1653d5a1794:-76d0 - 6 - 30 - - - - - - - - - 0 - 1 - true - false - - ISIS_Label_Small - - - - - 620 - false - - true - - View trace - - - true - true - false - - - true - - true - false - Grouping Container - 682 - 1a251549:1653d5a1794:-76cf - 1 - 1 - - - - - - - - - 1 - 1 - true - - - - 504 - Web Browser - - - false - false - false - - - false - - $(IP)/Image.png - true - Web Browser - 679 - 1a251549:1653d5a1794:-7c60 - 0 - 0 - - - - false - - - - - - - 0 - 1 - true - - ISIS_Label_NEW - - - - - 20 - 0 - Ramp_file_label - - - true - true - false - - - false - To refresh the data shown on this screen, right click outside the image and select "Refresh OPI". - - false - 1 - true - Label - 661 - true - 1a251549:1653d5a1794:-78c4 - 6 - 510 - - - - - - - - - - - 0 - 1 - true - false - - ISIS_Label_Small - - - - - 620 - false - - true - - Configuration - - - true - true - false - - - true - - true - true - Grouping Container - 682 - 1a251549:1653d5a1794:-76cb - 1 - 1 - - - - - - - - - 1 - 1 - true - - - - 619 - Web Browser - - - false - false - false - - - false - - $(IP)/Data.html - true - Web Browser - 679 - 1a251549:1653d5a1794:-761a - 0 - 0 - - + Linking Container + 721 + -3622cb5:1655c0e9d06:-7ec3 + 0 + 37 \ No newline at end of file diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/TDS3000_trace_web_interface.opi b/base/uk.ac.stfc.isis.ibex.opis/resources/TDS3000_trace_web_interface.opi new file mode 100644 index 0000000000..8e68f3e827 --- /dev/null +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/TDS3000_trace_web_interface.opi @@ -0,0 +1,286 @@ + + + + + false + -1 + -1 + + false + + + + 5.1.0.201707071649 + + + + 6 + 620 + + false + + $(NAME) + + + true + true + true + true + true + Display + 800 + -336ad6f:141c65e96ed:-7fff + 18 + 30 + + + 0 + + + + + + + 0 + 1 + true + + + + 655 + true + + true + + 10 + Tabbed Container_1 + + + true + true + false + + + + + + true + + ISIS_TabTitle_NEW + + + + + + View trace + + + + true + + ISIS_TabTitle_NEW + + + + + + Configuration + 2 + + true + Tabbed Container + 685 + -3622cb5:1655c0e9d06:-7f3c + 0 + 0 + + + + + + + + + 0 + 1 + true + false + + ISIS_Label_Small + + + + + 621 + false + + true + + View trace + + + true + true + false + + + true + + true + false + Grouping Container + 683 + -3622cb5:1655c0e9d06:-7f3b + 1 + 1 + + + + + + + + + 1 + 1 + true + + + + 504 + Web Browser + + + false + false + false + + + false + + $(IP)/Image.png + true + Web Browser + 679 + -3622cb5:1655c0e9d06:-7f3a + 0 + 0 + + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 20 + 0 + Ramp_file_label + + + true + true + false + + + false + To refresh the data shown on this screen, right click outside the image and select "Refresh OPI". + + false + 1 + true + Label + 661 + true + -3622cb5:1655c0e9d06:-7f39 + 6 + 510 + + + + + + + + + + + 0 + 1 + true + false + + ISIS_Label_Small + + + + + 621 + false + + true + + Configuration + + + true + true + false + + + true + + true + true + Grouping Container + 683 + -3622cb5:1655c0e9d06:-7f38 + 1 + 1 + + + + + + + + + 1 + 1 + true + + + + 619 + Web Browser + + + false + false + false + + + false + + $(IP)/Data.html + true + Web Browser + 679 + -3622cb5:1655c0e9d06:-7f37 + 0 + 0 + + + + \ No newline at end of file diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/kicker.opi b/base/uk.ac.stfc.isis.ibex.opis/resources/kicker.opi index 8402b8b8af..0fcc707262 100644 --- a/base/uk.ac.stfc.isis.ibex.opis/resources/kicker.opi +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/kicker.opi @@ -68,7 +68,7 @@ 1 true Label - 415 + 980 true 20a87e7e:1655b91e73a:-7f2d 6 @@ -109,7 +109,7 @@ 1 true Label - 415 + 980 true 20a87e7e:1655b91e73a:-7f2c 6 @@ -133,7 +133,7 @@ - 355 + 685 false true @@ -151,7 +151,7 @@ false true Grouping Container - 415 + 259 20a87e7e:1655b91e73a:-7e41 6 96 @@ -191,7 +191,7 @@ 1 true Label - 96 + 64 true 20a87e7e:1655b91e73a:-7e3d 6 @@ -225,7 +225,7 @@ Text Update 0 true - + $(PV_ROOT)VOLT 0.0 @@ -246,7 +246,7 @@ $(pv_value) 85 false 20a87e7e:1655b91e73a:-7e3b - 130 + 114 54 @@ -284,7 +284,7 @@ $(pv_value) 1 true Label - 96 + 64 true 20a87e7e:1655b91e73a:-7e05 6 @@ -318,7 +318,7 @@ $(pv_value) Text Update 0 true - + $(PV_ROOT)CURR 0.0 @@ -339,111 +339,7 @@ $(pv_value) 85 false 20a87e7e:1655b91e73a:-7e04 - 130 - 84 - - - - false - false - false - - - - true - - - - 0 - 1 - true - - ISIS_Value_NEW - - false - - - - 0 - 20 - 0 - Text Update_2 - 0 - true - - - 0.0 - - - true - true - false - - - true - kV - $(pv_name) -$(pv_value) - true - 1 - true - Text Update - 44 - false - 20a87e7e:1655b91e73a:-7d89 - 228 - 54 - - - - false - false - false - - - - true - - - - 0 - 1 - true - - ISIS_Value_NEW - - false - - - - 0 - 20 - 0 - Text Update_2 - 0 - true - - - 0.0 - - - true - true - false - - - true - mA - $(pv_name) -$(pv_value) - true - 1 - true - Text Update - 44 - false - 20a87e7e:1655b91e73a:-7d7f - 228 + 114 84 @@ -501,7 +397,7 @@ $(pv_value) LED 25 20a87e7e:1655b91e73a:-7d65 - 160 + 144 21 @@ -539,14 +435,23 @@ $(pv_value) 1 true Label - 96 + 64 true 20a87e7e:1655b91e73a:-7d5d 6 24 - + + false + 255 + true + 20 + 0 + false + + + false @@ -554,37 +459,84 @@ $(pv_value) 0 1 true + true + 0.0 - ISIS_Button_NEW + Default false - + - 28 - - osciloscope_button - 0 + 1 + true + 0 + 1 + Polyline + + + + + 0.0 true true - false + true - - OSCILLOSCOPE - false $(pv_name) $(pv_value) + false true - Action Button - 121 - 20a87e7e:1655b91e73a:-7d21 - 240 - 276 + Polyline + 200 + 20a87e7e:1655b91e73a:-7c6f + 6 + 120 + + + + + + + + + 13 + 1 + true + + ISIS_GroupBox_NEW + + + + + + 696 + + true + 1 + + Voltage + TDS3000_trace_web_interface.opi + 1 + + + true + true + false + + + + true + Linking Container + 726 + -3622cb5:1655c0e9d06:-7f88 + 260 + 96 + \ No newline at end of file diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/template.opi b/base/uk.ac.stfc.isis.ibex.opis/resources/template.opi deleted file mode 100644 index 58d0e0da4b..0000000000 --- a/base/uk.ac.stfc.isis.ibex.opis/resources/template.opi +++ /dev/null @@ -1,4329 +0,0 @@ - - - true - - 450885f3:157944e4d4b:-797d - true - false - - 600 - - true - $(P)$(REPLACE_WITH_IOC_NAME_MACRO) - - 3.1.4.201301231545 - true - Display - - false - -1 - -1 - - - - - 800 - -1 - $(NAME) - 6 - true - -1 - true - - - - - - 0 - - 0 - - true - 450885f3:157944e4d4b:-77dc - false - false - Example device name - - 37 - 1 - - true - true - false - - true - 1 - - - - Label - true - - - - 331 - 6 - Label - 6 - - - - - false - - ISIS_Header1_NEW - - - - 0 - - 0 - - true - 450885f3:157944e4d4b:-77db - false - false - $(NAME) - - 37 - 1 - - true - true - false - - true - 1 - - - - Label - true - - - - 775 - 6 - Label_1 - 42 - - - - - false - - ISIS_Header2_NEW - - - - 0 - - 0 - - true - 450885f3:157944e4d4b:-77da - false - false - Optional subtitle, e.g. for sub-screens (rarely needed) - - 37 - 1 - - true - true - false - - true - 1 - - - - Label - true - - - - 775 - 6 - Label_2 - 78 - - - - - false - - ISIS_Header3_NEW - - - - 0 - - 272 - - 1 - - - - - - - - true - 0 - true - 450885f3:157944e4d4b:-7436 - - - - - - - - - ISIS_TabTitle_NEW - - true - - - - 711 - 6 - true - 320 - - - true - - true - - - - Tabbed Container - - ISIS_TabTitle_NEW - - Tabbed Container - 10 - Suggestion for Tabular Layout - - ISIS_TabTitle_NEW - - - - - Graph Example - - - - Linking Container Example - - 3 - - true - true - false - - - true - - - - - 0 - - - true - 4fbad31a:1436c3e166f:-6faf - true - false - - 243 - 1 - - true - true - false - - - true - - true - - - - Grouping Container - - - - 709 - 1 - Graph Example - 1 - - - - - true - - ISIS_Label_Small - - - - 0 - $(trace_0_y_pv) -$(trace_0_y_pv_value) - true - 0 - 1 - 1 - 4 - 0 - 0 - - - - true - Temp 1 - 0.0 - 4 - - -30237fc9:157958fdf6d:-7ade - false - 4 - - ISIS_GraphLabels_NEW - - 4 - - - - 4 - 6 - 6 - 4 - 0 - 0 - 3 - - - 4 - true - - - - - 1000 - 1000 - 50.0 - - ISIS_GraphScale_NEW - - $(P)CS:IOC:<DEVICE MACRO>:DEVIOS:HEARTBEAT - 100 - XY Graph - 1 - 0 - true - - - - - - false - Optional Graph Title - true - 1000 - Temp 2 - true - - false - - true - true - 0 - Output 1 - Time - - - - - ISIS_GraphScale_NEW - - 100 - 100 - 0 - true - 0 - 0 - 1 - true - - 5 - 5 - true - - - - - true - true - 1000 - 0 - 1 - false - true - true - 1 - - true - true - false - - - true - false - - true - 120.0 - 1 - Temp 3 - 235 - true - - - - - - - 4 - true - - - - false - - 0.0 - - true - true - 2 - 100 - true - - - - - - - - false - 0.0 - XY Graph - 0 - true - 0.0 - 1 - 100 - true - Temperature - - true - 1 - 0 - - 0 - - - - - ISIS_GraphLabels_NEW - - 0 - - 0 - 0 - 0 - true - - - ISIS_GraphScale_NEW - - 0 - 0 - false - 0 - false - 100.0 - false - 697 - - 0.0 - - ISIS_GraphLabels_NEW - - true - - true - - - - 4 - - ISIS_GraphLabels_NEW - - false - Heater Output - - - - 1000 - false - - - - 4 - - - - true - Output 2 - 0.0 - 2 - 0 - - - - - - - 0 - - 1 - - true - -49a2eed4:1579e4efc70:-7f70 - false - false - For lines in graphs, check the guildelines for designing for colour blindness on the wiki - - 32 - 1 - - true - true - false - - true - 1 - - - - Label - true - - - - 235 - 372 - Label_9 - 42 - - - - - false - - Default - - - - 0 - - 1 - - true - 1bf5f3ff:15a19530ed2:-7d9b - false - false - To make lines scroll continuously use Trigger PV pointing at heartbeat of IOC -$(P)CS:IOC:<DEVICE MACRO>:DEVIOS:HEARTBEAT - - 61 - 1 - - true - true - false - - true - 1 - - - - Label - true - - - - 277 - 366 - Label_1 - 108 - - - - - false - - Default - - - - - 0 - - - true - 4fbad31a:1436c3e166f:-6fae - true - false - - 243 - 1 - - true - true - false - - - true - - false - - - - Grouping Container - - - - 709 - 1 - Linking Container Example - 1 - - - - - true - - ISIS_Label_Small - - - template_inside_linking_container.opi - 13 - - - true - 19f6821:157d3270543:-7b2b - true - - 122 - 1 - - true - true - false - - - true - 1 - - true - - - - - Linking Container - - - - false - 542 - 6 - A Linking Container That Looks Like a Group Box - 6 - - - - - - ISIS_GroupBox_NEW - - - - template_inside_linking_container.opi - 0 - - - true - -4c24f7a9:157d349e44c:-7f89 - true - - 92 - 1 - - true - true - false - - - true - 2 - - true - - - - - Linking Container - - - - false - 512 - 21 - A Linking Container That Looks Like a Group Box - 138 - - - - - - ISIS_GroupBox_NEW - - - - 0 - - 1 - - true - -4c24f7a9:157d349e44c:-7f73 - false - false - <-- a linking container without borders - - 37 - 1 - - true - true - false - - true - 1 - - - - Label - true - - - - 157 - 547 - Label_13 - 138 - - - - - false - - Default - - - - - 0 - - - true - 19f6821:157d3270543:-7ca7 - true - false - - 243 - 1 - - true - true - false - - - true - - false - - - - Grouping Container - - - - 709 - 1 - Suggestion for Tabular Layout - 1 - - - - - true - - Default - - - 13 - - - true - 19f6821:157d3270543:-7be3 - false - false - - 157 - 1 - - true - true - false - - - true - - true - - - - Grouping Container - - - - 703 - 6 - Just an Idea - 6 - - - - - true - - ISIS_GroupBox_NEW - - - 0 - - 2 - - true - -48159ee9:1567f536160:-4dc3 - false - false - Actual: - - 20 - 1 - - true - true - false - - true - 1 - - - - Label - true - - - - 55 - 6 - Label_2 - 36 - - - - - false - - ISIS_Label_NEW - - - - 0 - - 2 - - true - -3243ce99:1579a45dec4:-77da - false - false - Set point: - - 20 - 1 - - true - true - false - - true - 1 - - - - Label - true - - - - 55 - 6 - Label_9 - 66 - - - - - false - - ISIS_Label_NEW - - - - 0 - - 2 - - true - -3243ce99:1579a45dec4:-77cc - false - false - Ramp: - - 20 - 1 - - true - true - false - - true - 1 - - - - Label - true - - - - 55 - 6 - Label_9 - 96 - - - - - false - - ISIS_Label_NEW - - - - 0 - false - 0 - $(pv_name) -$(pv_value) - 0 - - true - -48159ee9:1567f536160:-4dab - true - - false - ###### - 0.0 - - true - true - 20 - 1 - - true - true - false - - true - - 1 - - - - true - Text Update - false - false - 0 - - - - 64 - 70 - Text Update - 36 - - - - - - ISIS_Value_NEW - - - - 0 - false - 0 - $(pv_name) -$(pv_value) - 0 - - true - -3243ce99:1579a45dec4:-77aa - true - - false - ###### - 0.0 - - true - true - 20 - 1 - - true - true - false - - true - - 1 - - - - true - Text Update - false - false - 0 - - - - 64 - 70 - Text Update - 66 - - - - - - ISIS_Value_NEW - - - - 0 - false - 0 - $(pv_name) -$(pv_value) - 0 - - true - -3243ce99:1579a45dec4:-77a0 - true - - false - ###### - 0.0 - - true - true - 20 - 1 - - true - true - false - - true - - 1 - - - - true - Text Update - false - false - 0 - - - - 64 - 70 - Text Update - 96 - - - - - - ISIS_Value_NEW - - - - 0 - $(pv_name) -$(pv_value) - 0 - - - false - 0.0 - 0.0 - true - 20 - false - 1 - true - - 0 - - - - true - Text Input - - Text Input - - 3 - false - true - -3243ce99:1579a45dec4:-7796 - false - - false - - true - true - false - - 1 - false - 0 - false - - - - 64 - 140 - 66 - 1.7976931348623157E308 - - - - -1.7976931348623157E308 - - ISIS_Value_NEW - - - - 0 - $(pv_name) -$(pv_value) - 0 - - - false - 0.0 - 0.0 - true - 20 - false - 1 - true - - 0 - - - - true - Text Input - - Text Input - - 3 - false - true - -3243ce99:1579a45dec4:-7788 - false - - false - - true - true - false - - 1 - false - 0 - false - - - - 64 - 140 - 96 - 1.7976931348623157E308 - - - - -1.7976931348623157E308 - - ISIS_Value_NEW - - - - 0 - false - 1 - true - $(pv_name) -$(pv_value) - 0 - - true - -3243ce99:1579a45dec4:-777a - false - - - - - true - - 255 - 0.0 - - false - 90 - 1 - - true - true - true - - true - - - - - true - 0 - 20 - Polyline - false - - - - 1 - 216 - Polyline - 32 - 0.0 - - - - - - Default - - - - 0 - false - 0 - $(pv_name) -$(pv_value) - 0 - - true - -3243ce99:1579a45dec4:-7760 - true - - false - ###### - 0.0 - - true - true - 20 - 1 - - true - true - false - - true - - 1 - - - - true - Text Update - false - false - 0 - - - - 64 - 225 - Text Update - 36 - - - - - - ISIS_Value_NEW - - - - 0 - false - 0 - $(pv_name) -$(pv_value) - 0 - - true - -3243ce99:1579a45dec4:-775f - true - - false - ###### - 0.0 - - true - true - 20 - 1 - - true - true - false - - true - - 1 - - - - true - Text Update - false - false - 0 - - - - 64 - 225 - Text Update_1 - 66 - - - - - - ISIS_Value_NEW - - - - 0 - false - 0 - $(pv_name) -$(pv_value) - 0 - - true - -3243ce99:1579a45dec4:-775e - true - - false - ###### - 0.0 - - true - true - 20 - 1 - - true - true - false - - true - - 1 - - - - true - Text Update - false - false - 0 - - - - 64 - 225 - Text Update_2 - 96 - - - - - - ISIS_Value_NEW - - - - 0 - $(pv_name) -$(pv_value) - 0 - - - false - 0.0 - 0.0 - true - 20 - false - 1 - true - - 0 - - - - true - Text Input - - Text Input - - 3 - false - true - -3243ce99:1579a45dec4:-775d - false - - false - - true - true - false - - 1 - false - 0 - false - - - - 64 - 295 - 66 - 1.7976931348623157E308 - - - - -1.7976931348623157E308 - - ISIS_Value_NEW - - - - 0 - $(pv_name) -$(pv_value) - 0 - - - false - 0.0 - 0.0 - true - 20 - false - 1 - true - - 0 - - - - true - Text Input - - Text Input_1 - - 3 - false - true - -3243ce99:1579a45dec4:-775c - false - - false - - true - true - false - - 1 - false - 0 - false - - - - 64 - 295 - 96 - 1.7976931348623157E308 - - - - -1.7976931348623157E308 - - ISIS_Value_NEW - - - - 0 - false - 1 - true - $(pv_name) -$(pv_value) - 0 - - true - -3243ce99:1579a45dec4:-7752 - false - - - - - true - - 255 - 0.0 - - false - 90 - 1 - - true - true - true - - true - - - - - true - 0 - 20 - Polyline - false - - - - 1 - 371 - Polyline - 32 - 0.0 - - - - - - Default - - - - 0 - false - 0 - $(pv_name) -$(pv_value) - 0 - - true - -3243ce99:1579a45dec4:-7734 - true - - false - ###### - 0.0 - - true - true - 20 - 1 - - true - true - false - - true - - 1 - - - - true - Text Update - false - false - 0 - - - - 64 - 380 - Text Update - 36 - - - - - - ISIS_Value_NEW - - - - 0 - false - 0 - $(pv_name) -$(pv_value) - 0 - - true - -3243ce99:1579a45dec4:-7733 - true - - false - ###### - 0.0 - - true - true - 20 - 1 - - true - true - false - - true - - 1 - - - - true - Text Update - false - false - 0 - - - - 64 - 380 - Text Update_1 - 66 - - - - - - ISIS_Value_NEW - - - - 0 - false - 0 - $(pv_name) -$(pv_value) - 0 - - true - -3243ce99:1579a45dec4:-7732 - true - - false - ###### - 0.0 - - true - true - 20 - 1 - - true - true - false - - true - - 1 - - - - true - Text Update - false - false - 0 - - - - 64 - 380 - Text Update_2 - 96 - - - - - - ISIS_Value_NEW - - - - 0 - $(pv_name) -$(pv_value) - 0 - - - false - 0.0 - 0.0 - true - 20 - false - 1 - true - - 0 - - - - true - Text Input - - Text Input - - 3 - false - true - -3243ce99:1579a45dec4:-7731 - false - - false - - true - true - false - - 1 - false - 0 - false - - - - 64 - 450 - 66 - 1.7976931348623157E308 - - - - -1.7976931348623157E308 - - ISIS_Value_NEW - - - - 0 - $(pv_name) -$(pv_value) - 0 - - - false - 0.0 - 0.0 - true - 20 - false - 1 - true - - 0 - - - - true - Text Input - - Text Input_1 - - 3 - false - true - -3243ce99:1579a45dec4:-7730 - false - - false - - true - true - false - - 1 - false - 0 - false - - - - 64 - 450 - 96 - 1.7976931348623157E308 - - - - -1.7976931348623157E308 - - ISIS_Value_NEW - - - - 0 - false - 1 - true - $(pv_name) -$(pv_value) - 0 - - true - -3243ce99:1579a45dec4:-772f - false - - - - - true - - 255 - 0.0 - - false - 90 - 1 - - true - true - true - - true - - - - - true - 0 - 20 - Polyline - false - - - - 1 - 526 - Polyline - 32 - 0.0 - - - - - - Default - - - - 0 - false - 0 - $(pv_name) -$(pv_value) - 0 - - true - -3243ce99:1579a45dec4:-76f9 - true - - false - ###### - 0.0 - - true - true - 20 - 1 - - true - true - false - - true - - 1 - - - - true - Text Update - false - false - 0 - - - - 64 - 535 - Text Update - 36 - - - - - - ISIS_Value_NEW - - - - 0 - false - 0 - $(pv_name) -$(pv_value) - 0 - - true - -3243ce99:1579a45dec4:-76f8 - true - - false - ###### - 0.0 - - true - true - 20 - 1 - - true - true - false - - true - - 1 - - - - true - Text Update - false - false - 0 - - - - 64 - 535 - Text Update_1 - 66 - - - - - - ISIS_Value_NEW - - - - 0 - false - 0 - $(pv_name) -$(pv_value) - 0 - - true - -3243ce99:1579a45dec4:-76f7 - true - - false - ###### - 0.0 - - true - true - 20 - 1 - - true - true - false - - true - - 1 - - - - true - Text Update - false - false - 0 - - - - 64 - 535 - Text Update_2 - 96 - - - - - - ISIS_Value_NEW - - - - 0 - - 1 - - true - -3243ce99:1579a45dec4:-765b - false - false - X Axis - - 20 - 1 - - true - true - false - - true - 1 - - - - Label - true - - - - 55 - 100 - Label_9 - 6 - - - - - false - - ISIS_Label_NEW - - - - 0 - - 1 - - true - -3243ce99:1579a45dec4:-7649 - false - false - Y Axis - - 20 - 1 - - true - true - false - - true - 1 - - - - Label - true - - - - 55 - 255 - Label_9 - 6 - - - - - false - - ISIS_Label_NEW - - - - 0 - - 1 - - true - -3243ce99:1579a45dec4:-763b - false - false - Z Axis - - 20 - 1 - - true - true - false - - true - 1 - - - - Label - true - - - - 55 - 410 - Label_9 - 6 - - - - - false - - ISIS_Label_NEW - - - - 0 - - 1 - - true - -3243ce99:1579a45dec4:-762d - false - false - Units - - 20 - 1 - - true - true - false - - true - 1 - - - - Label - true - - - - 55 - 565 - Label_9 - 6 - - - - - false - - ISIS_Label_NEW - - - - 0 - false - $(pv_name) -$(pv_value) - - true - -3243ce99:1579a45dec4:-74bd - - - true - 27 - 1 - - true - false - false - - true - true - - - - - Combo - false - - - - 64 - 605 - Combo - 66 - - - - - - ISIS_Value_NEW - - - - 0 - false - $(pv_name) -$(pv_value) - - true - -3243ce99:1579a45dec4:-74af - - - true - 27 - 1 - - true - false - false - - true - true - - - - - Combo - false - - - - 64 - 605 - Combo - 92 - - - - - - ISIS_Value_NEW - - - - - - - 0 - - 1 - - true - 450885f3:157944e4d4b:-7014 - false - false - <-- Remember to add the $(NAME) macro in the Name property of the opi! -Also OPI background and foreground colours! - - 55 - 1 - - true - true - false - - true - 1 - - - - Label - true - - - - 259 - 474 - Label_3 - 54 - - - - - false - - Default - - - - 13 - - - true - 450885f3:157944e4d4b:-6a2b - false - false - - 97 - 1 - - true - true - false - - - true - - true - - - - Grouping Container - - - - 369 - 348 - Here We Have a Vertical Separator - 120 - - - - - true - - ISIS_GroupBox_NEW - - - 0 - - 2 - - true - -48159ee9:1567f536160:-58f4 - false - false - Value 2: - - 20 - 1 - - true - true - false - - true - 1 - - - - Label - true - - - - 55 - 6 - Label - 36 - - - - - false - - ISIS_Label_NEW - - - - 0 - false - 0 - $(pv_name) -$(pv_value) - 0 - - true - -48159ee9:1567f536160:-56af - true - - false - ###### - 0.0 - - true - true - 20 - 1 - - true - true - false - - true - - 1 - - - - true - Text Update - false - false - 0 - - - - 64 - 75 - Text Update - 36 - - - - - - ISIS_Value_NEW - - - - 0 - - 2 - - true - -48159ee9:1567f536160:-4dc3 - false - false - Value 1: - - 20 - 1 - - true - true - false - - true - 1 - - - - Label - true - - - - 55 - 6 - Label_2 - 6 - - - - - false - - ISIS_Label_NEW - - - - 0 - false - 0 - $(pv_name) -$(pv_value) - 0 - - true - -48159ee9:1567f536160:-4dab - true - - false - ###### - 0.0 - - true - true - 20 - 1 - - true - true - false - - true - - 1 - - - - true - Text Update - false - false - 0 - - - - 64 - 75 - Text Update - 6 - - - - - - ISIS_Value_NEW - - - - 0 - false - 1 - true - $(pv_name) -$(pv_value) - 0 - - true - -32b7f8d:156f9c2bdb9:-4db1 - false - - - - - true - - 255 - 0.0 - - false - 60 - 1 - - true - true - true - - true - - - - - true - 0 - 20 - Polyline - false - - - - 1 - 156 - Polyline - 6 - 0.0 - - - - - - Default - - - - 0 - - 2 - - true - -48159ee9:1567f536160:-56d7 - false - false - Value 3: - - 20 - 1 - - true - true - false - - true - 1 - - - - Label - true - - - - 55 - 180 - Label_1 - 6 - - - - - false - - ISIS_Label_NEW - - - - 0 - false - 0 - $(pv_name) -$(pv_value) - 0 - - true - -48159ee9:1567f536160:-5697 - true - - false - ###### - 0.0 - - true - true - 20 - 1 - - true - true - false - - true - - 1 - - - - true - Text Update - false - false - 0 - - - - 70 - 249 - Text Update_1 - 6 - - - - - - ISIS_Value_NEW - - - - - 13 - - - true - 450885f3:157944e4d4b:-6cb9 - false - false - - 97 - 1 - - true - true - false - - - true - - true - - - - Grouping Container - - - - 369 - 348 - Here We Have a Horizontal Separator, and Not Capitalized - 216 - - - - - true - - ISIS_GroupBox_NEW - - - 0 - - 2 - - true - -48159ee9:1567f536160:-58f4 - false - false - A: - - 20 - 1 - - true - true - false - - true - 1 - - - - Label - true - - - - 25 - 6 - Label - 6 - - - - - false - - ISIS_Label_NEW - - - - 0 - false - 0 - $(pv_name) -$(pv_value) - 0 - - true - -48159ee9:1567f536160:-58a7 - true - - false - ###### - 0.0 - - true - true - 20 - 1 - - true - true - false - - true - - 1 - - - - true - Text Update - false - false - 0 - - - - 60 - 45 - Text Update - 6 - - - - - - ISIS_Value_NEW - - - - 0 - - 2 - - true - -48159ee9:1567f536160:-57d0 - false - false - Output mode: - - 20 - 1 - - true - true - false - - true - 1 - - - - Label - true - - - - 85 - 6 - Label_4 - 46 - - - - - false - - ISIS_Label_NEW - - - - 0 - false - 0 - $(pv_name) -$(pv_value) - 0 - - true - -48159ee9:1567f536160:-57b8 - true - - false - ###### - 0.0 - - true - true - 20 - 1 - - true - true - false - - true - - 1 - - - - true - Text Update - false - false - 0 - - - - 97 - 101 - Text Update_3 - 46 - - - - - - ISIS_Value_NEW - - - - 0 - false - 1 - true - $(pv_name) -$(pv_value) - 0 - - true - -32b7f8d:156f9c2bdb9:-6455 - false - - - - - true - - 255 - 0.0 - - false - 1 - 1 - - true - true - true - - true - - - - - true - 0 - 20 - Polyline - false - - - - 337 - 0 - Polyline - 36 - 0.0 - - - - - - Default - - - - 0 - $(pv_name) -$(pv_value) - 0 - - - false - 0.0 - 0.0 - true - 20 - false - 1 - true - - 0 - - - - true - Text Input - - Text Input - - 3 - false - true - 19f6821:157d3270543:-7ce0 - false - - false - - true - true - false - - 1 - false - 0 - false - - - - 90 - 114 - 6 - 1.7976931348623157E308 - - - - -1.7976931348623157E308 - - ISIS_Value_NEW - - - - - false - 0 - false - $(pv_name) -$(pv_value) - 0 - - true - -30237fc9:157958fdf6d:-7b34 - - Settings... - - false - 28 - 1 - - true - true - false - - - true - - - - - Button - 109 - 608 - Button_1 - 604 - - - - - - ISIS_Button_NEW - - - - 0 - - 1 - - true - -30237fc9:157958fdf6d:-7b26 - false - false - Button opening another OPI has 3 dots: ... - - 32 - 1 - - true - true - false - - true - 1 - - - - Label - true - - - - 235 - 717 - Label_4 - 648 - - - - - false - - Default - - - - 0 - - 1 - - true - -30237fc9:157958fdf6d:-7b14 - false - false - Please make use of group boxes. -If something is REALLY for the entire device (e.g. a Settings button) and doesn't fit in any group box, it can be on its own. - - 73 - 1 - - true - true - false - - true - 1 - - - - Label - true - - - - 235 - 720 - Label_5 - 564 - - - - - false - - Default - - - - 0 - - 1 - - true - -30237fc9:157958fdf6d:-7a9c - false - false - When converting an existing OPI to this style, be aware of the tips and gotchas in the wiki! - - 73 - 1 - - true - true - false - - true - 1 - - - - Label - true - - - - 265 - 726 - Label_6 - 306 - - - - - false - - Header 3 - - - - 0 - - 1 - - true - -30237fc9:157958fdf6d:-7a7e - false - false - Here we're using a Y-spacing of 30 between labels. - - 32 - 1 - - true - true - false - - true - 1 - - - - Label - true - - - - 259 - 729 - Label_7 - 108 - - - - - false - - Default - - - - 13 - - - true - -4805f29c:1579922e8d6:-7f64 - false - false - - 193 - 1 - - true - true - false - - - true - - true - - - - Grouping Container - - - - 343 - 6 - This is a Group Box - 120 - - - - - true - - ISIS_GroupBox_NEW - - - 0 - - 2 - - true - -48159ee9:1567f536160:-5c7e - false - false - A setpoint value: - - 20 - 1 - - true - true - false - - true - 1 - - - - Label - true - - - - 96 - 6 - Label - 6 - - - - - false - - ISIS_Label_NEW - - - - 0 - - 2 - - true - -48159ee9:1567f536160:-5a91 - false - false - Green LED: - - 20 - 1 - - true - true - false - - true - 1 - - - - Label - true - - - - 96 - 6 - Label_2 - 36 - - - - - false - - ISIS_Label_NEW - - - - 0 - - 2 - - true - -48159ee9:1567f536160:-5a81 - false - false - Red LED: - - 20 - 1 - - true - true - false - - true - 1 - - - - Label - true - - - - 96 - 6 - Label_3 - 66 - - - - - false - - ISIS_Label_NEW - - - - 0 - - 2 - - true - -48159ee9:1567f536160:-5a71 - false - false - A read value: - - 20 - 1 - - true - true - false - - true - 1 - - - - Label - true - - - - 96 - 6 - Label_3 - 96 - - - - - false - - ISIS_Label_NEW - - - - 0 - false - 0 - $(pv_name) -$(pv_value) - 0 - - true - -48159ee9:1567f536160:-5a1b - true - - false - ###### - 0.0 - - true - true - 20 - 1 - - true - true - false - - true - - 1 - - - - true - Text Update - false - false - 0 - - - - 85 - 120 - Text Update - 6 - - - - - - ISIS_Value_NEW - - - - 0 - false - 0 - $(pv_name) -$(pv_value) - 0 - - true - -48159ee9:1567f536160:-5a0b - true - - false - ###### - 0.0 - - true - true - 20 - 1 - - true - true - false - - true - - 1 - - - - true - Text Update - false - false - 0 - - - - 85 - 120 - Text Update - 96 - - - - - - ISIS_Value_NEW - - - - 0 - $(pv_name) -$(pv_value) - 0 - - - false - 0.0 - 0.0 - true - 20 - false - 1 - true - - 0 - - - - true - Text Input - - Text Input - - 3 - false - true - -48159ee9:1567f536160:-5a01 - false - - false - - true - true - false - - 1 - false - 0 - false - - - - 90 - 216 - 6 - 1.7976931348623157E308 - - - - -1.7976931348623157E308 - - ISIS_Value_NEW - - - - 0 - false - $(pv_name) -$(pv_value) - - true - -1 - true - -48159ee9:1567f536160:-59c7 - - - - - - true - 25 - ON - 1 - - true - true - true - - true - - - - - LED - - - - false - - - - false - 25 - 120 - LED - 0 - 33 - - - - - false - - Default - - OFF - - - 0 - false - $(pv_name) -$(pv_value) - - true - -1 - true - -48159ee9:1567f536160:-59a9 - - - - - - true - 25 - ON - 1 - - true - true - true - - true - - - - - LED - - - - false - - - - false - 25 - 120 - LED - 0 - 63 - - - - - false - - Default - - OFF - - - false - 0 - false - $(pv_name) -$(pv_value) - 0 - - true - 3c70a182:156ea885a6f:-7276 - - On/Off - - false - 28 - 1 - - true - true - false - - - true - - - - - Button - 90 - 216 - Button - 31 - - - - - - ISIS_Button_NEW - - - - false - 0 - false - $(pv_name) -$(pv_value) - 0 - - true - -30237fc9:157958fdf6d:-7c14 - - Button - - false - 28 - 1 - - true - true - false - - - true - - - - - Button - 90 - 216 - Button_1 - 92 - - - - - - ISIS_Button_NEW - - - - 0 - - 2 - - true - 4c937f8b:15799b33729:-7fc5 - false - false - A combo box: - - 20 - 1 - - true - true - false - - true - 1 - - - - Label - true - - - - 96 - 6 - Label_8 - 126 - - - - - false - - ISIS_Label_NEW - - - - 0 - false - 0 - $(pv_name) -$(pv_value) - 0 - - true - 4c937f8b:15799b33729:-7fc4 - true - - false - ###### - 0.0 - - true - true - 20 - 1 - - true - true - false - - true - - 1 - - - - true - Text Update - false - false - 0 - - - - 85 - 120 - Text Update - 126 - - - - - - ISIS_Value_NEW - - - - 0 - false - $(pv_name) -$(pv_value) - - true - 4c937f8b:15799b33729:-7fc3 - - - true - 27 - 1 - - true - false - false - - true - true - - - - - Combo - false - - - - 90 - 216 - Combo - 122 - - - - - - ISIS_Value_NEW - - - - 0 - false - $(pv_name) -$(pv_value) - - true - 83b390e:1643bdd9bf9:-7f02 - - - - true - - - true - 28 - 1 - - true - true - false - - false - true - - - - - Choice Button - false - - - - 90 - 216 - ChoiceBtn - 62 - - - - - - A - B - - - ISIS_Button_NEW - - - - - 0 - - 1 - - true - -3243ce99:1579a45dec4:-7b64 - false - false - NOTE: labels are made using the Label widget, rather than the Text widget under Native. Text allows selection of the contents, with a flashing cursor, which may be confusing. - - 73 - 1 - - true - true - false - - true - 1 - - - - Label - true - - - - 259 - 729 - Label_8 - 139 - - - - - false - - Default - - - - 0 - - 1 - - true - -49a2eed4:1579e4efc70:-7f62 - false - false - <-- a possible tabular layout - - 23 - 1 - - true - true - false - - true - 1 - - - - Label - true - - - - 157 - 420 - Label_9 - 320 - - - - - false - - Default - - - - 0 - - 1 - - true - 19f6821:157d3270543:-7cf6 - false - false - <-- Could use the horizontal separator to break the alignment of labels if REALLY necessary - - 33 - 1 - - true - true - false - - true - 1 - - - - Label - true - - - - 265 - 702 - Label_11 - 258 - - - - - false - - Default - - - - 0 - - 1 - - true - 19f6821:157d3270543:-7cd3 - false - false - <-- Try to fit within these dashed lines - if necessary, overflow in the horizontal direction is better than in vertical, because the user can resize the OPI perspective horizontally but not vertically - - 85 - 1 - - true - true - false - - true - 1 - - - - Label - true - - - - 235 - 804 - Label_12 - 384 - - - - - false - - Default - - - - 0 - - 1 - - true - 1c973f6e:158fc9a86d0:-7d72 - false - false - <-- Words are capitalized in group box titles, but not standard exceptions like conjunctions - - 33 - 1 - - true - true - false - - true - 1 - - - - Label - true - - - - 265 - 716 - Label_13 - 216 - - - - - false - - Default - - - - 0 - - 1 - - true - -e6adf3b:15987cd5d31:-7d42 - false - false - Labels should be in sentence case, i.e. only the first letter should be capitalised - - 49 - 1 - - true - true - false - - true - 1 - - - - Label - true - - - - 235 - 804 - Label_14 - 474 - - - - - false - - Default - - - - 0 - - 0 - - - - true - - $(PV_ROOT):MANAGERMODE - - - true - 7f2c52c6:15c9c889162:-7daf - false - false - To control this device, enable manager mode! - - 37 - 1 - - true - true - false - - false - 1 - - - - Label - true - - - - 439 - 336 - Label_15 - 6 - - - - - false - - ISIS_Header2_NEW - - - - 0 - - 1 - - true - 7f2c52c6:15c9c889162:-7d9f - false - false - <-- This is only required for devices which have manager mode enabled on them. - - 55 - 1 - - true - true - false - - true - 1 - - - - Label - true - - - - 259 - 792 - Label_16 - 6 - - - - - false - - Default - - - \ No newline at end of file From 13ff0abff93d0cb5297386291092e800541dff05 Mon Sep 17 00:00:00 2001 From: Rory-Potter-Tessella Date: Tue, 21 Aug 2018 13:25:15 +0100 Subject: [PATCH 03/14] Updated xml and tweaked OPI --- base/uk.ac.stfc.isis.ibex.opis/resources/kicker.opi | 2 +- base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/kicker.opi b/base/uk.ac.stfc.isis.ibex.opis/resources/kicker.opi index 0fcc707262..c857e34ec3 100644 --- a/base/uk.ac.stfc.isis.ibex.opis/resources/kicker.opi +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/kicker.opi @@ -133,7 +133,7 @@ - 685 + 673 false true diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml b/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml index fc2ef086b2..99ab0a8e06 100644 --- a/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml @@ -2495,10 +2495,12 @@ KICKER - - UNKNOWN + + Power supplies + + POWER_SUPPLY kicker.opi - The OPI for the KICKER + The OPI for the KICKER power supply unit KICKER From 96ad20fb1ec53cb35a4afa13b0bf6bdbfcfe3e6c Mon Sep 17 00:00:00 2001 From: Rory-Potter-Tessella Date: Tue, 21 Aug 2018 13:30:57 +0100 Subject: [PATCH 04/14] Fixed extra merged text --- base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml b/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml index 99ab0a8e06..bb6ddd97a7 100644 --- a/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml @@ -2462,8 +2462,6 @@ -<<<<<<< HEAD -======= NGPSPSU @@ -2493,7 +2491,7 @@ - KICKER + Kicker Power supplies From 1cddaea166923b3e670e35a4d1c494b7a097c9d5 Mon Sep 17 00:00:00 2001 From: Rory-Potter-Tessella Date: Tue, 21 Aug 2018 15:32:17 +0100 Subject: [PATCH 05/14] Updated macros --- .../resources/TDS3000_trace.opi | 5 ++-- .../resources/TDS3000_trace_web_interface.opi | 26 +++++++++---------- .../resources/kicker.opi | 15 +++++------ .../resources/opi_info.xml | 6 ++++- 4 files changed, 27 insertions(+), 25 deletions(-) diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/TDS3000_trace.opi b/base/uk.ac.stfc.isis.ibex.opis/resources/TDS3000_trace.opi index 3a1fd6c279..f87620bd96 100644 --- a/base/uk.ac.stfc.isis.ibex.opis/resources/TDS3000_trace.opi +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/TDS3000_trace.opi @@ -91,10 +91,9 @@ - 696 + 798 true - 1 TDS3000_trace_web_interface.opi @@ -109,7 +108,7 @@ true Linking Container - 721 + 846 -3622cb5:1655c0e9d06:-7ec3 0 37 diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/TDS3000_trace_web_interface.opi b/base/uk.ac.stfc.isis.ibex.opis/resources/TDS3000_trace_web_interface.opi index 8e68f3e827..afb3e92a6b 100644 --- a/base/uk.ac.stfc.isis.ibex.opis/resources/TDS3000_trace_web_interface.opi +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/TDS3000_trace_web_interface.opi @@ -47,7 +47,7 @@ - 655 + 715 true true @@ -89,7 +89,7 @@ true Tabbed Container - 685 + 853 -3622cb5:1655c0e9d06:-7f3c 0 0 @@ -111,7 +111,7 @@ - 621 + 681 false true @@ -129,7 +129,7 @@ true false Grouping Container - 683 + 851 -3622cb5:1655c0e9d06:-7f3b 1 1 @@ -147,7 +147,7 @@ - 504 + 619 Web Browser @@ -158,10 +158,10 @@ false - $(IP)/Image.png + $(SCOPE_IP)/Image.png true Web Browser - 679 + 847 -3622cb5:1655c0e9d06:-7f3a 0 0 @@ -205,7 +205,7 @@ true -3622cb5:1655c0e9d06:-7f39 6 - 510 + 630 @@ -226,7 +226,7 @@ - 621 + 681 false true @@ -244,7 +244,7 @@ true true Grouping Container - 683 + 851 -3622cb5:1655c0e9d06:-7f38 1 1 @@ -262,7 +262,7 @@ - 619 + 673 Web Browser @@ -273,10 +273,10 @@ false - $(IP)/Data.html + $(SCOPE_IP)/Data.html true Web Browser - 679 + 835 -3622cb5:1655c0e9d06:-7f37 0 0 diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/kicker.opi b/base/uk.ac.stfc.isis.ibex.opis/resources/kicker.opi index c857e34ec3..c74fe5346f 100644 --- a/base/uk.ac.stfc.isis.ibex.opis/resources/kicker.opi +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/kicker.opi @@ -133,7 +133,7 @@ - 673 + 757 false true @@ -501,7 +501,7 @@ $(pv_value) - + @@ -516,12 +516,11 @@ $(pv_value) - 696 + 786 true - 1 - Voltage + Voltage TDS3000_trace_web_interface.opi 1 @@ -534,9 +533,9 @@ $(pv_value) true Linking Container - 726 - -3622cb5:1655c0e9d06:-7f88 - 260 + 912 + -3622cb5:1655c0e9d06:-7cd8 + 276 96 \ No newline at end of file diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml b/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml index bb6ddd97a7..97f15a8667 100644 --- a/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml @@ -2504,6 +2504,10 @@ KICKER The KICKER PV prefix (e.g. KICKER_01) + + SCOPE_IP + The IP address of the Kicker oscilloscope. + @@ -2518,7 +2522,7 @@ The trace shown by a TDS 3000 series oscilloscope - IP + SCOPE_IP The IP address of the oscilloscope. From e4a7ad74763780534b665cd4149660483938acb8 Mon Sep 17 00:00:00 2001 From: Rory-Potter-Tessella Date: Tue, 28 Aug 2018 11:36:26 +0100 Subject: [PATCH 06/14] Updated kicker opi with power pv. --- base/uk.ac.stfc.isis.ibex.opis/resources/kicker.opi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/kicker.opi b/base/uk.ac.stfc.isis.ibex.opis/resources/kicker.opi index c74fe5346f..ec3ac5cd10 100644 --- a/base/uk.ac.stfc.isis.ibex.opis/resources/kicker.opi +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/kicker.opi @@ -68,7 +68,7 @@ 1 true Label - 980 + 1164 true 20a87e7e:1655b91e73a:-7f2d 6 @@ -109,7 +109,7 @@ 1 true Label - 980 + 1164 true 20a87e7e:1655b91e73a:-7f2c 6 @@ -380,7 +380,7 @@ $(pv_value) ON - + $(PV_ROOT)POWER @@ -516,7 +516,7 @@ $(pv_value) - 786 + 756 true @@ -533,7 +533,7 @@ $(pv_value) true Linking Container - 912 + 894 -3622cb5:1655c0e9d06:-7cd8 276 96 From 2bc4f6cdb9e17bad44bb8618a7bcf8741b16e8cc Mon Sep 17 00:00:00 2001 From: Rory-Potter-Tessella Date: Tue, 28 Aug 2018 12:51:04 +0100 Subject: [PATCH 07/14] Changed name of the OPI --- base/uk.ac.stfc.isis.ibex.opis/resources/kicker.opi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/kicker.opi b/base/uk.ac.stfc.isis.ibex.opis/resources/kicker.opi index ec3ac5cd10..508ec0d1ab 100644 --- a/base/uk.ac.stfc.isis.ibex.opis/resources/kicker.opi +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/kicker.opi @@ -62,7 +62,7 @@ false - Kicker + Kicker PSU false 1 From 912f0e46d4714ccd36650c135d3b9549033a2ab1 Mon Sep 17 00:00:00 2001 From: Rory-Potter-Tessella Date: Tue, 28 Aug 2018 12:59:15 +0100 Subject: [PATCH 08/14] Removed checkstyle file --- base/uk.ac.stfc.isis.ibex.e4.client.product/.checkstyle | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 base/uk.ac.stfc.isis.ibex.e4.client.product/.checkstyle diff --git a/base/uk.ac.stfc.isis.ibex.e4.client.product/.checkstyle b/base/uk.ac.stfc.isis.ibex.e4.client.product/.checkstyle deleted file mode 100644 index 1d14d79f7e..0000000000 --- a/base/uk.ac.stfc.isis.ibex.e4.client.product/.checkstyle +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - From a0a0dbcc1b298c10505801472fee9d0f73062be4 Mon Sep 17 00:00:00 2001 From: Rory-Potter-Tessella Date: Tue, 28 Aug 2018 13:03:11 +0100 Subject: [PATCH 09/14] Reverted back to old opi_info file and template opi --- .../resources/opi_info.xml | 2851 ++++++----- .../resources/template.opi | 4329 +++++++++++++++++ 2 files changed, 5734 insertions(+), 1446 deletions(-) create mode 100644 base/uk.ac.stfc.isis.ibex.opis/resources/template.opi diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml b/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml index f7b54a9e41..878f4d8c50 100644 --- a/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml @@ -1,78 +1,78 @@ - - - Analyser - - - Monitors - - ANALYSER - analyser.opi - The OPI for the analyser. No properties required. - + + + Analyser + + + Monitors + + ANALYSER + analyser.opi + The OPI for the analyser. No properties required. + - - - - Attenuator - - ATTENUATOR - attenuator.opi - The OPI for the attenuator. No properties required. - + + + + Attenuator + + ATTENUATOR + attenuator.opi + The OPI for the attenuator. No properties required. + - - - - XY Beam-stop - - - Miscellaneous motion control - - BEAMSTOP - beamstop.opi - The OPI for the XY beam-stop. No properties required. - + + + + XY Beam-stop + + + Miscellaneous motion control + + BEAMSTOP + beamstop.opi + The OPI for the XY beam-stop. No properties required. + - - - - Caen HV - - - Power supplies - - CAEN - HV/HVMonitorSummaryDisplay.opi - Summary display for Caens (maintenance of list via the button on this OPI). No properties required. - - - MAX_CRATES - The maximum number of crates to display (default: 2, max: 15) - - - MAX_SLOTS - The maximum number of slots to display per crate (default: 5) - - - MAX_CHANNELS - The maximum number of channels per slot per crate to display (default: 25) - - - - - - CCD100 - - CCD100 - CCD100/CCD100.opi - The OPI for a Chell CCD100 - - Pressure sensors - Flow meters - - + + + + Caen HV + + + Power supplies + + CAEN + HV/HVMonitorSummaryDisplay.opi + Summary display for Caens (maintenance of list via the button on this OPI). No properties required. + + + MAX_CRATES + The maximum number of crates to display (default: 2, max: 15) + + + MAX_SLOTS + The maximum number of slots to display per crate (default: 5) + + + MAX_CHANNELS + The maximum number of channels per slot per crate to display (default: 25) + + + + + + CCD100 + + CCD100 + CCD100/CCD100.opi + The OPI for a Chell CCD100 + + Pressure sensors + Flow meters + + CCD_1 The PV prefix for the first CCD100 (e.g CCD100_01). @@ -89,16 +89,16 @@ CCD_4 The PV prefix for the fourth CCD100 (e.g CCD100_01). - - - - + + + + Double Monitor - - Monitors - - MONITOR + + Monitors + + MONITOR double_monitor.opi The OPI for a double fixed monitor. @@ -122,1128 +122,346 @@ MBHVCHAN CAEN HV channel for B (e.g. 1). - - MAHVSLOT - CAEN HV slot for A (e.g. 0). - - - MBHVSLOT - CAEN HV slot for B (e.g. 1). - - - - - - Eurotherm - - - Temperature controllers - - EUROTHERM - Eurotherm.opi - The OPI for the Eurotherm crate connected to multiple Eurotherm temperature controllers. - - - EURO - The Eurotherm PV prefix (e.g. EUROTHRM_01). - - - - - - Mercury iTC - - - Temperature controllers - Cryogenics - - MERCURY - mercuryiTC\mercuryiTC.opi - The OPI for the Mercury temperature controller. - - - MERCURY - The Mercury PV prefix (e.g. MERCURY_01). - - - TEMP_NUM1 - The first temperature card number (e.g. 1, optional). - - - TEMP_NUM2 - The second temperature card number (e.g. 2, optional). - - - TEMP_NUM3 - The third temperature card number (e.g. 3, optional). - - - TEMP_NUM4 - The fourth temperature card number (e.g. 4, optional). - - - LEVEL_NUM1 - The first level card number (e.g. 1, optional). - - - LEVEL_NUM2 - The second level card number (e.g. 1, optional). - - - - - - In Out Monitor - - - Monitors - Miscellaneous motion control - - MOVINGMONITOR - inout_monitor.opi - The OPI for a moving monitor. - - - M - The monitor number (e.g. 1). - - - MM - The motor PV relating to the motor controlling the monitor (e.g. MOT:MTR0605). - - - MHVCHAN - CAEN HV channel for the monitor (default: 0). - - - MHVSLOT - CAEN HV slot for the monitor (default: 0). - - - - - - Jaws - - - Jaws and slits - - JAWS - jaws/jaws.opi - The OPI for a Jaw set. - - - J - The Jaws PV (e.g. MOT:JAWS1). - - - - - - Julabo FL300 - - - Water baths - Temperature controllers - - JULABO - JulaboFL300.opi - The OPI for the Julabo FL300 temperature controller. No properties required. - + + MAHVSLOT + CAEN HV slot for A (e.g. 0). + + + MBHVSLOT + CAEN HV slot for B (e.g. 1). + - - Julabo FP50 - - - Water baths - Temperature controllers - - JULABO - JulaboFP50.opi - The OPI for the Julabo FP50 temperature controller.. - - - JULABO - The Julabo PV prefix (e.g. JULABO_01). - - - - - - Linkam 95 - - - Temperature controllers - - LINKAM95 - linkam95.opi - The OPI for the Linkam 95 temperature controller. - - - LINKAM95 - The Linkam 95 PV prefix (e.g. LINKAM95_01). - - - - - - Keithley 2400 - - - Multimeters - - KHLY2400 - Keithley2400/Keithley2400.opi - The OPI for the Keithley 2400 Source Meter. - - - KHLY2400 - The Keithley 2400 PV name (e.g. KHLY2400_01). - - - - - - Keithley 2700 - - - Multimeters - - KHLY2700 - Keithley2700/keithley_scanner_values.opi - The OPI for the Keithley 2700 Source Meter. - - - KHLY2700 - The Keithley 2700 PV name (e.g. KHLY2700_01). - - - - - - Kepco - - - Power supplies - - KEPCO - kepco.opi - The OPI for the Kepco power supply. - - - KEPCO - The Kepco PV name (e.g. KEPCO_01). + + Eurotherm + + + Temperature controllers + + EUROTHERM + Eurotherm.opi + The OPI for the Eurotherm crate connected to multiple Eurotherm temperature controllers. + + + EURO + The Eurotherm PV prefix (e.g. EUROTHRM_01). + + + + + + Mercury iTC + + + Temperature controllers + Cryogenics + + MERCURY + mercuryiTC\mercuryiTC.opi + The OPI for the Mercury temperature controller. + + + MERCURY + The Mercury PV prefix (e.g. MERCURY_01). + + + TEMP_NUM1 + The first temperature card number (e.g. 1, optional). + + + TEMP_NUM2 + The second temperature card number (e.g. 2, optional). + + + TEMP_NUM3 + The third temperature card number (e.g. 3, optional). + + + TEMP_NUM4 + The fourth temperature card number (e.g. 4, optional). + + + LEVEL_NUM1 + The first level card number (e.g. 1, optional). + + + LEVEL_NUM2 + The second level card number (e.g. 1, optional). - - + + - - Lakeshore 218 - - - Temperature controllers - - LAKESHORE - Lakeshore218.opi - The OPI for the Lakeshore 218 temperature controller. - - - LAKESHORE218 - The Lakeshore 218 PV prefix (e.g. LKSH218_01). + + In Out Monitor + + + Monitors + Miscellaneous motion control + + MOVINGMONITOR + inout_monitor.opi + The OPI for a moving monitor. + + + M + The monitor number (e.g. 1). + + + MM + The motor PV relating to the motor controlling the monitor (e.g. MOT:MTR0605). - - - - - Lakeshore 336 - - - Temperature controllers - - LAKESHORE - Lakeshore336/Lakeshore336.opi - The OPI for the Lakeshore 336 temperature controller. - - - LAKESHORE336 - The Lakeshore 336 PV prefix (e.g. LKSH336_01). + + MHVCHAN + CAEN HV channel for the monitor (default: 0). + + + MHVSLOT + CAEN HV slot for the monitor (default: 0). + + + + + + Jaws + + + Jaws and slits + + JAWS + jaws/jaws.opi + The OPI for a Jaw set. + + + J + The Jaws PV (e.g. MOT:JAWS1). - - - - - Mk3 Chopper - - - Choppers - - CHOPPER - Mk3Chopper/multiple_choppers.opi - The OPI for the Mk3 chopper. No properties required. - - - - - Mk2 Chopper - - - Choppers - - CHOPPER - Mk2Chopper.opi - The OPI for the Mk2 chopper. - - - MK2CHOPR - The Mk2 Chopper PV prefix (e.g. MK2CHOPR_01). - + + + + Julabo FL300 + + + Water baths + Temperature controllers + + JULABO + JulaboFL300.opi + The OPI for the Julabo FL300 temperature controller. No properties required. + - - - Monitor - - - Monitors - - MONITOR - monitor.opi - The OPI for a fixed monitor. - - - M - The monitor number (e.g. 1). - - - MHVCHAN - CAEN HV channel for the monitor (default: 0). - - - MHVSLOT - CAEN HV slot for the monitor (default: 0). - - - - - - Monitor - - - Monitors - - MONITOR - monitor.opi - The OPI for a fixed monitor. - - - M - The monitor number (e.g. 1). - - - MHVCHAN - CAEN HV channel for the monitor (default: 0). - - - MHVSLOT - CAEN HV slot for the monitor (default: 0). - Moxa E1210 - - - - MOXA_1210 - moxa1210.opi - The OPI for a Moxa E1210 remote I/O. - - - MOXA1210 - The Moxa E1210 PV prefix (e.g. MOXA1210_01). - - - - - - Pinhole Selector - - - Miscellaneous motion control - - PINHOLESELECTOR - pinhole_selector\pinhole_selector.opi - The OPI for the pinhole selector. - - - PH - The name of the device, as defined in the positions look-up file (e.g. PINHOLE) - - - MM - The motor PV to point at, as defined in the motionsetpoints file (e.g. MOT:MTR0605) - - - - - - PGC - - - Miscellaneous motion control - - PGC - pgc\pgc.opi - The OPI for the Polariser , Guide and Collimation ticket. - - - PGC - The name of the device, as defined in the positions look-up file (e.g. PGC)) - - - MM - The motor PV to point at (as defined in the motionsetpoints file (e.g. MOT:MTR0101)) - - - - - - Pixelman - - - Imaging cameras - - PIXELMAN - pixelman.opi - Description required. - - - Q - Description required. + + + Julabo FP50 + + + Water baths + Temperature controllers + + JULABO + JulaboFP50.opi + The OPI for the Julabo FP50 temperature controller.. + + + JULABO + The Julabo PV prefix (e.g. JULABO_01). - - - - - Polariser - - POLARISER - polariser.opi - The OPI for the polariser. No properties required. - - - - - Rotating Bench - - - Miscellaneous motion control - - ROTATINGBENCH - rotating_bench.opi - The OPI for the LARMOR rotating bench. - - - MM - The PV for the motor controlling the bench rotation (e.g. MOT:MTR0605). + + + + Linkam 95 + + + Temperature controllers + + LINKAM95 + linkam95.opi + The OPI for the Linkam 95 temperature controller. + + + LINKAM95 + The Linkam 95 PV prefix (e.g. LINKAM95_01). - - - - - Sample changer - - - Sample changers - - SAMPLECHANGER - stage/sample_changer.opi - The OPI for the sample changer. No properties required. - - - - - Linear sample changer - - - Sample changers - - LINEARSAMPLECHANGER - stage/linear_sample_changer.opi - The OPI for the linear sample changer. No properties required. - + + + + Keithley 2400 + + + Multimeters + + KHLY2400 + Keithley2400/Keithley2400.opi + The OPI for the Keithley 2400 Source Meter. + + + KHLY2400 + The Keithley 2400 PV name (e.g. KHLY2400_01). + - - - - In Out Monitor - - - Monitors - Miscellaneous motion control - - MOVINGMONITOR - inout_monitor.opi - The OPI for a moving monitor. - - - M - The monitor number (e.g. 1). - - - MM - The motor PV relating to the motor controlling the monitor (e.g. MOT:MTR0605). - - - - - - Sample stage - - - Sample stacks and goniometers - - SAMPLESTACK - stage/sample.opi - The OPI for the sample stage. No properties required. - + + + + Keithley 2700 + + + Multimeters + + KHLY2700 + Keithley2700/keithley_scanner_values.opi + The OPI for the Keithley 2700 Source Meter. + + + KHLY2700 + The Keithley 2700 PV name (e.g. KHLY2700_01). + - - - - SD Test - - UNCONFIRMED - SDTEST.opi - Software development test OPI. - - - DEV - The SDTest PV prefix (e.g. SDTEST_01) - - - - - - Single Stage - - - Sample stacks and goniometers - - SINGLESTAGE - single_stage.opi - The OPI displaying a single Motor along with a designated ID. - - - S - The name to display for the stage - - - MM - The motor PV relating to the motor controlling the stage (e.g. MOT:MTR0605). - - - - - - SKF G5 Chopper - - - Choppers - - CHOPPER - SKFG5Chopper/SKFChopper.opi - The OPI for the SKF G5 chopper controllers. - - - DEFAULT_ACTIVE_TAB - The tab which is displayed when the OPI is opened (1 to 5). - - - - - - Slit 1 - - - Jaws and slits - - JAWS - jaws/slit1.opi - The OPI for a 2D set of rectangular jaws controlled by 4 motors. - - - J - The Jaws PV (e.g. MOT:JAWS1). - - - M1 - The motor PV relating to motor 1 (e.g. MTR0601). - - - M2 - The motor PV relating to motor 2 (e.g. MTR0602). - - - M3 - The motor PV relating to motor 3 (e.g. MTR0603). - - - M4 - The motor PV relating to motor 4 (e.g. MTR0604). - - - - - - Coupled Slit - - - Jaws and slits - - JAWS - jaws/coupled_slit.opi - The OPI for a 2D set of rectangular jaws controlled by 2 motors. - - - J - The Jaws PV (e.g. MOT:JAWS1). - - - M1 - The motor PV relating to motor 1 (e.g. MTR0601). - - - M2 - The motor PV relating to motor 2 (e.g. MTR0602). - - - - - - Slit motors - - - Jaws and slits - - JAWS - slit_motors.opi - The OPI displaying the motors of a slit. - - - M1 - The motor PV relating to motor 1 (e.g. MTR0601). - - - M2 - The motor PV relating to motor 2 (e.g. MTR0602). - - - M3 - The motor PV relating to motor 3 (e.g. MTR0603). - - - M4 - The motor PV relating to motor 4 (e.g. MTR0604). - - - - - - TPG300 - - - Pressure sensors - - PRESSURE_GAUGE - TPG300.opi - The OPI for the PFEIFFER 300 Vacuum Gauge. - - - TPG300 - The TPG300 PV prefix (e.g. TPG300_01). - - - - - - TPG26x - - - Pressure sensors - - PRESSURE_GAUGE - TPG26x.opi - The OPI for the PFEIFFER 26x Vacuum Gauge. - - - TPG - The TPG26x PV prefix (e.g. TPG26X_01). - - - - - - LARMOR Spin Flipper - - UNCONFIRMED - SpinFlipper306015.opi - The OPI for the LARMOR Spin Flipper. - - - - - - TDK Lambda Genesys - - - Power supplies - - TDK_LAMBDA_GENESYS - genesys.opi - The OPI for the TDK Lambda Genesys PSU. - - - IOC_NUM - PSU IOC Number, two digits (e.g. 01). - - - PS_NUM - Number of the unit within the IOC (e.g. 3). - - - - - - Danfysik - - - Power supplies - - DANFYSIK - danfysik.opi - The OPI for the Danfysik power supply for magnets. - - - DFKPS - The Danfysik PV prefix (e.g. DFKPS_01). - - - - - - PDR2000 - - - Pressure sensors - - PDR2000 - pdr2000.opi - The OPI for the MKS PDR 2000 pressure transducer - - - PDR2000 - The MKS PDR 2000 PV prefix (e.g. PDR2000_01). - - - - - - Cryo valve - - - Cryogenics - - CRYVALVE - cryValve.opi - The OPI for the Iris cryo valve. - - - CRYVALVE - The cryo valve PV prefix (e.g. CRYVALVE_01). - - - - - - Slits (single motor) - - - Jaws and slits - - JAWS - slits_single_motor.opi - The OPI for a slit set with one degree of freedom. - - - MOT - The PV for this slit set's motor (e.g. MOT:MTR0101). - - - - - - SCIMAG3D - - - Magnets - - SCIMAG3D - scimag3D.opi - The OPI for the Scientific Magnetics 3D Magnet. - - - SCIMAG3D - The magnet PV prefix (e.g. SCIMAG3D_01). - - - - - - Detector motion system - - DETECTOR_MOTION_SYSTEM - detector_motion_system/detector_motion_system.opi - The OPI for the detector motion system. No properties required. - - - - - - Zoom sample stack - - - Sample stacks and goniometers - - ZOOM_SAMPLE_STACK - zoom_sample_stack/zoom_sample_stack.opi - The OPI for the ZOOM sample stack. No properties required. - - - - - - Neocera LTC21 - - - Temperature controllers - Cryogenics - - NEOCERA - neocera_ltc21.opi - The OPI for the Neocera LTC21. - - - NEOCERA - The neocera PV prefix (e.g. NEOCERA_01). - - - - - - Goniometer - - - Sample stacks and goniometers - - GONIOMETER - goniometer/goniometer.opi - The OPI for a goniometer. No properties required. - - - - - - Rotating Sample Changer - - - Sample changers - - ROT_SAMPLE_CHANGER - rot_sample_changer.opi - The OPI for the rotating sample changer on HRPD/GEM/POLARIS. No properties required. - - - - Omron PLC - - PLC - omron_plc.opi - The OPI for a PLC. No properties required. - - - - - - Mk3 Chopper (single) - - - Choppers - - CHOPPER - Mk3Chopper/single_chopper.opi - The OPI for a single Mk3 Chopper. - - - NUMBER - The chopper number (e.g. CH1). - - - - - - Polaris jaw set - - - Jaws and slits - - JAWS - jaws/polaris_jaws/Jaws_polaris.opi - The OPI for the Polaris jaw set. No properties required. - - - - - - Gem jaw set - - - Jaws and slits - - JAWS - jaws/gem_jaws/Jaws_gem.opi - The OPI for the Gem jaw set. No properties required. - - - - - - Instron stress rig - - - Loading rigs - - STRESS_RIG - stress_rig/stress_rig.opi - The OPI for the Instron stress rig. No properties required. - - - - - - Applied Measurements Int2-L - - - Pressure sensors - - PRESSURE_GAUGE - amint2l/amint2l.opi - The OPI for the Applied Measurements Int2-L pressure measurement system. - - - AMINT2L - The AM Int2-L PV prefix (e.g. AMINT2L_01). - - - - - - Muon Front End Overview - - MUON_FRONT_END - muon_overviews/muon_front_end_overview.opi - The OPI for the Muon front end. - - - MM_EMU - The motor PV relating to the EMU barndoors (e.g. MOT:MTR0101). - - - MM_MUSR - The motor PV relating to the MuSR barndoors (e.g. MOT:MTR0102). - - - MM_HIFI - The motor PV relating to the HiFi barndoors (e.g. MOT:MTR0103). - - - MM_MOMENTUM - The motor PV relating to the momentum slits (e.g. MOT:MTR0104). - - - - - - Riken Front End Overview - - MUON_FRONT_END - muon_overviews/riken_front_end_overview.opi - The OPI for the Riken front end. No properties required. - - - - Superlogics - - MERCURY - superlogics.opi - The OPI for the Superlogics data acquisition system. - - - SPRLG - The Superlogics PV prefix (e.g. SPRLG_01). - - - - - - XY Shutter Arm Beam-stop - - - Miscellaneous motion control - - BEAMSTOP - xyShutterArmBeamstop.opi - The OPI for the XY Arm Beam-stop with a shutter. - - - XYSHUTTERARMBEAMSTOP - The XY Arm Shutter Beamstop PV prefix (e.g. MOT). - - - - - - Engin-X sample postioning system - - - Sample stacks and goniometers - - SAMPLESTACK - enginx_sample_position_system.opi - The OPI for the Engin-X sample positioning system. - - - - - - Fermi chopper - - - Choppers - - FERMI_CHOPPER - fermi_chopper.opi - The OPI for the Fermi chopper. - - - FERMCHOP - The Fermi chopper PV prefix (e.g. FERMCHOP_01). - - - - - - Fermi chopper - Digital Drive - - - Choppers - - FERMI_CHOPPER - FZJ_DD_Fermi_Chopper.opi - The OPI for the FZJ Digital Drive Fermi Chopper. - - - - - - EnginX 3rd Jaw - - - Jaws and slits - - JAWS - jaws/enginx_jaws/jaw_overview.opi - The OPI for the 3rd Enginx Jawset. - - - J - The Jaws PV (e.g. MOT:JAWS1). - - - - - - Zoom FINS PLC - - PLC - PLCZoomVacuum.opi - The OPI for the Omron FINS PLC for the ZOOM vacuum. - - - Q - The Omron FINS PLC Zoom vacuum PV prefix (e.g. VACUUM). - - - - - - Engin-X collimators - - - Miscellaneous motion control - - JAWS - enginx_collimators/enginx_collimators.opi - The OPI for the Engin-X collimators. - + + + + Kepco + + + Power supplies + + KEPCO + kepco.opi + The OPI for the Kepco power supply. + + + KEPCO + The Kepco PV name (e.g. KEPCO_01). + - + + + + Lakeshore 218 + + + Temperature controllers + + LAKESHORE + Lakeshore218.opi + The OPI for the Lakeshore 218 temperature controller. + + + LAKESHORE218 + The Lakeshore 218 PV prefix (e.g. LKSH218_01). + + + + + + Lakeshore 336 + + + Temperature controllers + + LAKESHORE + Lakeshore336/Lakeshore336.opi + The OPI for the Lakeshore 336 temperature controller. + + + LAKESHORE336 + The Lakeshore 336 PV prefix (e.g. LKSH336_01). + + + + + + Mk3 Chopper + + + Choppers + + CHOPPER + Mk3Chopper/multiple_choppers.opi + The OPI for the Mk3 chopper. No properties required. + + + + + + Mk2 Chopper + + + Choppers + + CHOPPER + Mk2Chopper.opi + The OPI for the Mk2 chopper. + + + MK2CHOPR + The Mk2 Chopper PV prefix (e.g. MK2CHOPR_01). + + + - - IEG system - - - Gas handling systems - - GAS_EXCHANGE - ieg_system.opi - The OPI for the gas exchange system. - - - IEG - The gas exchange system PV prefix (e.g. IEG_01). - + + Monitor + + + Monitors + + MONITOR + monitor.opi + The OPI for a fixed monitor. + + + M + The monitor number (e.g. 1). + + + MHVCHAN + CAEN HV channel for the monitor (default: 0). + + + MHVSLOT + CAEN HV slot for the monitor (default: 0). + - Cybaman + Moxa E1210 - Sample stacks and goniometers - GONIOMETER - cybaman.opi - The OPI for the cybaman. + MOXA_1210 + moxa1210.opi + The OPI for a Moxa E1210 remote I/O. - CYBAMAN - The cybaman PV prefix (e.g. CYBAMAN_01). + MOXA1210 + The Moxa E1210 PV prefix (e.g. MOXA1210_01). - Fermi chopper lifter + Pinhole Selector Miscellaneous motion control - FERMI_CHOPPER - fermi_chopper_lift.opi - The OPI for the Fermi chopper lifter. + PINHOLESELECTOR + pinhole_selector\pinhole_selector.opi + The OPI for the pinhole selector. + + PH + The name of the device, as defined in the positions look-up file (e.g. PINHOLE) + + + MM + The motor PV to point at, as defined in the motionsetpoints file (e.g. MOT:MTR0605) + @@ -1336,18 +554,27 @@ The OPI for the linear sample changer. No properties required. - - - - Pixelman - - - Imaging cameras - - PIXELMAN - pixelman.opi - Pixelman camera. - + + + + In Out Monitor + + + Monitors + Miscellaneous motion control + + MOVINGMONITOR + inout_monitor.opi + The OPI for a moving monitor. + + + M + The monitor number (e.g. 1). + + + MM + The motor PV relating to the motor controlling the monitor (e.g. MOT:MTR0605). + @@ -1917,284 +1144,1037 @@ JAWS jaws/enginx_jaws/jaw_overview.opi - The OPI for the 3rd Enginx Jawset. - - - J - The Jaws PV (e.g. MOT:JAWS1). - - - - - - Zoom FINS PLC - - PLC - PLCZoomVacuum.opi - The OPI for the Omron FINS PLC for the ZOOM vacuum. - - - Q - The Omron FINS PLC Zoom vacuum PV prefix (e.g. VACUUM). - - - - - - Engin-X collimators - - - Miscellaneous motion control - - JAWS - enginx_collimators/enginx_collimators.opi - The OPI for the Engin-X collimators. - - - - - - IEG system - - - Gas and liquid handling systems - - GAS_EXCHANGE - ieg_system.opi - The OPI for the gas exchange system. - - - IEG - The gas exchange system PV prefix (e.g. IEG_01). - - - - - - Cybaman - - - Sample stacks and goniometers - - GONIOMETER - cybaman.opi - The OPI for the cybaman. - - - CYBAMAN - The cybaman PV prefix (e.g. CYBAMAN_01). - - - - - - Fermi chopper lifter - - - Miscellaneous motion control - - FERMI_CHOPPER - fermi_chopper_lift.opi - The OPI for the Fermi chopper lifter. - - - - - - Sample stack - - - Sample stacks and goniometers - - SAMPLESTACK - sample_stack\sample_stack.opi - Generic sample stack OPI supporting up to 8 motors. PV prefixs are typically of the form MOT:STACK:Z - - - AXIS_PV_1 - The axis PV for motor 1 - - - AXIS_PV_2 - The axis PV for motor 2 - - - AXIS_PV_3 - The axis PV for motor 3 - - - AXIS_PV_4 - The axis PV for motor 4 - - - AXIS_PV_5 - The axis PV for motor 5 - - - AXIS_PV_6 - The axis PV for motor 6 - - - AXIS_PV_7 - The axis PV for motor 7 - - - AXIS_PV_8 - The axis PV for motor 8 - - - - - - Galil Engineering View - - - Miscellaneous motion control - - GALIL_ENGINEERING - galil/galil.opi - The OPI giving a detailed engineering view of a galil. - - - M - The galil number to view. E.g. the galil at MOT:MTR0304 would be 03 - - - - - - GEMOscillatingRadialCollimator - - - Miscellaneous motion control - - OSCILLATING_COLLIMATOR - gemorc.opi - The OPI for the GEM Oscillating Radial Collimator - - - - - SKF MB350 Chopper - - - Choppers - - CHOPPER - skf_mb350.opi - The OPI for the SKF MB350 Chopper. - - - SKFMB350 - The chopper PV prefix (e.g. SKFMB350_01). - - - - - - HLG - - - Cryogenics - - HE_LEVEL_GAUGE - hlg.opi - The OPI for the helium level gauge. + The OPI for the 3rd Enginx Jawset. - HLG - The HLG PV prefix (e.g. HLG_01). + J + The Jaws PV (e.g. MOT:JAWS1). - OscillatingCollimator + Zoom FINS PLC - - Miscellaneous motion control - - OSCILLATING_COLLIMATOR - OscillatingCollimator/OscillatingCollimator.opi - The OPI for the LET oscillating collimator. + PLC + PLCZoomVacuum.opi + The OPI for the Omron FINS PLC for the ZOOM vacuum. - MOT - The motor controlling the collimator (e.g. MOT:MTR0101) + Q + The Omron FINS PLC Zoom vacuum PV prefix (e.g. VACUUM). - Motion Set Point + Engin-X collimators Miscellaneous motion control - Sample stacks and goniometers - Sample changers - MOTION_SET_POINTS - stage/motion_setpoint.opi - The OPI for motion setpoints + JAWS + enginx_collimators/enginx_collimators.opi + The OPI for the Engin-X collimators. - - MOTION_SET_POINT - The motion setpoint to display (e.g. LKUP:SAMPLE) - - + - Motion Set Point (Few) + IEG system - Miscellaneous motion control + Gas handling systems - MOTION_SET_POINTS_FEW - stage/inout_motion_setpoints.opi - The OPI for motion setpoints for one to three setpoints. + GAS_EXCHANGE + ieg_system.opi + The OPI for the gas exchange system. - MOTION_SET_POINT - The motion setpoint to display (e.g. LKUP:LSR) + IEG + The gas exchange system PV prefix (e.g. IEG_01). - SM300 Sample Changer + Cybaman - Sample changers + Sample stacks and goniometers - SM300_SAMPLE_CHANGER - sample_stack/sm300sampos.opi - The OPI for the SM300 Sample changer + GONIOMETER + cybaman.opi + The OPI for the cybaman. - MOTION_SET_POINT - The prefix of the Motion set points being used(e.g. LKUP:SAMPLE) + CYBAMAN + The cybaman PV prefix (e.g. CYBAMAN_01). - Lakeshore 460 + Fermi chopper lifter - Gaussmeter + Miscellaneous motion control - LKSH460 - Lakeshore460/lakeshore460.opi - The OPI for the Lakeshore 460 Gaussmeter. + FERMI_CHOPPER + fermi_chopper_lift.opi + The OPI for the Fermi chopper lifter. - - LKSH460 - The Lakeshore460 PV prefix (e.g. LKSH460_01). - - - - + + + + + PGC + + + Miscellaneous motion control + + PGC + pgc\pgc.opi + The OPI for the Polariser , Guide and Collimation ticket. + + + PGC + The name of the device, as defined in the positions look-up file (e.g. PGC)) + + + MM + The motor PV to point at (as defined in the motionsetpoints file (e.g. MOT:MTR0101)) + + + + + + Pixelman + + + Imaging cameras + + PIXELMAN + pixelman.opi + Description required. + + + Q + Description required. + + + + + + Polariser + + POLARISER + polariser.opi + The OPI for the polariser. No properties required. + + + + + + Rotating Bench + + + Miscellaneous motion control + + ROTATINGBENCH + rotating_bench.opi + The OPI for the LARMOR rotating bench. + + + MM + The PV for the motor controlling the bench rotation (e.g. MOT:MTR0605). + + + + + + Sample changer + + + Sample changers + + SAMPLECHANGER + stage/sample_changer.opi + The OPI for the sample changer. No properties required. + + + + + + Linear sample changer + + + Sample changers + + LINEARSAMPLECHANGER + stage/linear_sample_changer.opi + The OPI for the linear sample changer. No properties required. + + + + + + Pixelman + + + Imaging cameras + + PIXELMAN + pixelman.opi + Pixelman camera. + + + + + + Sample stage + + + Sample stacks and goniometers + + SAMPLESTACK + stage/sample.opi + The OPI for the sample stage. No properties required. + + + + + + SD Test + + UNCONFIRMED + SDTEST.opi + Software development test OPI. + + + DEV + The SDTest PV prefix (e.g. SDTEST_01) + + + + + + Single Stage + + + Sample stacks and goniometers + + SINGLESTAGE + single_stage.opi + The OPI displaying a single Motor along with a designated ID. + + + S + The name to display for the stage + + + MM + The motor PV relating to the motor controlling the stage (e.g. MOT:MTR0605). + + + + + + SKF G5 Chopper + + + Choppers + + CHOPPER + SKFG5Chopper/SKFChopper.opi + The OPI for the SKF G5 chopper controllers. + + + DEFAULT_ACTIVE_TAB + The tab which is displayed when the OPI is opened (1 to 5). + + + + + + Slit 1 + + + Jaws and slits + + JAWS + jaws/slit1.opi + The OPI for a 2D set of rectangular jaws controlled by 4 motors. + + + J + The Jaws PV (e.g. MOT:JAWS1). + + + M1 + The motor PV relating to motor 1 (e.g. MTR0601). + + + M2 + The motor PV relating to motor 2 (e.g. MTR0602). + + + M3 + The motor PV relating to motor 3 (e.g. MTR0603). + + + M4 + The motor PV relating to motor 4 (e.g. MTR0604). + + + + + + Coupled Slit + + + Jaws and slits + + JAWS + jaws/coupled_slit.opi + The OPI for a 2D set of rectangular jaws controlled by 2 motors. + + + J + The Jaws PV (e.g. MOT:JAWS1). + + + M1 + The motor PV relating to motor 1 (e.g. MTR0601). + + + M2 + The motor PV relating to motor 2 (e.g. MTR0602). + + + + + + Slit motors + + + Jaws and slits + + JAWS + slit_motors.opi + The OPI displaying the motors of a slit. + + + M1 + The motor PV relating to motor 1 (e.g. MTR0601). + + + M2 + The motor PV relating to motor 2 (e.g. MTR0602). + + + M3 + The motor PV relating to motor 3 (e.g. MTR0603). + + + M4 + The motor PV relating to motor 4 (e.g. MTR0604). + + + + + + TPG300 + + + Pressure sensors + + PRESSURE_GAUGE + TPG300.opi + The OPI for the PFEIFFER 300 Vacuum Gauge. + + + TPG300 + The TPG300 PV prefix (e.g. TPG300_01). + + + + + + TPG26x + + + Pressure sensors + + PRESSURE_GAUGE + TPG26x.opi + The OPI for the PFEIFFER 26x Vacuum Gauge. + + + TPG + The TPG26x PV prefix (e.g. TPG26X_01). + + + + + + LARMOR Spin Flipper + + UNCONFIRMED + SpinFlipper306015.opi + The OPI for the LARMOR Spin Flipper. + + + + + + TDK Lambda Genesys + + + Power supplies + + TDK_LAMBDA_GENESYS + genesys.opi + The OPI for the TDK Lambda Genesys PSU. + + + IOC_NUM + PSU IOC Number, two digits (e.g. 01). + + + PS_NUM + Number of the unit within the IOC (e.g. 3). + + + + + + Danfysik + + + Power supplies + + DANFYSIK + danfysik.opi + The OPI for the Danfysik power supply for magnets. + + + DFKPS + The Danfysik PV prefix (e.g. DFKPS_01). + + + + + + PDR2000 + + + Pressure sensors + + PDR2000 + pdr2000.opi + The OPI for the MKS PDR 2000 pressure transducer + + + PDR2000 + The MKS PDR 2000 PV prefix (e.g. PDR2000_01). + + + + + + Cryo valve + + + Cryogenics + + CRYVALVE + cryValve.opi + The OPI for the Iris cryo valve. + + + CRYVALVE + The cryo valve PV prefix (e.g. CRYVALVE_01). + + + + + + Slits (single motor) + + + Jaws and slits + + JAWS + slits_single_motor.opi + The OPI for a slit set with one degree of freedom. + + + MOT + The PV for this slit set's motor (e.g. MOT:MTR0101). + + + + + + SCIMAG3D + + + Magnets + + SCIMAG3D + scimag3D.opi + The OPI for the Scientific Magnetics 3D Magnet. + + + SCIMAG3D + The magnet PV prefix (e.g. SCIMAG3D_01). + + + + + + Detector motion system + + DETECTOR_MOTION_SYSTEM + detector_motion_system/detector_motion_system.opi + The OPI for the detector motion system. No properties required. + + + + + + Zoom sample stack + + + Sample stacks and goniometers + + ZOOM_SAMPLE_STACK + zoom_sample_stack/zoom_sample_stack.opi + The OPI for the ZOOM sample stack. No properties required. + + + + + + Neocera LTC21 + + + Temperature controllers + Cryogenics + + NEOCERA + neocera_ltc21.opi + The OPI for the Neocera LTC21. + + + NEOCERA + The neocera PV prefix (e.g. NEOCERA_01). + + + + + + Goniometer + + + Sample stacks and goniometers + + GONIOMETER + goniometer/goniometer.opi + The OPI for a goniometer. No properties required. + + + + + + Rotating Sample Changer + + + Sample changers + + ROT_SAMPLE_CHANGER + rot_sample_changer.opi + The OPI for the rotating sample changer on HRPD/GEM/POLARIS. No properties required. + + + + Omron PLC + + PLC + omron_plc.opi + The OPI for a PLC. No properties required. + + + + + + Mk3 Chopper (single) + + + Choppers + + CHOPPER + Mk3Chopper/single_chopper.opi + The OPI for a single Mk3 Chopper. + + + NUMBER + The chopper number (e.g. CH1). + + + + + + Polaris jaw set + + + Jaws and slits + + JAWS + jaws/polaris_jaws/Jaws_polaris.opi + The OPI for the Polaris jaw set. No properties required. + + + + + + Gem jaw set + + + Jaws and slits + + JAWS + jaws/gem_jaws/Jaws_gem.opi + The OPI for the Gem jaw set. No properties required. + + + + + + Instron stress rig + + + Loading rigs + + STRESS_RIG + stress_rig/stress_rig.opi + The OPI for the Instron stress rig. No properties required. + + + + + + Applied Measurements Int2-L + + + Pressure sensors + + PRESSURE_GAUGE + amint2l/amint2l.opi + The OPI for the Applied Measurements Int2-L pressure measurement system. + + + AMINT2L + The AM Int2-L PV prefix (e.g. AMINT2L_01). + + + + + + Muon Front End Overview + + MUON_FRONT_END + muon_overviews/muon_front_end_overview.opi + The OPI for the Muon front end. + + + MM_EMU + The motor PV relating to the EMU barndoors (e.g. MOT:MTR0101). + + + MM_MUSR + The motor PV relating to the MuSR barndoors (e.g. MOT:MTR0102). + + + MM_HIFI + The motor PV relating to the HiFi barndoors (e.g. MOT:MTR0103). + + + MM_MOMENTUM + The motor PV relating to the momentum slits (e.g. MOT:MTR0104). + + + + + + Riken Front End Overview + + MUON_FRONT_END + muon_overviews/riken_front_end_overview.opi + The OPI for the Riken front end. No properties required. + + + + Superlogics + + MERCURY + superlogics.opi + The OPI for the Superlogics data acquisition system. + + + SPRLG + The Superlogics PV prefix (e.g. SPRLG_01). + + + + + + XY Shutter Arm Beam-stop + + + Miscellaneous motion control + + BEAMSTOP + xyShutterArmBeamstop.opi + The OPI for the XY Arm Beam-stop with a shutter. + + + XYSHUTTERARMBEAMSTOP + The XY Arm Shutter Beamstop PV prefix (e.g. MOT). + + + + + + Engin-X sample postioning system + + + Sample stacks and goniometers + + SAMPLESTACK + enginx_sample_position_system.opi + The OPI for the Engin-X sample positioning system. + + + + + + Fermi chopper + + + Choppers + + FERMI_CHOPPER + fermi_chopper.opi + The OPI for the Fermi chopper. + + + FERMCHOP + The Fermi chopper PV prefix (e.g. FERMCHOP_01). + + + + + + Fermi chopper - Digital Drive + + + Choppers + + FERMI_CHOPPER + FZJ_DD_Fermi_Chopper.opi + The OPI for the FZJ Digital Drive Fermi Chopper. + + + + + + EnginX 3rd Jaw + + + Jaws and slits + + JAWS + jaws/enginx_jaws/jaw_overview.opi + The OPI for the 3rd Enginx Jawset. + + + J + The Jaws PV (e.g. MOT:JAWS1). + + + + + + Zoom FINS PLC + + PLC + PLCZoomVacuum.opi + The OPI for the Omron FINS PLC for the ZOOM vacuum. + + + Q + The Omron FINS PLC Zoom vacuum PV prefix (e.g. VACUUM). + + + + + + Engin-X collimators + + + Miscellaneous motion control + + JAWS + enginx_collimators/enginx_collimators.opi + The OPI for the Engin-X collimators. + + + + + + IEG system + + + Gas and liquid handling systems + + GAS_EXCHANGE + ieg_system.opi + The OPI for the gas exchange system. + + + IEG + The gas exchange system PV prefix (e.g. IEG_01). + + + + + + Cybaman + + + Sample stacks and goniometers + + GONIOMETER + cybaman.opi + The OPI for the cybaman. + + + CYBAMAN + The cybaman PV prefix (e.g. CYBAMAN_01). + + + + + + Fermi chopper lifter + + + Miscellaneous motion control + + FERMI_CHOPPER + fermi_chopper_lift.opi + The OPI for the Fermi chopper lifter. + + + + + + Sample stack + + + Sample stacks and goniometers + + SAMPLESTACK + sample_stack\sample_stack.opi + Generic sample stack OPI supporting up to 8 motors. PV prefixs are typically of the form MOT:STACK:Z + + + AXIS_PV_1 + The axis PV for motor 1 + + + AXIS_PV_2 + The axis PV for motor 2 + + + AXIS_PV_3 + The axis PV for motor 3 + + + AXIS_PV_4 + The axis PV for motor 4 + + + AXIS_PV_5 + The axis PV for motor 5 + + + AXIS_PV_6 + The axis PV for motor 6 + + + AXIS_PV_7 + The axis PV for motor 7 + + + AXIS_PV_8 + The axis PV for motor 8 + + + + + + Galil Engineering View + + + Miscellaneous motion control + + GALIL_ENGINEERING + galil/galil.opi + The OPI giving a detailed engineering view of a galil. + + + M + The galil number to view. E.g. the galil at MOT:MTR0304 would be 03 + + + + + + GEMOscillatingRadialCollimator + + + Miscellaneous motion control + + OSCILLATING_COLLIMATOR + gemorc.opi + The OPI for the GEM Oscillating Radial Collimator + + + + + SKF MB350 Chopper + + + Choppers + + CHOPPER + skf_mb350.opi + The OPI for the SKF MB350 Chopper. + + + SKFMB350 + The chopper PV prefix (e.g. SKFMB350_01). + + + + + + HLG + + + Cryogenics + + HE_LEVEL_GAUGE + hlg.opi + The OPI for the helium level gauge. + + + HLG + The HLG PV prefix (e.g. HLG_01). + + + + + + OscillatingCollimator + + + Miscellaneous motion control + + OSCILLATING_COLLIMATOR + OscillatingCollimator/OscillatingCollimator.opi + The OPI for the LET oscillating collimator. + + + MOT + The motor controlling the collimator (e.g. MOT:MTR0101) + + + + + + Motion Set Point + + + Miscellaneous motion control + Sample stacks and goniometers + Sample changers + + MOTION_SET_POINTS + stage/motion_setpoint.opi + The OPI for motion setpoints + + + MOTION_SET_POINT + The motion setpoint to display (e.g. LKUP:SAMPLE) + + + + + + Motion Set Point (Few) + + + Miscellaneous motion control + + MOTION_SET_POINTS_FEW + stage/inout_motion_setpoints.opi + The OPI for motion setpoints for one to three setpoints. + + + MOTION_SET_POINT + The motion setpoint to display (e.g. LKUP:LSR) + + + + + + SM300 Sample Changer + + + Sample changers + + SM300_SAMPLE_CHANGER + sample_stack/sm300sampos.opi + The OPI for the SM300 Sample changer + + + MOTION_SET_POINT + The prefix of the Motion set points being used(e.g. LKUP:SAMPLE) + + + + + + Lakeshore 460 + + + Gaussmeter + + LKSH460 + Lakeshore460/lakeshore460.opi + The OPI for the Lakeshore 460 Gaussmeter. + + + LKSH460 + The Lakeshore460 PV prefix (e.g. LKSH460_01). + + + + Sample stack @@ -2455,12 +2435,12 @@ - + SP2XX - Gas and liquid handling systems - + Gas and liquid handling systems + SYRINGE_PUMP sp2xx.opi The OPI for the SP2XX @@ -2473,20 +2453,20 @@ - Keyence TM-3001P - - KEYENCE - kynctm3k.opi - The OPI for the Keyence TM-3001P optical micrometer - - - KEYENCE - The Keyence PV prefix (e.g. KYNCTM3K_01) - - - - - + Keyence TM-3001P + + KEYENCE + kynctm3k.opi + The OPI for the Keyence TM-3001P optical micrometer + + + KEYENCE + The Keyence PV prefix (e.g. KYNCTM3K_01) + + + + + Live View @@ -2526,27 +2506,6 @@ - - Kicker - - - Power supplies - - POWER_SUPPLY - kicker.opi - The OPI for the KICKER power supply unit - - - KICKER - The KICKER PV prefix (e.g. KICKER_01) - - - SCOPE_IP - The IP address of the Kicker oscilloscope. - - - - TDS 3000 Trace @@ -2558,11 +2517,11 @@ The trace shown by a TDS 3000 series oscilloscope - SCOPE_IP + IP The IP address of the oscilloscope. - + diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/template.opi b/base/uk.ac.stfc.isis.ibex.opis/resources/template.opi new file mode 100644 index 0000000000..58d0e0da4b --- /dev/null +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/template.opi @@ -0,0 +1,4329 @@ + + + true + + 450885f3:157944e4d4b:-797d + true + false + + 600 + + true + $(P)$(REPLACE_WITH_IOC_NAME_MACRO) + + 3.1.4.201301231545 + true + Display + + false + -1 + -1 + + + + + 800 + -1 + $(NAME) + 6 + true + -1 + true + + + + + + 0 + + 0 + + true + 450885f3:157944e4d4b:-77dc + false + false + Example device name + + 37 + 1 + + true + true + false + + true + 1 + + + + Label + true + + + + 331 + 6 + Label + 6 + + + + + false + + ISIS_Header1_NEW + + + + 0 + + 0 + + true + 450885f3:157944e4d4b:-77db + false + false + $(NAME) + + 37 + 1 + + true + true + false + + true + 1 + + + + Label + true + + + + 775 + 6 + Label_1 + 42 + + + + + false + + ISIS_Header2_NEW + + + + 0 + + 0 + + true + 450885f3:157944e4d4b:-77da + false + false + Optional subtitle, e.g. for sub-screens (rarely needed) + + 37 + 1 + + true + true + false + + true + 1 + + + + Label + true + + + + 775 + 6 + Label_2 + 78 + + + + + false + + ISIS_Header3_NEW + + + + 0 + + 272 + + 1 + + + + + + + + true + 0 + true + 450885f3:157944e4d4b:-7436 + + + + + + + + + ISIS_TabTitle_NEW + + true + + + + 711 + 6 + true + 320 + + + true + + true + + + + Tabbed Container + + ISIS_TabTitle_NEW + + Tabbed Container + 10 + Suggestion for Tabular Layout + + ISIS_TabTitle_NEW + + + + + Graph Example + + + + Linking Container Example + + 3 + + true + true + false + + + true + + + + + 0 + + + true + 4fbad31a:1436c3e166f:-6faf + true + false + + 243 + 1 + + true + true + false + + + true + + true + + + + Grouping Container + + + + 709 + 1 + Graph Example + 1 + + + + + true + + ISIS_Label_Small + + + + 0 + $(trace_0_y_pv) +$(trace_0_y_pv_value) + true + 0 + 1 + 1 + 4 + 0 + 0 + + + + true + Temp 1 + 0.0 + 4 + + -30237fc9:157958fdf6d:-7ade + false + 4 + + ISIS_GraphLabels_NEW + + 4 + + + + 4 + 6 + 6 + 4 + 0 + 0 + 3 + + + 4 + true + + + + + 1000 + 1000 + 50.0 + + ISIS_GraphScale_NEW + + $(P)CS:IOC:<DEVICE MACRO>:DEVIOS:HEARTBEAT + 100 + XY Graph + 1 + 0 + true + + + + + + false + Optional Graph Title + true + 1000 + Temp 2 + true + + false + + true + true + 0 + Output 1 + Time + + + + + ISIS_GraphScale_NEW + + 100 + 100 + 0 + true + 0 + 0 + 1 + true + + 5 + 5 + true + + + + + true + true + 1000 + 0 + 1 + false + true + true + 1 + + true + true + false + + + true + false + + true + 120.0 + 1 + Temp 3 + 235 + true + + + + + + + 4 + true + + + + false + + 0.0 + + true + true + 2 + 100 + true + + + + + + + + false + 0.0 + XY Graph + 0 + true + 0.0 + 1 + 100 + true + Temperature + + true + 1 + 0 + + 0 + + + + + ISIS_GraphLabels_NEW + + 0 + + 0 + 0 + 0 + true + + + ISIS_GraphScale_NEW + + 0 + 0 + false + 0 + false + 100.0 + false + 697 + + 0.0 + + ISIS_GraphLabels_NEW + + true + + true + + + + 4 + + ISIS_GraphLabels_NEW + + false + Heater Output + + + + 1000 + false + + + + 4 + + + + true + Output 2 + 0.0 + 2 + 0 + + + + + + + 0 + + 1 + + true + -49a2eed4:1579e4efc70:-7f70 + false + false + For lines in graphs, check the guildelines for designing for colour blindness on the wiki + + 32 + 1 + + true + true + false + + true + 1 + + + + Label + true + + + + 235 + 372 + Label_9 + 42 + + + + + false + + Default + + + + 0 + + 1 + + true + 1bf5f3ff:15a19530ed2:-7d9b + false + false + To make lines scroll continuously use Trigger PV pointing at heartbeat of IOC +$(P)CS:IOC:<DEVICE MACRO>:DEVIOS:HEARTBEAT + + 61 + 1 + + true + true + false + + true + 1 + + + + Label + true + + + + 277 + 366 + Label_1 + 108 + + + + + false + + Default + + + + + 0 + + + true + 4fbad31a:1436c3e166f:-6fae + true + false + + 243 + 1 + + true + true + false + + + true + + false + + + + Grouping Container + + + + 709 + 1 + Linking Container Example + 1 + + + + + true + + ISIS_Label_Small + + + template_inside_linking_container.opi + 13 + + + true + 19f6821:157d3270543:-7b2b + true + + 122 + 1 + + true + true + false + + + true + 1 + + true + + + + + Linking Container + + + + false + 542 + 6 + A Linking Container That Looks Like a Group Box + 6 + + + + + + ISIS_GroupBox_NEW + + + + template_inside_linking_container.opi + 0 + + + true + -4c24f7a9:157d349e44c:-7f89 + true + + 92 + 1 + + true + true + false + + + true + 2 + + true + + + + + Linking Container + + + + false + 512 + 21 + A Linking Container That Looks Like a Group Box + 138 + + + + + + ISIS_GroupBox_NEW + + + + 0 + + 1 + + true + -4c24f7a9:157d349e44c:-7f73 + false + false + <-- a linking container without borders + + 37 + 1 + + true + true + false + + true + 1 + + + + Label + true + + + + 157 + 547 + Label_13 + 138 + + + + + false + + Default + + + + + 0 + + + true + 19f6821:157d3270543:-7ca7 + true + false + + 243 + 1 + + true + true + false + + + true + + false + + + + Grouping Container + + + + 709 + 1 + Suggestion for Tabular Layout + 1 + + + + + true + + Default + + + 13 + + + true + 19f6821:157d3270543:-7be3 + false + false + + 157 + 1 + + true + true + false + + + true + + true + + + + Grouping Container + + + + 703 + 6 + Just an Idea + 6 + + + + + true + + ISIS_GroupBox_NEW + + + 0 + + 2 + + true + -48159ee9:1567f536160:-4dc3 + false + false + Actual: + + 20 + 1 + + true + true + false + + true + 1 + + + + Label + true + + + + 55 + 6 + Label_2 + 36 + + + + + false + + ISIS_Label_NEW + + + + 0 + + 2 + + true + -3243ce99:1579a45dec4:-77da + false + false + Set point: + + 20 + 1 + + true + true + false + + true + 1 + + + + Label + true + + + + 55 + 6 + Label_9 + 66 + + + + + false + + ISIS_Label_NEW + + + + 0 + + 2 + + true + -3243ce99:1579a45dec4:-77cc + false + false + Ramp: + + 20 + 1 + + true + true + false + + true + 1 + + + + Label + true + + + + 55 + 6 + Label_9 + 96 + + + + + false + + ISIS_Label_NEW + + + + 0 + false + 0 + $(pv_name) +$(pv_value) + 0 + + true + -48159ee9:1567f536160:-4dab + true + + false + ###### + 0.0 + + true + true + 20 + 1 + + true + true + false + + true + + 1 + + + + true + Text Update + false + false + 0 + + + + 64 + 70 + Text Update + 36 + + + + + + ISIS_Value_NEW + + + + 0 + false + 0 + $(pv_name) +$(pv_value) + 0 + + true + -3243ce99:1579a45dec4:-77aa + true + + false + ###### + 0.0 + + true + true + 20 + 1 + + true + true + false + + true + + 1 + + + + true + Text Update + false + false + 0 + + + + 64 + 70 + Text Update + 66 + + + + + + ISIS_Value_NEW + + + + 0 + false + 0 + $(pv_name) +$(pv_value) + 0 + + true + -3243ce99:1579a45dec4:-77a0 + true + + false + ###### + 0.0 + + true + true + 20 + 1 + + true + true + false + + true + + 1 + + + + true + Text Update + false + false + 0 + + + + 64 + 70 + Text Update + 96 + + + + + + ISIS_Value_NEW + + + + 0 + $(pv_name) +$(pv_value) + 0 + + + false + 0.0 + 0.0 + true + 20 + false + 1 + true + + 0 + + + + true + Text Input + + Text Input + + 3 + false + true + -3243ce99:1579a45dec4:-7796 + false + + false + + true + true + false + + 1 + false + 0 + false + + + + 64 + 140 + 66 + 1.7976931348623157E308 + + + + -1.7976931348623157E308 + + ISIS_Value_NEW + + + + 0 + $(pv_name) +$(pv_value) + 0 + + + false + 0.0 + 0.0 + true + 20 + false + 1 + true + + 0 + + + + true + Text Input + + Text Input + + 3 + false + true + -3243ce99:1579a45dec4:-7788 + false + + false + + true + true + false + + 1 + false + 0 + false + + + + 64 + 140 + 96 + 1.7976931348623157E308 + + + + -1.7976931348623157E308 + + ISIS_Value_NEW + + + + 0 + false + 1 + true + $(pv_name) +$(pv_value) + 0 + + true + -3243ce99:1579a45dec4:-777a + false + + + + + true + + 255 + 0.0 + + false + 90 + 1 + + true + true + true + + true + + + + + true + 0 + 20 + Polyline + false + + + + 1 + 216 + Polyline + 32 + 0.0 + + + + + + Default + + + + 0 + false + 0 + $(pv_name) +$(pv_value) + 0 + + true + -3243ce99:1579a45dec4:-7760 + true + + false + ###### + 0.0 + + true + true + 20 + 1 + + true + true + false + + true + + 1 + + + + true + Text Update + false + false + 0 + + + + 64 + 225 + Text Update + 36 + + + + + + ISIS_Value_NEW + + + + 0 + false + 0 + $(pv_name) +$(pv_value) + 0 + + true + -3243ce99:1579a45dec4:-775f + true + + false + ###### + 0.0 + + true + true + 20 + 1 + + true + true + false + + true + + 1 + + + + true + Text Update + false + false + 0 + + + + 64 + 225 + Text Update_1 + 66 + + + + + + ISIS_Value_NEW + + + + 0 + false + 0 + $(pv_name) +$(pv_value) + 0 + + true + -3243ce99:1579a45dec4:-775e + true + + false + ###### + 0.0 + + true + true + 20 + 1 + + true + true + false + + true + + 1 + + + + true + Text Update + false + false + 0 + + + + 64 + 225 + Text Update_2 + 96 + + + + + + ISIS_Value_NEW + + + + 0 + $(pv_name) +$(pv_value) + 0 + + + false + 0.0 + 0.0 + true + 20 + false + 1 + true + + 0 + + + + true + Text Input + + Text Input + + 3 + false + true + -3243ce99:1579a45dec4:-775d + false + + false + + true + true + false + + 1 + false + 0 + false + + + + 64 + 295 + 66 + 1.7976931348623157E308 + + + + -1.7976931348623157E308 + + ISIS_Value_NEW + + + + 0 + $(pv_name) +$(pv_value) + 0 + + + false + 0.0 + 0.0 + true + 20 + false + 1 + true + + 0 + + + + true + Text Input + + Text Input_1 + + 3 + false + true + -3243ce99:1579a45dec4:-775c + false + + false + + true + true + false + + 1 + false + 0 + false + + + + 64 + 295 + 96 + 1.7976931348623157E308 + + + + -1.7976931348623157E308 + + ISIS_Value_NEW + + + + 0 + false + 1 + true + $(pv_name) +$(pv_value) + 0 + + true + -3243ce99:1579a45dec4:-7752 + false + + + + + true + + 255 + 0.0 + + false + 90 + 1 + + true + true + true + + true + + + + + true + 0 + 20 + Polyline + false + + + + 1 + 371 + Polyline + 32 + 0.0 + + + + + + Default + + + + 0 + false + 0 + $(pv_name) +$(pv_value) + 0 + + true + -3243ce99:1579a45dec4:-7734 + true + + false + ###### + 0.0 + + true + true + 20 + 1 + + true + true + false + + true + + 1 + + + + true + Text Update + false + false + 0 + + + + 64 + 380 + Text Update + 36 + + + + + + ISIS_Value_NEW + + + + 0 + false + 0 + $(pv_name) +$(pv_value) + 0 + + true + -3243ce99:1579a45dec4:-7733 + true + + false + ###### + 0.0 + + true + true + 20 + 1 + + true + true + false + + true + + 1 + + + + true + Text Update + false + false + 0 + + + + 64 + 380 + Text Update_1 + 66 + + + + + + ISIS_Value_NEW + + + + 0 + false + 0 + $(pv_name) +$(pv_value) + 0 + + true + -3243ce99:1579a45dec4:-7732 + true + + false + ###### + 0.0 + + true + true + 20 + 1 + + true + true + false + + true + + 1 + + + + true + Text Update + false + false + 0 + + + + 64 + 380 + Text Update_2 + 96 + + + + + + ISIS_Value_NEW + + + + 0 + $(pv_name) +$(pv_value) + 0 + + + false + 0.0 + 0.0 + true + 20 + false + 1 + true + + 0 + + + + true + Text Input + + Text Input + + 3 + false + true + -3243ce99:1579a45dec4:-7731 + false + + false + + true + true + false + + 1 + false + 0 + false + + + + 64 + 450 + 66 + 1.7976931348623157E308 + + + + -1.7976931348623157E308 + + ISIS_Value_NEW + + + + 0 + $(pv_name) +$(pv_value) + 0 + + + false + 0.0 + 0.0 + true + 20 + false + 1 + true + + 0 + + + + true + Text Input + + Text Input_1 + + 3 + false + true + -3243ce99:1579a45dec4:-7730 + false + + false + + true + true + false + + 1 + false + 0 + false + + + + 64 + 450 + 96 + 1.7976931348623157E308 + + + + -1.7976931348623157E308 + + ISIS_Value_NEW + + + + 0 + false + 1 + true + $(pv_name) +$(pv_value) + 0 + + true + -3243ce99:1579a45dec4:-772f + false + + + + + true + + 255 + 0.0 + + false + 90 + 1 + + true + true + true + + true + + + + + true + 0 + 20 + Polyline + false + + + + 1 + 526 + Polyline + 32 + 0.0 + + + + + + Default + + + + 0 + false + 0 + $(pv_name) +$(pv_value) + 0 + + true + -3243ce99:1579a45dec4:-76f9 + true + + false + ###### + 0.0 + + true + true + 20 + 1 + + true + true + false + + true + + 1 + + + + true + Text Update + false + false + 0 + + + + 64 + 535 + Text Update + 36 + + + + + + ISIS_Value_NEW + + + + 0 + false + 0 + $(pv_name) +$(pv_value) + 0 + + true + -3243ce99:1579a45dec4:-76f8 + true + + false + ###### + 0.0 + + true + true + 20 + 1 + + true + true + false + + true + + 1 + + + + true + Text Update + false + false + 0 + + + + 64 + 535 + Text Update_1 + 66 + + + + + + ISIS_Value_NEW + + + + 0 + false + 0 + $(pv_name) +$(pv_value) + 0 + + true + -3243ce99:1579a45dec4:-76f7 + true + + false + ###### + 0.0 + + true + true + 20 + 1 + + true + true + false + + true + + 1 + + + + true + Text Update + false + false + 0 + + + + 64 + 535 + Text Update_2 + 96 + + + + + + ISIS_Value_NEW + + + + 0 + + 1 + + true + -3243ce99:1579a45dec4:-765b + false + false + X Axis + + 20 + 1 + + true + true + false + + true + 1 + + + + Label + true + + + + 55 + 100 + Label_9 + 6 + + + + + false + + ISIS_Label_NEW + + + + 0 + + 1 + + true + -3243ce99:1579a45dec4:-7649 + false + false + Y Axis + + 20 + 1 + + true + true + false + + true + 1 + + + + Label + true + + + + 55 + 255 + Label_9 + 6 + + + + + false + + ISIS_Label_NEW + + + + 0 + + 1 + + true + -3243ce99:1579a45dec4:-763b + false + false + Z Axis + + 20 + 1 + + true + true + false + + true + 1 + + + + Label + true + + + + 55 + 410 + Label_9 + 6 + + + + + false + + ISIS_Label_NEW + + + + 0 + + 1 + + true + -3243ce99:1579a45dec4:-762d + false + false + Units + + 20 + 1 + + true + true + false + + true + 1 + + + + Label + true + + + + 55 + 565 + Label_9 + 6 + + + + + false + + ISIS_Label_NEW + + + + 0 + false + $(pv_name) +$(pv_value) + + true + -3243ce99:1579a45dec4:-74bd + + + true + 27 + 1 + + true + false + false + + true + true + + + + + Combo + false + + + + 64 + 605 + Combo + 66 + + + + + + ISIS_Value_NEW + + + + 0 + false + $(pv_name) +$(pv_value) + + true + -3243ce99:1579a45dec4:-74af + + + true + 27 + 1 + + true + false + false + + true + true + + + + + Combo + false + + + + 64 + 605 + Combo + 92 + + + + + + ISIS_Value_NEW + + + + + + + 0 + + 1 + + true + 450885f3:157944e4d4b:-7014 + false + false + <-- Remember to add the $(NAME) macro in the Name property of the opi! +Also OPI background and foreground colours! + + 55 + 1 + + true + true + false + + true + 1 + + + + Label + true + + + + 259 + 474 + Label_3 + 54 + + + + + false + + Default + + + + 13 + + + true + 450885f3:157944e4d4b:-6a2b + false + false + + 97 + 1 + + true + true + false + + + true + + true + + + + Grouping Container + + + + 369 + 348 + Here We Have a Vertical Separator + 120 + + + + + true + + ISIS_GroupBox_NEW + + + 0 + + 2 + + true + -48159ee9:1567f536160:-58f4 + false + false + Value 2: + + 20 + 1 + + true + true + false + + true + 1 + + + + Label + true + + + + 55 + 6 + Label + 36 + + + + + false + + ISIS_Label_NEW + + + + 0 + false + 0 + $(pv_name) +$(pv_value) + 0 + + true + -48159ee9:1567f536160:-56af + true + + false + ###### + 0.0 + + true + true + 20 + 1 + + true + true + false + + true + + 1 + + + + true + Text Update + false + false + 0 + + + + 64 + 75 + Text Update + 36 + + + + + + ISIS_Value_NEW + + + + 0 + + 2 + + true + -48159ee9:1567f536160:-4dc3 + false + false + Value 1: + + 20 + 1 + + true + true + false + + true + 1 + + + + Label + true + + + + 55 + 6 + Label_2 + 6 + + + + + false + + ISIS_Label_NEW + + + + 0 + false + 0 + $(pv_name) +$(pv_value) + 0 + + true + -48159ee9:1567f536160:-4dab + true + + false + ###### + 0.0 + + true + true + 20 + 1 + + true + true + false + + true + + 1 + + + + true + Text Update + false + false + 0 + + + + 64 + 75 + Text Update + 6 + + + + + + ISIS_Value_NEW + + + + 0 + false + 1 + true + $(pv_name) +$(pv_value) + 0 + + true + -32b7f8d:156f9c2bdb9:-4db1 + false + + + + + true + + 255 + 0.0 + + false + 60 + 1 + + true + true + true + + true + + + + + true + 0 + 20 + Polyline + false + + + + 1 + 156 + Polyline + 6 + 0.0 + + + + + + Default + + + + 0 + + 2 + + true + -48159ee9:1567f536160:-56d7 + false + false + Value 3: + + 20 + 1 + + true + true + false + + true + 1 + + + + Label + true + + + + 55 + 180 + Label_1 + 6 + + + + + false + + ISIS_Label_NEW + + + + 0 + false + 0 + $(pv_name) +$(pv_value) + 0 + + true + -48159ee9:1567f536160:-5697 + true + + false + ###### + 0.0 + + true + true + 20 + 1 + + true + true + false + + true + + 1 + + + + true + Text Update + false + false + 0 + + + + 70 + 249 + Text Update_1 + 6 + + + + + + ISIS_Value_NEW + + + + + 13 + + + true + 450885f3:157944e4d4b:-6cb9 + false + false + + 97 + 1 + + true + true + false + + + true + + true + + + + Grouping Container + + + + 369 + 348 + Here We Have a Horizontal Separator, and Not Capitalized + 216 + + + + + true + + ISIS_GroupBox_NEW + + + 0 + + 2 + + true + -48159ee9:1567f536160:-58f4 + false + false + A: + + 20 + 1 + + true + true + false + + true + 1 + + + + Label + true + + + + 25 + 6 + Label + 6 + + + + + false + + ISIS_Label_NEW + + + + 0 + false + 0 + $(pv_name) +$(pv_value) + 0 + + true + -48159ee9:1567f536160:-58a7 + true + + false + ###### + 0.0 + + true + true + 20 + 1 + + true + true + false + + true + + 1 + + + + true + Text Update + false + false + 0 + + + + 60 + 45 + Text Update + 6 + + + + + + ISIS_Value_NEW + + + + 0 + + 2 + + true + -48159ee9:1567f536160:-57d0 + false + false + Output mode: + + 20 + 1 + + true + true + false + + true + 1 + + + + Label + true + + + + 85 + 6 + Label_4 + 46 + + + + + false + + ISIS_Label_NEW + + + + 0 + false + 0 + $(pv_name) +$(pv_value) + 0 + + true + -48159ee9:1567f536160:-57b8 + true + + false + ###### + 0.0 + + true + true + 20 + 1 + + true + true + false + + true + + 1 + + + + true + Text Update + false + false + 0 + + + + 97 + 101 + Text Update_3 + 46 + + + + + + ISIS_Value_NEW + + + + 0 + false + 1 + true + $(pv_name) +$(pv_value) + 0 + + true + -32b7f8d:156f9c2bdb9:-6455 + false + + + + + true + + 255 + 0.0 + + false + 1 + 1 + + true + true + true + + true + + + + + true + 0 + 20 + Polyline + false + + + + 337 + 0 + Polyline + 36 + 0.0 + + + + + + Default + + + + 0 + $(pv_name) +$(pv_value) + 0 + + + false + 0.0 + 0.0 + true + 20 + false + 1 + true + + 0 + + + + true + Text Input + + Text Input + + 3 + false + true + 19f6821:157d3270543:-7ce0 + false + + false + + true + true + false + + 1 + false + 0 + false + + + + 90 + 114 + 6 + 1.7976931348623157E308 + + + + -1.7976931348623157E308 + + ISIS_Value_NEW + + + + + false + 0 + false + $(pv_name) +$(pv_value) + 0 + + true + -30237fc9:157958fdf6d:-7b34 + + Settings... + + false + 28 + 1 + + true + true + false + + + true + + + + + Button + 109 + 608 + Button_1 + 604 + + + + + + ISIS_Button_NEW + + + + 0 + + 1 + + true + -30237fc9:157958fdf6d:-7b26 + false + false + Button opening another OPI has 3 dots: ... + + 32 + 1 + + true + true + false + + true + 1 + + + + Label + true + + + + 235 + 717 + Label_4 + 648 + + + + + false + + Default + + + + 0 + + 1 + + true + -30237fc9:157958fdf6d:-7b14 + false + false + Please make use of group boxes. +If something is REALLY for the entire device (e.g. a Settings button) and doesn't fit in any group box, it can be on its own. + + 73 + 1 + + true + true + false + + true + 1 + + + + Label + true + + + + 235 + 720 + Label_5 + 564 + + + + + false + + Default + + + + 0 + + 1 + + true + -30237fc9:157958fdf6d:-7a9c + false + false + When converting an existing OPI to this style, be aware of the tips and gotchas in the wiki! + + 73 + 1 + + true + true + false + + true + 1 + + + + Label + true + + + + 265 + 726 + Label_6 + 306 + + + + + false + + Header 3 + + + + 0 + + 1 + + true + -30237fc9:157958fdf6d:-7a7e + false + false + Here we're using a Y-spacing of 30 between labels. + + 32 + 1 + + true + true + false + + true + 1 + + + + Label + true + + + + 259 + 729 + Label_7 + 108 + + + + + false + + Default + + + + 13 + + + true + -4805f29c:1579922e8d6:-7f64 + false + false + + 193 + 1 + + true + true + false + + + true + + true + + + + Grouping Container + + + + 343 + 6 + This is a Group Box + 120 + + + + + true + + ISIS_GroupBox_NEW + + + 0 + + 2 + + true + -48159ee9:1567f536160:-5c7e + false + false + A setpoint value: + + 20 + 1 + + true + true + false + + true + 1 + + + + Label + true + + + + 96 + 6 + Label + 6 + + + + + false + + ISIS_Label_NEW + + + + 0 + + 2 + + true + -48159ee9:1567f536160:-5a91 + false + false + Green LED: + + 20 + 1 + + true + true + false + + true + 1 + + + + Label + true + + + + 96 + 6 + Label_2 + 36 + + + + + false + + ISIS_Label_NEW + + + + 0 + + 2 + + true + -48159ee9:1567f536160:-5a81 + false + false + Red LED: + + 20 + 1 + + true + true + false + + true + 1 + + + + Label + true + + + + 96 + 6 + Label_3 + 66 + + + + + false + + ISIS_Label_NEW + + + + 0 + + 2 + + true + -48159ee9:1567f536160:-5a71 + false + false + A read value: + + 20 + 1 + + true + true + false + + true + 1 + + + + Label + true + + + + 96 + 6 + Label_3 + 96 + + + + + false + + ISIS_Label_NEW + + + + 0 + false + 0 + $(pv_name) +$(pv_value) + 0 + + true + -48159ee9:1567f536160:-5a1b + true + + false + ###### + 0.0 + + true + true + 20 + 1 + + true + true + false + + true + + 1 + + + + true + Text Update + false + false + 0 + + + + 85 + 120 + Text Update + 6 + + + + + + ISIS_Value_NEW + + + + 0 + false + 0 + $(pv_name) +$(pv_value) + 0 + + true + -48159ee9:1567f536160:-5a0b + true + + false + ###### + 0.0 + + true + true + 20 + 1 + + true + true + false + + true + + 1 + + + + true + Text Update + false + false + 0 + + + + 85 + 120 + Text Update + 96 + + + + + + ISIS_Value_NEW + + + + 0 + $(pv_name) +$(pv_value) + 0 + + + false + 0.0 + 0.0 + true + 20 + false + 1 + true + + 0 + + + + true + Text Input + + Text Input + + 3 + false + true + -48159ee9:1567f536160:-5a01 + false + + false + + true + true + false + + 1 + false + 0 + false + + + + 90 + 216 + 6 + 1.7976931348623157E308 + + + + -1.7976931348623157E308 + + ISIS_Value_NEW + + + + 0 + false + $(pv_name) +$(pv_value) + + true + -1 + true + -48159ee9:1567f536160:-59c7 + + + + + + true + 25 + ON + 1 + + true + true + true + + true + + + + + LED + + + + false + + + + false + 25 + 120 + LED + 0 + 33 + + + + + false + + Default + + OFF + + + 0 + false + $(pv_name) +$(pv_value) + + true + -1 + true + -48159ee9:1567f536160:-59a9 + + + + + + true + 25 + ON + 1 + + true + true + true + + true + + + + + LED + + + + false + + + + false + 25 + 120 + LED + 0 + 63 + + + + + false + + Default + + OFF + + + false + 0 + false + $(pv_name) +$(pv_value) + 0 + + true + 3c70a182:156ea885a6f:-7276 + + On/Off + + false + 28 + 1 + + true + true + false + + + true + + + + + Button + 90 + 216 + Button + 31 + + + + + + ISIS_Button_NEW + + + + false + 0 + false + $(pv_name) +$(pv_value) + 0 + + true + -30237fc9:157958fdf6d:-7c14 + + Button + + false + 28 + 1 + + true + true + false + + + true + + + + + Button + 90 + 216 + Button_1 + 92 + + + + + + ISIS_Button_NEW + + + + 0 + + 2 + + true + 4c937f8b:15799b33729:-7fc5 + false + false + A combo box: + + 20 + 1 + + true + true + false + + true + 1 + + + + Label + true + + + + 96 + 6 + Label_8 + 126 + + + + + false + + ISIS_Label_NEW + + + + 0 + false + 0 + $(pv_name) +$(pv_value) + 0 + + true + 4c937f8b:15799b33729:-7fc4 + true + + false + ###### + 0.0 + + true + true + 20 + 1 + + true + true + false + + true + + 1 + + + + true + Text Update + false + false + 0 + + + + 85 + 120 + Text Update + 126 + + + + + + ISIS_Value_NEW + + + + 0 + false + $(pv_name) +$(pv_value) + + true + 4c937f8b:15799b33729:-7fc3 + + + true + 27 + 1 + + true + false + false + + true + true + + + + + Combo + false + + + + 90 + 216 + Combo + 122 + + + + + + ISIS_Value_NEW + + + + 0 + false + $(pv_name) +$(pv_value) + + true + 83b390e:1643bdd9bf9:-7f02 + + + + true + + + true + 28 + 1 + + true + true + false + + false + true + + + + + Choice Button + false + + + + 90 + 216 + ChoiceBtn + 62 + + + + + + A + B + + + ISIS_Button_NEW + + + + + 0 + + 1 + + true + -3243ce99:1579a45dec4:-7b64 + false + false + NOTE: labels are made using the Label widget, rather than the Text widget under Native. Text allows selection of the contents, with a flashing cursor, which may be confusing. + + 73 + 1 + + true + true + false + + true + 1 + + + + Label + true + + + + 259 + 729 + Label_8 + 139 + + + + + false + + Default + + + + 0 + + 1 + + true + -49a2eed4:1579e4efc70:-7f62 + false + false + <-- a possible tabular layout + + 23 + 1 + + true + true + false + + true + 1 + + + + Label + true + + + + 157 + 420 + Label_9 + 320 + + + + + false + + Default + + + + 0 + + 1 + + true + 19f6821:157d3270543:-7cf6 + false + false + <-- Could use the horizontal separator to break the alignment of labels if REALLY necessary + + 33 + 1 + + true + true + false + + true + 1 + + + + Label + true + + + + 265 + 702 + Label_11 + 258 + + + + + false + + Default + + + + 0 + + 1 + + true + 19f6821:157d3270543:-7cd3 + false + false + <-- Try to fit within these dashed lines - if necessary, overflow in the horizontal direction is better than in vertical, because the user can resize the OPI perspective horizontally but not vertically + + 85 + 1 + + true + true + false + + true + 1 + + + + Label + true + + + + 235 + 804 + Label_12 + 384 + + + + + false + + Default + + + + 0 + + 1 + + true + 1c973f6e:158fc9a86d0:-7d72 + false + false + <-- Words are capitalized in group box titles, but not standard exceptions like conjunctions + + 33 + 1 + + true + true + false + + true + 1 + + + + Label + true + + + + 265 + 716 + Label_13 + 216 + + + + + false + + Default + + + + 0 + + 1 + + true + -e6adf3b:15987cd5d31:-7d42 + false + false + Labels should be in sentence case, i.e. only the first letter should be capitalised + + 49 + 1 + + true + true + false + + true + 1 + + + + Label + true + + + + 235 + 804 + Label_14 + 474 + + + + + false + + Default + + + + 0 + + 0 + + + + true + + $(PV_ROOT):MANAGERMODE + + + true + 7f2c52c6:15c9c889162:-7daf + false + false + To control this device, enable manager mode! + + 37 + 1 + + true + true + false + + false + 1 + + + + Label + true + + + + 439 + 336 + Label_15 + 6 + + + + + false + + ISIS_Header2_NEW + + + + 0 + + 1 + + true + 7f2c52c6:15c9c889162:-7d9f + false + false + <-- This is only required for devices which have manager mode enabled on them. + + 55 + 1 + + true + true + false + + true + 1 + + + + Label + true + + + + 259 + 792 + Label_16 + 6 + + + + + false + + Default + + + \ No newline at end of file From 6f280410ee164155f6b8d689791978746cbbc8af Mon Sep 17 00:00:00 2001 From: Rory-Potter-Tessella Date: Tue, 28 Aug 2018 13:10:10 +0100 Subject: [PATCH 10/14] Readded Kicker OPI info to xml file --- .../resources/opi_info.xml | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml b/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml index 878f4d8c50..8b2ee0440b 100644 --- a/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml @@ -2517,11 +2517,33 @@ The trace shown by a TDS 3000 series oscilloscope - IP - The IP address of the oscilloscope. + SCOPE_IP + The IP address of the Kicker oscilloscope. + + + Kicker PSU + + + Power supplies + + POWER_SUPPLY + kicker.opi + The OPI for the KICKER power supply unit + + + KICKER + The KICKER PV prefix (e.g. KICKER_01). + + + SCOPE_IP + The IP address of the Kicker oscilloscope. + + + + From f197b179243cb482d91e8f9d0b8a50e6460f9e1c Mon Sep 17 00:00:00 2001 From: Rory-Potter-Tessella Date: Tue, 28 Aug 2018 13:11:36 +0100 Subject: [PATCH 11/14] Tidy up --- base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml b/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml index 8b2ee0440b..1c19f8df73 100644 --- a/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml @@ -2528,7 +2528,7 @@ Power supplies - + POWER_SUPPLY kicker.opi The OPI for the KICKER power supply unit @@ -2545,5 +2545,5 @@ - + From 798f873201c8deb2eb8f941ec6f5da893376a746 Mon Sep 17 00:00:00 2001 From: Rory-Potter-Tessella Date: Tue, 28 Aug 2018 13:12:21 +0100 Subject: [PATCH 12/14] More tidying up --- base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml b/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml index 1c19f8df73..78778b55b2 100644 --- a/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml @@ -2528,7 +2528,7 @@ Power supplies - + POWER_SUPPLY kicker.opi The OPI for the KICKER power supply unit From 58f943a796472c3adbbcfbfcbf1c54f4a3f3e59a Mon Sep 17 00:00:00 2001 From: Rory-Potter-Tessella Date: Thu, 6 Sep 2018 12:23:28 +0100 Subject: [PATCH 13/14] Fix build issue --- .../isis/ibex/devicescreens/components/ComponentType.java | 4 ++-- .../uk/ac/stfc/isis/ibex/ui/devicescreens/ComponentIcons.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/base/uk.ac.stfc.isis.ibex.devicescreens/src/uk/ac/stfc/isis/ibex/devicescreens/components/ComponentType.java b/base/uk.ac.stfc.isis.ibex.devicescreens/src/uk/ac/stfc/isis/ibex/devicescreens/components/ComponentType.java index abc5f3edd5..81d82bafa6 100644 --- a/base/uk.ac.stfc.isis.ibex.devicescreens/src/uk/ac/stfc/isis/ibex/devicescreens/components/ComponentType.java +++ b/base/uk.ac.stfc.isis.ibex.devicescreens/src/uk/ac/stfc/isis/ibex/devicescreens/components/ComponentType.java @@ -146,8 +146,8 @@ public enum ComponentType { KEYENCE, /** Generic Power Supply. */ POWER_SUPPLY, - /** Oscilloscope */ - OSCILLOSCOPE; + /** Oscilloscope. */ + OSCILLOSCOPE, /** Moxa ioLogik e1210 Remote I/O. */ MOXA_1210; diff --git a/base/uk.ac.stfc.isis.ibex.ui.devicescreens/src/uk/ac/stfc/isis/ibex/ui/devicescreens/ComponentIcons.java b/base/uk.ac.stfc.isis.ibex.ui.devicescreens/src/uk/ac/stfc/isis/ibex/ui/devicescreens/ComponentIcons.java index b98cc207dd..73c13f6d39 100644 --- a/base/uk.ac.stfc.isis.ibex.ui.devicescreens/src/uk/ac/stfc/isis/ibex/ui/devicescreens/ComponentIcons.java +++ b/base/uk.ac.stfc.isis.ibex.ui.devicescreens/src/uk/ac/stfc/isis/ibex/ui/devicescreens/ComponentIcons.java @@ -163,8 +163,8 @@ private static String getIconNameForType(ComponentType componentType) { return "keyence"; case OSCILLOSCOPE: return "oscilloscope"; - case MOXA_1210: - return "moxa_1210"; + case MOXA_1210: + return "moxa_1210"; default: return "cog"; } From 30bb65091f6cd55e9c94bcc3e9955825aa730796 Mon Sep 17 00:00:00 2001 From: Rory-Potter-Tessella Date: Thu, 6 Sep 2018 12:27:16 +0100 Subject: [PATCH 14/14] Fix label lissue --- base/uk.ac.stfc.isis.ibex.opis/resources/kicker.opi | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/kicker.opi b/base/uk.ac.stfc.isis.ibex.opis/resources/kicker.opi index 508ec0d1ab..6f6f601151 100644 --- a/base/uk.ac.stfc.isis.ibex.opis/resources/kicker.opi +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/kicker.opi @@ -184,8 +184,7 @@ false - Voltage: - + Voltage: false 1 @@ -516,7 +515,7 @@ $(pv_value) - 756 + 746 true @@ -533,7 +532,7 @@ $(pv_value) true Linking Container - 894 + 884 -3622cb5:1655c0e9d06:-7cd8 276 96