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

29 Commits

Author SHA1 Message Date
Douglas Clowes
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
Ferdi Franceschini
2ebefc2b29 SICS-796: Bring GIT up to date with changes made on ics1-dingo. 2014-10-08 20:46:16 +11: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
c608e5e641 Merge changes from Dingo 2014-09-09 2014-09-09 16:38:44 +10:00
Douglas Clowes
507ddafb2a 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/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/pelican/pelican_configuration.tcl
 2014-08-06 13:53:18 +10:00
Ferdi Franceschini
7b6b11eef2 Let everyone have a magnet sample stick motor. 2014-08-06 10:08:12 +10:00
Ferdi Franceschini
8a6da09326 Deploy all environment control drivers. 2014-08-06 10:08:10 +10:00
Ferdi Franceschini
94beedd885 We need dingo.hdd for the scan command. NOTE SICS crashes without it, see SICS-763 2014-08-01 11:35:09 +10:00
Ferdi Franceschini
e16e192d01 Use the camera driver auxiliary command cm1_cmd to set motor position meta data. 2014-07-31 15:48:30 +10:00
Ferdi Franceschini
9b965e6313 Minimal scan.tcl and dingo_configuration.tcl 
FIX: The scan fails to update the motor positions in the camera server meta data.
 2014-07-28 10:10:18 +10:00
Douglas Clowes
972e3232cd Change the names in all of the files 2014-07-23 17:30:44 +10:00
Douglas Clowes
f05bf2e7db Change Dingo stth for multi-turn rotary encoder 2014-07-09 15:02:24 +10:00
Douglas Clowes
f6dfc76ada Pull back changes from Dingo 2014-07-09 15:01:21 +10:00
Douglas Clowes
92d3acb5d5 Remove superfluous trailing white space from TCL files 2014-05-16 17:23:58 +10:00
Ferdi Franceschini
0ae4d40470 Deploy all environment drivers to all instruments. 2014-05-16 13:56:51 +10:00
Ferdi Franceschini
bea943ddf2 Add new reactor status object to instruments. 2014-03-25 09:23:57 +11:00
Ferdi Franceschini
0b92895350 Script validator should not connect to the Dingo camera. 2013-08-27 17:24:56 +10:00
Ferdi Franceschini
2df9297a3f SICS-587 Setup hostport dictionary based configuration for dingo. 
Also added simulated camera server and a camtest configuration file to
run test scans against a dummy motor.
 2013-06-14 10:18:45 +10:00
Ferdi Franceschini
4f44b746ba Provide dummy histogram initialisation function. 2013-06-14 09:42:57 +10:00
Jing Chen
951f9f40ee Integrate Dingo Camera Server Stuffs 2013-05-22 10:57:11 +10:00
Jing Chen
9b35fc13ed Integrate Dingo Camera Server Stuffs 2013-05-22 10:56:35 +10:00
Jing Chen
0dbab4045b integrate Dingo Camera Server stuffs 2013-05-22 10:49:28 +10:00
Jing Chen
1b61b67a30 integrate Dingo Camera Server stuffs 2013-05-22 10:48:44 +10:00
Jing Chen
50e508d79b r3599 | jgn | 2012-06-12 14:10:46 +1000 (Tue, 12 Jun 2012) | 1 line 2012-11-15 17:30:39 +11:00
Jing Chen
97fcb9ecf3 remove HMM component of Dingo 
r3598 | jgn | 2012-06-12 10:01:17 +1000 (Tue, 12 Jun 2012) | 1 line
 2012-11-15 17:30:34 +11:00
Jing Chen
f6cb6602b1 re-produce package for Dingo 
r3596 | jgn | 2012-06-06 12:01:42 +1000 (Wed, 06 Jun 2012) | 1 line
 2012-11-15 17:30:25 +11:00
Jing Chen
06ab0664eb r3595 | jgn | 2012-06-06 11:30:16 +1000 (Wed, 06 Jun 2012) | 1 line 2012-11-15 17:30:20 +11:00
Jing Chen
9518e46440 remove hmm from Dingo 
r3575 | jgn | 2012-06-04 09:34:16 +1000 (Mon, 04 Jun 2012) | 1 line
 2012-11-15 17:29:24 +11:00
Jing Chen
66aa3f943c create initial SICS file for Dingo 
r3574 | jgn | 2012-06-01 16:07:14 +1000 (Fri, 01 Jun 2012) | 1 line
 2012-11-15 17:29:19 +11:00