Commit Graph

3899 Commits

Author SHA1 Message Date
Douglas Clowes
fcb47cea5a Alternative Oxford Magnet Labview interface 2015-02-13 10:56:42 +11:00
Ferdi Franceschini
59309cec60 SICS-847: Replace t0_chopper_id with master_chopper_id in Lt0 calculation.
Also added some extra chopper status variables.
2015-02-06 14:36:39 +11:00
Ferdi Franceschini
e45edb3913 selrs now reports status of shutters when called without arguments. 2015-02-06 14:31:19 +11:00
Ferdi Franceschini
f1eb273db6 Allow selecting histogram memory server as source of beam monitor counts. 2015-02-06 08:48:11 +11:00
Ferdi Franceschini
ae06a182c6 Add Oxford magnet configuration to Bilby. 2015-02-06 08:48:09 +11:00
Ferdi Franceschini
4c3b3f71e5 Fix reference to chopper sim_mode variable. 2015-02-06 08:48:08 +11:00
Ferdi Franceschini
79fb7292bc Fix some duplicate definitions. 2015-02-06 08:48:07 +11:00
Ferdi Franceschini
2a739e2f09 Remove some configuration code that was copied from Quokka. 2015-02-06 08:48:06 +11:00
Ferdi Franceschini
fae83b3d9e Only set the posit_count parameter on motors that need to drive to discrete positions. 2015-02-06 08:48:05 +11:00
Ferdi Franceschini
e8601615e6 Add an OUT position to apertures. Copy bug fixes and improvements from ics1-bilby.
Also provide a motor object to read the second encoder on the velocity selector
translation stage for diagnostic purposes.
2015-02-06 08:48:03 +11:00
Ferdi Franceschini
ec1d83f77d Text nodes can't be mutable. 2015-02-06 08:48:02 +11:00
Ferdi Franceschini
6b1a192af6 Fix updating parameters when a value changes. 2015-02-06 08:48:01 +11:00
Ferdi Franceschini
56d63ebc30 SICS-842: Added 'enable' and 'disable' device control commands. 2015-02-06 08:48:00 +11:00
Ferdi Franceschini
06f1f2f62a SICS-841: import new selrs command. 2015-02-06 08:47:59 +11:00
Ferdi Franceschini
0c6168a526 SICS-840: Added selrs to select roughing slits and guarantee that a slit is always selected.
Also disabled driving slits via hset on GumTree.
2015-02-06 08:47:58 +11:00
Ferdi Franceschini
9c3a0931ce SICS-841: You can now use set_oneshot to remove a callback. 2015-02-06 08:47:57 +11:00
Ferdi Franceschini
f2590461b5 Make sure oneshot_state = 1 while a callback is waiting for an event. 2015-02-06 08:47:56 +11:00
Ferdi Franceschini
9d0780047c SICS-843: Add Galil I/O arrays @IN and @OUT with SB and CB commands.
Added extra (non galil) IB command to set entries in @IN.
2015-02-06 08:47:55 +11:00
Douglas Clowes
fa885cb705 SICS-819 Fix SICS crash in logsetup
Directory creation involving path creation failed because the path has
a trailing slash. After creating the directory of the full path, SICS
tried to create the path again with the trailing slash - it failed.

When logger creation failed, SICS registered the callback with NULL. This
was dereferenced in the hipadaba callback.

Suppress trailing slashes in directory path creation. Do not register
the callback if the creation failed.
2015-01-23 09:18:14 +11:00
Douglas Clowes
7f066d75d7 Remove RELEASE-3_1 artifacts 2015-01-22 13:19:05 +11:00
Douglas Clowes
e317e4b341 Change names from sct_*.tcl to *_sct.tcl in config/deploy files 2015-01-22 13:16:09 +11:00
Douglas Clowes
89d609524d Merge branch 'RELEASE-3_1' into RELEASE-3_2 2015-01-21 09:23:56 +11:00
Douglas Clowes
c91d8b67af Handle nested GROUP and VAR constructs in gen_sct.py 2015-01-21 09:22:40 +11:00
Ferdi Franceschini
3be586f6bf SICS-841: Add a oneshot callback facility for scriptcontext drivers. 2015-01-14 13:01:27 +11:00
Douglas Clowes
18456d2af8 Remove trailing spaces and blank lines from sct_bm.tcl 2015-01-08 11:41:09 +11:00
Douglas Clowes
1851154b6b Remove sct_epson_pandp.tcl artifact from RELEASE-3_1 2015-01-07 14:14:18 +11:00
Douglas Clowes
34b16fafe7 Remove sct_srs_sr630 and sct_west_6100 artifacts from RELEASE-3_1 2015-01-07 14:12:39 +11:00
Douglas Clowes
f4314fc215 Remove sct_eurotherm_3200.tcl artifact from RELEASE-3_1 2015-01-07 14:10:21 +11:00
Douglas Clowes
cf1385d3f9 Remove sct_mvp_valve.tcl artifact from RELEASE-3_1 2015-01-07 14:06:59 +11:00
Douglas Clowes
9e76c7d60d Remove sct_keysight_N8740A.tcl artifact from RELEASE-3_1 2015-01-07 14:04:35 +11:00
Douglas Clowes
d85d6127fe Remove sct_he3_polanal.tcl artifact from RELEASE-3_1 2015-01-07 14:00:20 +11:00
Douglas Clowes
c3bb4a9591 Merge branch 'RELEASE-3_1' into RELEASE-3_2
Conflicts:
	sics/site_ansto/instrument/config/beamline/sct_he3_polanal.tcl
	sics/site_ansto/instrument/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/hrpd/echidna_configuration.tcl
	sics/site_ansto/instrument/pelican/pelican_configuration.tcl
2015-01-07 13:09:27 +11:00
Jing Chen
9c38845b84 SIS IO Box Beam monitor driver. 2015-01-07 13:01:21 +11:00
Douglas Clowes
2b73a7eaca Remove extra include (<rs232controller.h>) 2015-01-07 11:05:58 +11:00
Douglas Clowes
679838eac3 Port new Aerolas Doppler driver from RELEASE-3_1 2015-01-07 10:29:07 +11:00
Douglas Clowes
76d7191754 SICS-839 Change TCL var from nominal_outp_current to NominalOutpCurrent 2015-01-07 10:20:40 +11:00
Douglas Clowes
0afb08a7a3 Adjustments to mtth/vwi/vei for Pelican
Reverse sign on mom[abc] in set_vwi proc
Add hdbchain for vwi for mtth
Add sicslist setatt ... for vei as for vwi
2014-12-15 15:33:05 +11:00
Douglas Clowes
2d4c725d10 Regen keysight 2014-12-12 15:24:50 +11:00
Douglas Clowes
f09cf4d080 move keysight from environment to instrument class 2014-12-12 15:24:25 +11:00
Douglas Clowes
159184cb30 Regen SCT driver for Keysight PS 2014-12-12 14:28:48 +11:00
Douglas Clowes
b81b226fe8 Allow output voltage to be ramped on Keysight PS 2014-12-12 14:27:40 +11:00
Douglas Clowes
c61cb22270 Handle bigger modbus messages 2014-12-12 14:25:36 +11:00
Douglas Clowes
ff03b1108b Regen the omron SCT driver 2014-12-08 16:27:03 +11:00
Douglas Clowes
bdc11e914f Change the protocol to omron_ap for the omron driver 2014-12-08 16:26:03 +11:00
Douglas Clowes
33fbe4ed01 Regen the doppler SCT driver 2014-12-08 16:24:44 +11:00
Douglas Clowes
82f81b4b02 Change the byte order and start addresses for the doppler modbus driver 2014-12-08 16:24:30 +11:00
Douglas Clowes
06a0ebad19 Regen SCT driver 2014-12-03 12:12:28 +11:00
Douglas Clowes
f28115552a Add additional doppler modbus registers 2014-12-03 12:12:17 +11:00
Douglas Clowes
99671f2aa5 New driver for AeroLas Doppler drive for Emu 2014-12-02 16:16:36 +11:00
Douglas Clowes
8ff7368f34 develop keysight_N8740A.sct 2014-12-02 13:25:03 +11:00