linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,629 Commits 1 Branch 0 Tags
3b35308bf2a45c013e04fe652a44dda69439d202
Commit Graph

1898 Commits

Author SHA1 Message Date
Ferdi Franceschini
3b35308bf2 SICS-786 SICS locked up while counting on Taipan 
An in-situ hack that was done on Wombat was accidentally committed.
 2014-10-08 19:44:29 +11:00
Ferdi Franceschini
6ff638b36e SICS-793: Bring GIT up to date with changes made on ics1-taipan 2014-10-08 19:36:35 +11:00
Douglas Clowes
b0e4c3a85b Better checks and state machine for Knauer pump 2014-10-07 15:03:52 +11:00
Douglas Clowes
91b7c0b6eb Reasonably working Knauer pump driver 2014-10-07 15:03:48 +11:00
Douglas Clowes
5ba5af5db8 Reworking the Knauer 2014-10-07 15:03:43 +11:00
Douglas Clowes
a51ce71999 Major revision of the Knauer pump driver 2014-10-07 15:03:28 +11:00
Douglas Clowes
591c602da2 Regen SCT drivers 2014-10-03 10:17:46 +10:00
Douglas Clowes
c6abb1fabd Slight change to the way we do PID in SCT files 2014-09-30 17:24:58 +10:00
Douglas Clowes
5bedffc9c3 Strip the date and time from server_date_time in FILEMAP.TXT 2014-09-26 15:33:00 +10:00
Douglas Clowes
98b5a89225 There is no mkdriver_args 2014-09-26 15:30:25 +10:00
Douglas Clowes
cf77588861 Add some more checking and fix drive end bug 2014-09-22 13:48:49 +10:00
Ferdi Franceschini
cca9029270 Enable plc on Dingo 2014-09-19 12:17:38 +10:00
Ferdi Franceschini
84cc1d5b4c SICS-782 Configure autofocussing on Taipan. 2014-09-19 12:16:32 +10:00
Ferdi Franceschini
018ba90189 SICS-783 Load extra environment driver configurations for Echidna. 2014-09-19 12:16:31 +10:00
Ferdi Franceschini
cf386ec3ef SICS-781 lakeshore 370 driver does not save data. 2014-09-19 12:16:31 +10:00
Ferdi Franceschini
e31737379c SICS-780 Set attributes on environment control objects even if there are errors setting up other objects. 2014-09-19 12:16:30 +10:00
Ferdi Franceschini
0ba5045fd9 Update motor configuration from ics1-taipan. 
Also put off renaming s1 to ms1 for magnet config.  We need to make sure
that there is a sample/s1 link to sample/ms1 and use ms1 in tasub.
 2014-09-19 12:16:30 +10:00
Douglas Clowes
b3d8f1bdae Regenerate knauer_pump.sct 2014-09-19 12:08:13 +10:00
Douglas Clowes
522865f264 Restructure knauer_pump.sct 2014-09-19 12:07:51 +10:00
Douglas Clowes
1a15aa5de6 Generated Knauer driver 2014-09-18 17:07:30 +10:00
Douglas Clowes
12d4e7dce5 First pass driver for the Knauer BlueShadow Pump 40P 2014-09-18 17:07:00 +10:00
Douglas Clowes
2852cc9d79 Fix IP address of Pelican HV 2014-09-16 11:27:37 +10:00
Ferdi Franceschini
0606e66f90 Add new sics_config.ini for Taipan 
TODO SICS-779 Changing sample_stage to 12tmagnet_sample_insert doesn't work.
 2014-09-12 13:36:26 +10:00
Douglas Clowes
cc9d59ee73 SICS-777 Use SICS_INIT_LOGPATH to move script_validator logs in runsics.py 2014-09-12 10:42:00 +10:00
Douglas Clowes
e8ec81ad5d SICS-776 Close the anti-collider file 2014-09-12 10:40:56 +10:00
Douglas Clowes
00f4dfe588 Fix directories for quokka_configuration.tcl 2014-09-11 15:35:31 +10:00
Ferdi Franceschini
4a4f464485 Copied prun and pdrive from RELEASE-3_2 branch. 2014-09-11 14:29:24 +10:00
Ferdi Franceschini
863eef2378 SICS-753: Add named positions for kookaburra sample changer samz. 2014-09-11 14:29:24 +10:00
Ferdi Franceschini
48794002f6 Moved dOmega and gDQv on Kookaburra as requested by Christine. 
See email Subj RE:Slight Modification ..., Date 7/5/2014
 2014-09-11 14:29:23 +10:00
Douglas Clowes
6b6fd5131c Add vactex.tcl found on wombat (fixed) 2014-09-11 13:48:38 +10:00
Douglas Clowes
0cb3f4f91c Regenerated drivers 2014-09-11 13:29:52 +10:00
Douglas Clowes
65b50f3fcc Allow sct drivers to get device_class and simulation_group from ini file 2014-09-11 13:27:09 +10:00
Douglas Clowes
8b4bcc4c9e Pelican does not currently have a PLC interface 2014-09-10 17:03:00 +10:00
Ferdi Franceschini
1fa1595821 SICS-733 Added gumtree_version, gumtree_status and gumtree_time_estimate to /experiment. 
Only gumtree_version is saved to the hdf file.
 2014-09-10 16:00:26 +10:00
Douglas Clowes
d1920069ae Pullback motor changes on Taipan 2014-09-10 15:25:26 +10:00
Douglas Clowes
f4eb6c63d8 Pullback sics_config changes from Quokka 2014-09-10 15:15:53 +10:00
Douglas Clowes
5ce8677195 Pull back config changes from Wombat and add the west_6100 blue furnaces 2014-09-10 15:15:20 +10:00
Douglas Clowes
b0812e5fea Pullback Bilby sics_config.ini to new bilby/util directory 2014-09-10 14:57:07 +10:00
Douglas Clowes
377405d2a4 Pullback ls340_pelican and ls218 changes on Pelican 2014-09-10 14:39:00 +10:00
Douglas Clowes
a9a20b4855 Regenerate the ls218, nhq200 and sr630 drivers 2014-09-10 14:27:11 +10:00
Douglas Clowes
c6d2245941 Move ls218, nhq200, sr630 from environment to detector 2014-09-10 14:26:16 +10:00
Douglas Clowes
0867f5a315 Update "Decimal" processing for 4100/6100 2014-09-10 14:22:50 +10:00
Douglas Clowes
99fae91ff9 Add sics_simulation.tcl to each instrument MANIFEST.TXT file 2014-09-10 10:14:46 +10:00
Douglas Clowes
b127f49b33 Pullback change from Quokka 2014-09-09 2014-09-09 16:56:29 +10:00
Douglas Clowes
d0d2b38177 Kookaburra local changes 
Conflicts:
	sics/site_ansto/instrument/config/hmm/hmm_configuration_common_1.tcl
 2014-09-09 16:50:08 +10:00
Douglas Clowes
c608e5e641 Merge changes from Dingo 2014-09-09 2014-09-09 16:38:44 +10:00
Douglas Clowes
499c5c422d Break simulation flagss out of the server_config.tcl 
These are the most frequent instrument-specific changes
 2014-09-09 15:14:57 +10:00
Douglas Clowes
c8057a89aa Changes pulled back from Wombat 2014-09-09 2014-09-09 14:52:47 +10:00
Douglas Clowes
6738a0844d Add the Robots (Robbie and Rosie) for Echidna 2014-09-08 15:56:20 +10:00
Douglas Clowes
ab6a70ad97 Add an external sics_simulation file for Echidna 2014-09-08 15:54:29 +10:00