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

3824 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ferdi Franceschini
6183182c78 A sics_config.ini for Platypus with the new Knauer pump driver. 2014-10-13 14:16:27 +11:00
Ferdi Franceschini
c5dc9ca615 A generic sics_config.ini for Kookaburra. 2014-10-13 11:35:20 +11:00
Ferdi Franceschini
7b522c0a7b A sics_config.ini for Dingo. 2014-10-13 11:25:34 +11:00
Ferdi Franceschini
de7b1d40e7 Add CF4 configuration from ics1-taipan 2014-10-12 17:31:01 +11:00
Ferdi Franceschini
e396657851 Fix west 6100 driver name in Wombat sics_config.ini 2014-10-12 17:26:54 +11:00
Ferdi Franceschini
7d35f7e696 SICS-797: Bring GIT up to date with changes made on ics1-quokka 2014-10-09 14:21:10 +11:00
Ferdi Franceschini
2ebefc2b29 SICS-796: Bring GIT up to date with changes made on ics1-dingo. 2014-10-08 20:46:16 +11:00
Ferdi Franceschini
542be52d74 SICS-794: Bring GIT up to date with changes made on ics1-echidna. 2014-10-08 20:36:13 +11:00
Ferdi Franceschini
d8f5030a8d SICS-795 Bring GIT up to date with changes made on ics1-wombat. 2014-10-08 20:29:23 +11:00
Ferdi Franceschini
9720f1d0f0 SICS-788 Guard against integer division. 2014-10-08 19:59:22 +11:00
Ferdi Franceschini
3a475196a0 SICS-788: Some divisions in Tcl macros will be truncated if the values are integers. 
An integer division was caused here by the fix to SICS-785
 2014-10-08 19:56:59 +11:00
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
3ad3bf3524 Regen SCT drivers 2014-10-03 09:58:11 +10:00
Douglas Clowes
f86dc33081 Allow driving when simulated and add generated comments 2014-10-03 09:58:11 +10:00
Douglas Clowes
713e88d236 Allow conditional groups and vars in sct drivers 2014-10-03 09:58:11 +10:00
Douglas Clowes
29650b420c Regen sct drivers after refactoring 2014-10-03 09:58:11 +10:00
Douglas Clowes
814c8741c3 Refactor put_var processing for gen_sct 2014-10-03 09:58:11 +10:00
Douglas Clowes
6ebc085f68 Add %include facility to SCT template files 2014-10-03 09:58:11 +10:00
Douglas Clowes
214b5252a1 Add %include facility to SCT template files 2014-10-03 09:58:11 +10:00
Douglas Clowes
aa29f85d14 Revamp file reading and error messages 2014-10-03 09:58:11 +10:00
Douglas Clowes
334d9d0e0c Check function code for balanced parentheses, brackets, and braces 2014-10-03 09:58:11 +10:00
Douglas Clowes
94bd7f32eb Redo the error reporting 2014-10-03 09:58:11 +10:00
Douglas Clowes
75eddb7eea Add preamble and postamble code hooks 2014-10-03 09:58:11 +10:00
Douglas Clowes
cfe389838b Handle missing read_command 2014-10-03 09:58:11 +10:00
Douglas Clowes
850845415e Reduce some of the noise in the logfile 2014-10-03 09:58:11 +10:00
Douglas Clowes
6c0dfe4c4d Allow empty strings 2014-10-03 09:58:10 +10:00
Douglas Clowes
e4b88fd2ad Regen SCT drivers 2014-10-03 09:58:10 +10:00
Douglas Clowes
c6abb1fabd Slight change to the way we do PID in SCT files 2014-09-30 17:24:58 +10:00
Ferdi Franceschini
a9c0cf3df6 prun and pdrive macros now check arguments and allow driving non posit motors too. 2014-09-30 15:12:42 +10:00
Ferdi Franceschini
78372baae9 Fix posname algorithm so that it works if position lists are in descending order. 2014-09-30 15:12:42 +10:00
Ferdi Franceschini
06a5df0b27 Set upperlimits to 1800V on dhv1 and dhv2 for Bilby detector voltages. 2014-09-30 15:12:42 +10:00
Ferdi Franceschini
5bb2d6ca6f SICS-608: Implemented detector protection using anticollider using a voltage limit of 56 volts. 2014-09-30 15:12:41 +10:00
Douglas Clowes
ba72e77d4c Merge branch 'RELEASE-3_1' into RELEASE-3_2 
Conflicts:
	sics/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl
	sics/site_ansto/instrument/bilby/config/motors/shutters_sct.tcl
	sics/site_ansto/instrument/bilby/config/motors/tank_sct.tcl
	sics/site_ansto/instrument/bilby/util/sics_config.ini
	sics/site_ansto/instrument/config/environment/hiden_xcs_sct.tcl
	sics/site_ansto/instrument/config/environment/huber_pilot_sct.tcl
	sics/site_ansto/instrument/config/environment/isotech_ps_sct.tcl
	sics/site_ansto/instrument/config/environment/keithley_m2700_sct.tcl
	sics/site_ansto/instrument/config/environment/magneticField/oxford12tlv_sct.tcl
	sics/site_ansto/instrument/config/environment/magneticField/tsi_smc_sct.tcl
	sics/site_ansto/instrument/config/environment/nhq_200_sct.tcl
	sics/site_ansto/instrument/config/environment/omron_hldc_sct.tcl
	sics/site_ansto/instrument/config/environment/protekmm_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/eurotherm_m2000_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/julabo_lh45_gen_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/lakeshore_218_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/ls336_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/ls340_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/mercury_base_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/mercury_level_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/mercury_pres_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/mercury_scpi_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/mercury_temp_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/mercury_valve_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/nprvasm2_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/pfeiffer_hg_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/watlow_mpm_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/watlow_mrm_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/watlow_mst4_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/west_6100.sct
	sics/site_ansto/instrument/config/source/reactor_status_sct.tcl
	sics/site_ansto/instrument/hrpd/echidna_configuration.tcl
	sics/site_ansto/instrument/sans/quokka_configuration.tcl
	sics/site_ansto/instrument/tas/config/motors/motor_configuration.tcl
	sics/site_ansto/instrument/util/gen_sct.py
	sics/site_ansto/instrument/util/motor_utility.tcl
 2014-09-26 17:04:19 +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
9f8d01bebe SICS-785 Use scientific notation to return small floats in SICSvariables. 2014-09-19 14:53:06 +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
Ferdi Franceschini
85cbe1eb38 Use actual motor names when reporting a tasub setup error. 2014-09-19 12:16:29 +10:00