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

1892 Commits

Author SHA1 Message Date
Douglas Clowes
648c8003b7 Merge from Wombat, except sics_config.ini 
Conflicts:
	sics/site_ansto/instrument/config/environment/magneticField/sct_green_magnet.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_lakeshore_336.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
	sics/site_ansto/instrument/config/hmm/hmm_object.tcl
	sics/site_ansto/instrument/hipd/config/commands/eulerscan.tcl
	sics/site_ansto/instrument/hipd/config/motors/motor_configuration.tcl
	sics/site_ansto/instrument/hipd/util/sics_config.ini
	sics/site_ansto/instrument/server_config.tcl
 2014-06-25 13:35:28 +10:00
Douglas Clowes
3f8f5fcba7 Merge from Wombat hmm_object.tcl 2014-06-25 13:22:44 +10:00
Douglas Clowes
c5f7a7375e Merge from Wombat west400.tcl 2014-06-25 13:22:35 +10:00
Douglas Clowes
ccc47a4c57 Pull in Wombat changes to hvcommands.tcl 2014-06-25 13:20:20 +10:00
Douglas Clowes
95974df5e4 Pick up some obvious changes from Wombat 2014-06-24 17:32:34 +10:00
Douglas Clowes
e3377553bd Sort the *.ini files so we can better compare them 2014-06-24 17:22:46 +10:00
Douglas Clowes
e9191c1d62 Pull back Platypus Command changes 2014-06-24 12:36:53 +10:00
Douglas Clowes
3ea1f3bf5f Pull back Platypus detector config change 2014-06-24 12:33:59 +10:00
Douglas Clowes
126187473c Add ServerOption LoggerDir as the data directory 2014-06-24 12:28:14 +10:00
Douglas Clowes
ffef4e208f SCT driver for Lakeshore 218S Temperature Monitor 2014-06-23 17:40:10 +10:00
Douglas Clowes
9388b5941d Trivial changes to unit test 2014-06-23 12:48:46 +10:00
Douglas Clowes
6b18de0a03 Add huber asyncprotocol and make huber_ap and omron_ap to remove name conflicts 2014-06-23 12:48:46 +10:00
Ferdi Franceschini
6dba13a5ab Add CF1 to Wombat INI file and fix ordering of LS336 sections. 2014-06-23 10:29:20 +10:00
Ferdi Franceschini
0b293e5399 Use the new make_vmot command to make a virtual motor has the same klass as the real motor it is chained to. 2014-06-23 10:29:18 +10:00
Ferdi Franceschini
35c5ccbb19 Added command to make virtual motor which hdbchains to a real motor. 2014-06-23 10:29:17 +10:00
Douglas Clowes
84fa02a5a5 Add a fake Huber bath 2014-06-20 14:53:39 +10:00
Douglas Clowes
ff342dc16d Add unimplemented message to fake NHQ 2014-06-20 14:53:33 +10:00
Douglas Clowes
fc85619eac NHQ-2xx SCT driver and fake device 2014-06-20 12:25:46 +10:00
Ferdi Franceschini
713452aac6 Added sap ten position virtual motor for sample aperture. 2014-06-18 16:52:20 +10:00
Ferdi Franceschini
0711340da7 The biggest aperture has been setup as the zero position on the sample aperture. 
The changes have been sent to Dan for inclusion in the Bilby motion control spreadsheet.
 2014-06-18 16:01:19 +10:00
Ferdi Franceschini
e32e46b84e Added sap eleven position virtual motor to select apertures via sapmot. 2014-06-17 22:31:39 +10:00
Ferdi Franceschini
3bffbf720f Added sapmot sample aperture motor from new Bilby motion control spreadsheet. 2014-06-17 22:31:38 +10:00
Douglas Clowes
fa63ed8eed Dont create control alias unless there is a name to use 2014-06-17 17:25:17 +10:00
Douglas Clowes
bcb28e68c1 Add some more read-only fields to the huber 2014-06-17 17:17:41 +10:00
Douglas Clowes
171342c97e Make driver nodes mutable and regen 2014-06-17 15:45:03 +10:00
Douglas Clowes
6ce8d3d577 Tidy omron sct file, change id poll rate then regenerate 2014-06-17 14:53:48 +10:00
Douglas Clowes
ed7c371080 Add the huber bath Pilot ONE driver 2014-06-17 14:53:48 +10:00
Douglas Clowes
27ed29aea5 Allow SCT files to have numbers with a leading minus 2014-06-17 14:53:48 +10:00
Ferdi Franceschini
eadb336ef3 Simple hack to allow reading inputs on the fake Galil. 
This was done for the shutter.sct on Bilby.
 2014-06-17 12:30:54 +10:00
Ferdi Franceschini
79cedd58dc Fix return value for simulated t0_chopper_id. 
Also save value as an array, this is useful when testing the code.
 2014-06-17 12:30:54 +10:00
Ferdi Franceschini
e0edfb8d0a Implement the Ltof_<det> time of flight length calculations and the nguide selection command. 2014-06-17 12:30:53 +10:00
Ferdi Franceschini
2996889ea5 The timing chopper isn't necessarily the same as the master chopper. 2014-06-17 12:30:52 +10:00
Ferdi Franceschini
c00c317b69 Changed aperture rule to allow driving apertures up past 5 degrees. 
This was done to facilitate implementation of the nguide guide selection command.
Also fixed miscount of collimator sections.
 2014-06-17 12:30:52 +10:00
Ferdi Franceschini
e817fc9ed7 New aperture encoders and beamstops 4 and 5 added to Bilby. 2014-06-17 12:30:51 +10:00
Ferdi Franceschini
f9a8b2b005 Save the tank position as an array just to be consistent with the other motion axes. 2014-06-17 12:27:28 +10:00
Ferdi Franceschini
40afb4a829 Set klass attribute on vessel_y variable. 2014-06-17 07:23:00 +10:00
Douglas Clowes
fce610a142 Add a driver for the Omron ZS-HLDC Laser Displacement device 2014-06-16 17:37:20 +10:00
Douglas Clowes
fa3154bdcd Update non-templated drivers to log to ../log/ instead of /tmp/ 2014-06-16 10:42:17 +10:00
Douglas Clowes
1010003d6c Regenerate templated drivers to get changes to logging and simulation tests 2014-06-16 10:37:10 +10:00
Douglas Clowes
18d40f69d9 Make generated drivers log to "../log" instead of "/tmp" 2014-06-16 10:30:19 +10:00
Ferdi Franceschini
58f23cc91d Motor configuration updates from Bilby motion control spreadsheets. 2014-06-13 09:04:53 +10:00
Douglas Clowes
09c82c0644 Try separating Quokka and taipan tests 2014-06-11 15:45:40 +10:00
Douglas Clowes
2ff336f1ee Check for fake/simulated motors 2014-06-11 14:57:18 +10:00
Douglas Clowes
f4f29c2d84 Massage the test suite for non-taipan instruments 2014-06-11 14:54:54 +10:00
Douglas Clowes
3ae5310af9 Massage the mercury pressure card driver 2014-06-11 10:50:07 +10:00
Ferdi Franceschini
5df6300255 Updated detector carriage minimum separation after correcting curtaindet configuration. 
NOTE: The stepsperx and cntsperx were changed in the Bilby motion control spreadsheet after SICS was deployed.
 2014-06-10 19:57:54 +10:00
Ferdi Franceschini
df7ad295ed Enabled detector carriage anticollider rule. 2014-06-10 19:27:18 +10:00
Ferdi Franceschini
70e9ce99e4 Updated motor configuration from Bilby_motion_control_SICS.xls, 10-06-2014T16:45 2014-06-10 19:26:58 +10:00
Ferdi Franceschini
1baf4faa90 Add tank position and set vessel_y SICS variable for Ltof calculation. 2014-06-10 19:24:57 +10:00
Ferdi Franceschini
ea7f7b8b9d Generate posit_n parameters from posn attributes in the motor configuration CSV files. 2014-06-10 19:23:29 +10:00