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

35 Commits

Author SHA1 Message Date
Ferdi Franceschini
f1eb273db6 Allow selecting histogram memory server as source of beam monitor counts. 2015-02-06 08:48:11 +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
99fae91ff9 Add sics_simulation.tcl to each instrument MANIFEST.TXT file 2014-09-10 10:14:46 +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
Douglas Clowes
972e3232cd Change the names in all of the files 2014-07-23 17:30:44 +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
1af24fcb0a _histmem proc isn't created if the common hmm config file is loaded with the "source" command. 2013-09-10 21:44:45 +10:00
Ferdi Franceschini
5a17bca641 Make sure hmm clock_scale and freq are set or SICS won't start properly. 
If these parameters aren't set on an instrument with a histogram server
then SICS won't create the hdb tree.
 2013-08-22 07:58:20 +10:00
Ferdi Franceschini
ca1e34856a Speed up histmem config when SICS starts up. 
Clock scale, frame freq and source should be set in the instrument specific
hmm_configuration.tcl file, not in hmm_configuration_common_1.tcl.
 2013-08-15 13:56:50 +10:00
Ferdi Franceschini
ce1f4cae19 SICS-587 Setup hostport dictionary based configuration for Lyrebird. 2013-06-21 14:07:32 +10:00
Ferdi Franceschini
babc5fe17e A new runsics script has been implemented in python (runsics.py). 
It supports the new "fakedev" simulation mode which runs SICS with real
drivers for devices which have simulated controllers.
There are advance options which allow multiple instances of SICS to be
launched on development and test environments.
Also we no longer depend on having serverport numbers in /etc/services.
 2013-05-13 23:11:15 +10:00
Ferdi Franceschini
16e744be12 Moved MakeDrive to instrument specific configuration. 
This lets us make run and drive wrappers for the fermi motors on pelican
by renaming the SICS run and drive.
 2013-04-09 14:15:55 +10:00
Jing Chen
f097b7f47f update hmm file from Mark 
r3439 | jgn | 2012-03-05 14:20:44 +1100 (Mon, 05 Mar 2012) | 1 line
 2012-11-15 17:24:57 +11:00
Jing Chen
21d5f727f1 remove spin_oxford_labview.tcl 
r3323 | jgn | 2012-01-03 11:53:58 +1100 (Tue, 03 Jan 2012) | 1 line
 2012-11-15 17:21:30 +11:00
Jing Chen
5fab34ac0d r3322 | jgn | 2012-01-03 11:52:32 +1100 (Tue, 03 Jan 2012) | 1 line 2012-11-15 17:21:25 +11:00
Jing Chen
ebc62a676a recent changes at Pelican Lyrebird 
r3256 | jgn | 2011-10-17 15:37:22 +1100 (Mon, 17 Oct 2011) | 1 line
 2012-11-15 17:16:34 +11:00
Jing Chen
3b6dc490ab recent changes at Pelican Lyrebird 
r3255 | jgn | 2011-10-17 15:37:09 +1100 (Mon, 17 Oct 2011) | 1 line
 2012-11-15 17:16:30 +11:00
Jing Chen
dd10a410e7 recent changes at Pelican Lyrebird 
r3254 | jgn | 2011-10-17 15:36:55 +1100 (Mon, 17 Oct 2011) | 1 line
 2012-11-15 17:16:25 +11:00
Jing Chen
ee2ab3867d update motor configution parameters 
r3210 | jgn | 2011-06-08 09:11:18 +1000 (Wed, 08 Jun 2011) | 1 line
 2012-11-15 17:14:01 +11:00
Jing Chen
25a2e6d839 update motor grouping for Lyrebird 
r3123 | jgn | 2011-05-02 12:26:12 +1000 (Mon, 02 May 2011) | 1 line
 2012-11-15 17:12:01 +11:00
Jing Chen
0105298d79 update motor class for Taipan/Lyrebird 
r3121 | jgn | 2011-04-29 10:45:37 +1000 (Fri, 29 Apr 2011) | 1 line
 2012-11-15 17:11:52 +11:00
Jing Chen
30d9edb0dd update group for motors 
r3117 | jgn | 2011-04-28 10:39:23 +1000 (Thu, 28 Apr 2011) | 1 line
 2012-11-15 17:11:35 +11:00
Jing Chen
8b1d0103f4 update for Lyrebird deployment 
r3105 | jgn | 2011-04-20 08:48:12 +1000 (Wed, 20 Apr 2011) | 1 line
 2012-11-15 17:10:41 +11:00
Jing Chen
5153e16e86 update for Lyrebird 
r3101 | jgn | 2011-04-11 15:09:26 +1000 (Mon, 11 Apr 2011) | 1 line
 2012-11-15 17:10:23 +11:00
Jing Chen
c21177047e r3069 | jgn | 2011-02-24 10:15:51 +1100 (Thu, 24 Feb 2011) | 1 line 2012-11-15 17:08:35 +11:00
Jing Chen
0808b54652 r3068 | jgn | 2011-02-24 09:23:22 +1100 (Thu, 24 Feb 2011) | 1 line 2012-11-15 17:08:31 +11:00
Jing Chen
102b722b5a updated/added file to support galil contoller in Lyrebird - jgn 
r3067 | jgn | 2011-02-24 09:12:56 +1100 (Thu, 24 Feb 2011) | 3 lines
 2012-11-15 17:08:27 +11:00
Jing Chen
fb86744209 add motors 
r3055 | jgn | 2011-02-15 11:49:27 +1100 (Tue, 15 Feb 2011) | 2 lines
 2012-11-15 17:07:37 +11:00
Jing Chen
eb74c04e2b update Lyrebird 
r3042 | jgn | 2010-12-15 14:05:41 +1100 (Wed, 15 Dec 2010) | 1 line
 2012-11-15 17:07:20 +11:00
Jing Chen
26df0a884a update Taipan 
r3040 | jgn | 2010-12-14 10:20:42 +1100 (Tue, 14 Dec 2010) | 1 line
 2012-11-15 17:07:11 +11:00
Jing Chen
28772f6ec2 added Lyrebird instrument config 
r3038 | jgn | 2010-12-13 16:10:57 +1100 (Mon, 13 Dec 2010) | 1 line
 2012-11-15 17:07:02 +11:00