4195 Commits

Author SHA1 Message Date
b35c470c79 Remove debug_threshold from debugging test 2014-11-13 14:39:26 +11:00
a053c02868 Regenerate SCT drivers 2014-11-13 14:21:42 +11:00
ee4cd27f0e Regenerate SCT drivers 2014-11-13 14:20:52 +11:00
8f977bb98f Realign SCT drivers with R3.2 2014-11-13 14:18:45 +11:00
c443411764 Realign SCT drivers with R3.2 2014-11-13 14:14:04 +11:00
8a7ff5d63c Make 3He fields numeric and align with R 3.1 2014-11-13 14:10:20 +11:00
f076b537ed Regenerate SCT drivers 2014-11-13 13:53:04 +11:00
30c23b1e0a Merge branch 'RELEASE-3_1'
Conflicts:
	sics/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl
	sics/site_ansto/instrument/config/beamline/sct_he3_polanal.tcl
	sics/site_ansto/instrument/config/environment/isotech_ps.sct
	sics/site_ansto/instrument/config/environment/isotech_ps_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/julabo_lh45.sct
	sics/site_ansto/instrument/config/environment/temperature/julabo_lh45_gen_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/ls340_sct.tcl
	sics/site_ansto/instrument/util/gen_sct.py
2014-11-13 13:52:46 +11:00
a5116f03e4 Add json-c to json in VERBOSE library search test 2014-11-13 13:44:30 +11:00
86d4732b06 Regenerate SCT drivers 2014-11-13 13:43:51 +11:00
2ee490b5ce Bug! missing ' else {' in gen_sct 2014-11-13 13:42:10 +11:00
5fefe5f009 Regenerate SCT drivers 2014-11-13 12:41:22 +11:00
8dea026181 Change log_file_name to add _date for sct driver logfiles 2014-11-13 12:40:33 +11:00
674fae9115 Regenerate SCT drivers 2014-11-13 12:40:18 +11:00
38dff05881 Regenerate SCT drivers 2014-11-13 12:38:03 +11:00
0ae1d966c3 Change log_file_name to add _date for sct driver logfiles 2014-11-13 12:36:19 +11:00
3450b4cbf9 Regenerate SCT drivers 2014-11-13 12:35:46 +11:00
23bd45061b Copy changes made to ics1-echidna since R31C20 deployment. 2014-11-12 17:24:23 +11:00
fe0bc8f0c0 Regen two sct drivers 2014-11-10 18:58:42 +11:00
a42030ff41 Bug! missing ' else {' in gen_sct 2014-11-10 18:58:29 +11:00
14237f734b Change limites on e3200 setpoint 2014-11-10 18:57:46 +11:00
305e903d01 3He chnage to float and timestamp in seconds 2014-11-10 18:57:22 +11:00
8ad80f6fee SICS-785 Make sure that TCL does a floating point calc if a SICSvar float is used in a calculation. 2014-11-07 09:44:37 +11:00
95ffc5673a Fixed typo in the runsics script which prevents a 'kill -15' from executing. 2014-11-07 09:44:36 +11:00
144f6ece2b SICS-820 Prevent m2om from being driven into sample holder. 2014-11-07 09:44:36 +11:00
a375c6ce20 SICS-821: You can now use the "whenall" keyword to forbid a move based on the positions of a set of motors. 2014-11-07 09:44:35 +11:00
4dbaa0f73d SICS-723 Provide a detector/reset_trip node to notify GumTree and allow reset. 2014-11-07 09:44:34 +11:00
22d81d4195 Add ls370 to Wombat sics_config.ini 2014-11-07 09:44:34 +11:00
4b9ed0bf7f Merge changes from RELEASE-3_1 in gen_sct.py
Now the only difference is sct defauly of before/after
2014-11-07 09:41:43 +11:00
b28af1d086 Update the gitignore file for .sw? and .orig files 2014-11-07 09:35:16 +11:00
9909c1412e Regenerate all the SCT drivers with new generator 2014-11-07 09:14:09 +11:00
6c6292bbb2 Change nodenames to lowercase and add a 'stash' function in he3_polanal 2014-11-07 09:10:17 +11:00
67b6c5c7ee regen sct_he3_polanal.tcl 2014-11-06 18:17:25 +11:00
3602f56352 Rework the he3_polanal.sct driver 2014-11-06 18:17:02 +11:00
c488733bcd Set default sct=before, add ${name} to mkDriver call 2014-11-06 18:16:02 +11:00
6bed30d5d4 Reduce spurious differences in generated code 2014-11-06 16:37:46 +11:00
f1595151cd Changes to protocol_args to add defaults 2014-11-06 16:27:15 +11:00
ad29e66160 Import of changes in 3.2 2014-11-06 16:18:43 +11:00
00574586ea Import of changes in 3.2 2014-11-06 16:14:51 +11:00
a9932f8ae8 Slight change to the way we do PID in SCT files 2014-11-06 16:09:44 +11:00
741d12d57a Driver generated in RELEASE-3_2 with --sct=before 2014-11-06 15:42:00 +11:00
58ca10883f Refactor the output filename handling and sct position in the name
add --sct options for before (sct_*.tcl) or after (*_sct.tcl) the driver name
2014-11-06 15:40:40 +11:00
90d4fc6870 Update the gitignore file for .sw? and .orig files 2014-11-06 14:43:53 +11:00
42db9431f2 Add newer generated drivers from merge 2014-11-06 14:43:18 +11:00
3ce5ae0977 Merge branch 'RELEASE-3_1'
Conflicts:
	sics/site_ansto/instrument/config/environment/hiden_xcs_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_lakeshore_m370.tcl
	sics/site_ansto/instrument/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/kookaburra/kookaburra_configuration.tcl
	sics/site_ansto/instrument/pelican/pelican_configuration.tcl
	sics/site_ansto/instrument/reflectometer/platypus_configuration.tcl
	sics/site_ansto/instrument/util/gen_sct.py
2014-11-06 14:13:20 +11:00
2076c0a5fc New generated SCT drivers for knauer, sr630 and epson robot wrapper 2014-11-06 13:40:06 +11:00
0b2f3d520b Regen SCT drivers 2014-11-06 13:36:47 +11:00
ce324826dd Update protocol_args to new format and terminator for ls340 2014-11-06 13:00:07 +11:00
47c92518a9 Make protocol_args like {add,make}_args and add nosctcontroller in read_config 2014-11-06 12:54:21 +11:00
aa9942b2b6 calling makesctcontroller and mkDriver from read_config 2014-11-06 12:53:06 +11:00