linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,068 Commits 1 Branch 0 Tags
f82d6a83b08125d1acf522d97cfc63fe1b36e19b
Commit Graph

4068 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Douglas Clowes
0aa292bc96 develop keysight_N8740A.sct 2014-12-02 13:24:51 +11:00
Douglas Clowes
5f2223510f Regenerate SCT drivers 2014-12-02 10:09:17 +11:00
Ferdi Franceschini
e64b7bf409 Instructed bruker_BEC1 wrapper to not make a script context controller. 2014-12-01 14:32:54 +11:00
Douglas Clowes
7adec62e61 Driver for Agilent/Keysight N8740A Power Supply 2014-12-01 12:59:49 +11:00
Douglas Clowes
34f748e426 Set the driver name and the ip_address/tcp_port for nosctcontroller 2014-11-27 15:15:13 +11:00
Douglas Clowes
99f23cda50 Regen the Oxford Mercury SCT driver 2014-11-24 12:45:12 +11:00
Douglas Clowes
f5994bb760 Add auto/manual switch and setting, change to all lowercase 2014-11-24 12:44:29 +11:00
Douglas Clowes
de766e465e Regen of Mercury driver 2014-11-20 17:37:58 +11:00
Douglas Clowes
7960bab345 Changes to Mercury driver 2014-11-20 17:37:34 +11:00
Douglas Clowes
51026a09af Pull various config files closer into alignment 2014-11-20 16:06:32 +11:00
Douglas Clowes
f629ea24ed Pull various config files closer into alignment 2014-11-20 15:56:30 +11:00
Douglas Clowes
892ca1cdc5 Merge branch 'RELEASE-3_1' 2014-11-20 15:11:56 +11:00
Douglas Clowes
e04f107bc9 Add new SCT driver for Oxford Mercury 2014-11-20 14:52:13 +11:00
Douglas Clowes
1469a60b5d Regen SCT driver with new spacing 2014-11-20 14:51:54 +11:00
Douglas Clowes
11b68fb957 New driver for the Oxford Mercury (using conditional and exec) 2014-11-20 14:50:44 +11:00
Douglas Clowes
9b178f3014 Add a new (configurable) fake Oxford Mercury 2014-11-20 14:49:54 +11:00
Douglas Clowes
d4de7d4ea1 Pretty-up the spacing around the conditional code in gen_sct.py 2014-11-20 14:49:46 +11:00
Douglas Clowes
7269314220 Regenerate SCT drivers (new spacing, new Oxford Mercury) 2014-11-20 14:48:00 +11:00
Douglas Clowes
a7e6017fd5 New driver for the Oxford Mercury (using conditional and exec) 2014-11-20 14:46:24 +11:00
Douglas Clowes
01c0bf1f3c Add a new (configurable) fake Oxford Mercury 2014-11-20 14:44:43 +11:00
Douglas Clowes
c838e4ffe2 Pretty-up the spacing around the conditional code in gen_sct.py 2014-11-20 14:42:50 +11:00
Koennecke Mark
f274f3bcdb - Fixed a sget bug which caused text wrongly to be identified as numbers 
- Fixed a sput bug: SetHipadabaPar versus UpdateHipadabaPar
- Modified hdelcb to be able to remove callbacks from SICS objects
 2014-11-18 09:24:27 +01:00
Douglas Clowes
225c4c5ee7 Regenerate SCT drivers 2014-11-13 14:54:36 +11:00
Douglas Clowes
89b23eda07 Make the Lakeshore 218 driver less noisy and have less channels 2014-11-13 14:54:25 +11:00
Douglas Clowes
b84efe47cf Regenerate SCT drivers 2014-11-13 14:53:48 +11:00
Douglas Clowes
b35c470c79 Remove debug_threshold from debugging test 2014-11-13 14:39:26 +11:00
Douglas Clowes
a053c02868 Regenerate SCT drivers 2014-11-13 14:21:42 +11:00
Douglas Clowes
ee4cd27f0e Regenerate SCT drivers 2014-11-13 14:20:52 +11:00
Douglas Clowes
8f977bb98f Realign SCT drivers with R3.2 2014-11-13 14:18:45 +11:00
Douglas Clowes
c443411764 Realign SCT drivers with R3.2 2014-11-13 14:14:04 +11:00
Douglas Clowes
8a7ff5d63c Make 3He fields numeric and align with R 3.1 2014-11-13 14:10:20 +11:00
Douglas Clowes
f076b537ed Regenerate SCT drivers 2014-11-13 13:53:04 +11:00
Douglas Clowes
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
Douglas Clowes
a5116f03e4 Add json-c to json in VERBOSE library search test 2014-11-13 13:44:30 +11:00
Douglas Clowes
86d4732b06 Regenerate SCT drivers 2014-11-13 13:43:51 +11:00
Douglas Clowes
2ee490b5ce Bug! missing ' else {' in gen_sct 2014-11-13 13:42:10 +11:00
Douglas Clowes
5fefe5f009 Regenerate SCT drivers 2014-11-13 12:41:22 +11:00
Douglas Clowes
8dea026181 Change log_file_name to add _date for sct driver logfiles 2014-11-13 12:40:33 +11:00
Douglas Clowes
674fae9115 Regenerate SCT drivers 2014-11-13 12:40:18 +11:00
Douglas Clowes
38dff05881 Regenerate SCT drivers 2014-11-13 12:38:03 +11:00
Douglas Clowes
0ae1d966c3 Change log_file_name to add _date for sct driver logfiles 2014-11-13 12:36:19 +11:00
Douglas Clowes
3450b4cbf9 Regenerate SCT drivers 2014-11-13 12:35:46 +11:00
Ferdi Franceschini
23bd45061b Copy changes made to ics1-echidna since R31C20 deployment. 2014-11-12 17:24:23 +11:00
Douglas Clowes
fe0bc8f0c0 Regen two sct drivers 2014-11-10 18:58:42 +11:00
Douglas Clowes
a42030ff41 Bug! missing ' else {' in gen_sct 2014-11-10 18:58:29 +11:00
Douglas Clowes
14237f734b Change limites on e3200 setpoint 2014-11-10 18:57:46 +11:00
Douglas Clowes
305e903d01 3He chnage to float and timestamp in seconds 2014-11-10 18:57:22 +11:00
Ferdi Franceschini
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
Ferdi Franceschini
95ffc5673a Fixed typo in the runsics script which prevents a 'kill -15' from executing. 2014-11-07 09:44:36 +11:00
Ferdi Franceschini
144f6ece2b SICS-820 Prevent m2om from being driven into sample holder. 2014-11-07 09:44:36 +11:00