linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,148 Commits 1 Branch 0 Tags
5f2abbb99a74bbeeba4e0c850afdc46f00a491a7
Commit Graph
4148 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Douglas Clowes 1bb7f90237 Merge branch 'Pelican' into temp 
Conflicts:
	sics/site_ansto/instrument/config/environment/temperature/sct_lakeshore_218.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
 2015-02-19 14:53:33 +11:00
Douglas Clowes 106d61a883 Merge branch 'Taipan_R31' into temp 
Conflicts:
	sics/site_ansto/instrument/config/environment/temperature/sct_lakeshore_m370.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_west_6100.tcl
	sics/site_ansto/instrument/tas/config/motors/motor_configuration.tcl
	sics/site_ansto/instrument/tas/taipan_configuration.tcl
	sics/site_ansto/instrument/tas/util/sics_config.ini
 2015-02-19 14:50:39 +11:00
Douglas Clowes 14be249401 Pullback from Wombat 2015-02-19 2015-02-19 11:51:51 +11:00
Douglas Clowes 31420ab850 Pullback from Echidna 2015-02-19 2015-02-19 11:43:50 +11:00
Douglas Clowes da2383f5ce Pullback from Platypus 2015-02-19 2015-02-19 11:30:48 +11:00
Douglas Clowes 40d2a1e2f4 Pullback from Pelican 2015-02-19 2015-02-19 11:24:44 +11:00
Douglas Clowes 2dcf274618 Tilt configuration from Taipan 2015-02-19 2015-02-19 10:35:21 +11:00
Douglas Clowes 666a70cb96 Dubious diffs from Taipan 2015-02-19 2015-02-19 10:34:31 +11:00
Douglas Clowes fbdd46e258 Pullback from Taipan 2015-02-19 2015-02-19 10:34:12 +11:00
Douglas Clowes a5498a2a77 Pull some changes from RELEASE-3_1 in gen_sct and *.sct 2015-02-19 09:48:38 +11:00
Douglas Clowes 8c4eed9bfe Merged changes from Quokka as at 2015-02-18 2015-02-19 09:40:49 +11:00
Douglas Clowes 287b671569 Regenerate for limit changes 2015-02-19 09:14:23 +11:00
Douglas Clowes 45d4663816 Pullback limit adjustments from Quokka to sct template drivers 2015-02-19 09:04:43 +11:00
Douglas Clowes bf8be461ee Add in from Quokka 2015-02-18 14:46:54 +11:00
Douglas Clowes 4619a57eff Pullback from Quokka 2015-02-18 2015-02-18 14:14:11 +11:00
Douglas Clowes 648c7bf1dd Update Quokka configuration file 2015-02-18 12:36:11 +11:00
Douglas Clowes f0bc6f0693 Backport the build command from RELEASE-3_2 2015-02-18 11:54:08 +11:00
Douglas Clowes cad4f64dcc Regenerate the 3He driver for the coils 2015-02-16 12:38:43 +11:00
Douglas Clowes f80bec1403 Changes to get and set the field coil values 2015-02-16 12:38:02 +11:00
Douglas Clowes 22bb612296 Fake device for Oxford LabView testing 2015-02-16 12:36:12 +11:00
Douglas Clowes a924b657e0 Generate the TCL from the new Oxford 2015-02-13 10:58:50 +11:00
Douglas Clowes 3486b75d47 Generate the TCL from the new Oxford 2015-02-13 10:57:58 +11:00
Douglas Clowes 2993a04485 Alternative Oxford Magnet Labview interface 2015-02-13 10:56:50 +11:00
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
koennecke fb19bf9bf6 Harmonized status text codes between second generation objects and sctdriveadpater, sctdriveobj 2015-02-04 14:35:21 +01:00
Douglas Clowes be0d932a21 SICS-846 Off by one error in argc check sct_asyncqueue.c 2015-01-23 17:13:50 +11:00
Douglas Clowes b88580a571 SICS-151 Remove extraconfig.tcl from remaining MANIFEST.TXT files 
We don't want these files deployed anyway
since they get updated on the instrument.
 2015-01-23 12:28:53 +11:00
Douglas Clowes 86e1f7b7cf 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 10:09:12 +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