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

269 Commits

Author SHA1 Message Date
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
Ferdi Franceschini
23bd45061b Copy changes made to ics1-echidna since R31C20 deployment. 2014-11-12 17:24:23 +11:00
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
a8b2df51a5 Load some missing environment controller configurations for Echidna. 2014-10-17 16:42:55 +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
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
Ferdi Franceschini
018ba90189 SICS-783 Load extra environment driver configurations for Echidna. 2014-09-19 12:16:31 +10:00
Douglas Clowes
499c5c422d Break simulation flagss out of the server_config.tcl 
These are the most frequent instrument-specific changes
 2014-09-09 15:14:57 +10:00
Douglas Clowes
6738a0844d Add the Robots (Robbie and Rosie) for Echidna 2014-09-08 15:56:20 +10:00
Douglas Clowes
ab6a70ad97 Add an external sics_simulation file for Echidna 2014-09-08 15:54:29 +10:00
Douglas Clowes
10b7e8029f Merge branch 'RELEASE-3_1' into RELEASE-3_2 2014-08-18 13:34:56 +10:00
Ferdi Franceschini
944902c9d4 Added sct wrapper to load legacy sct_oxford_labview.tcl driver. 2014-08-08 11:51:49 +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
2c753a3f18 Make sample stages configurable and add Oxford magnet sample stick motor as an option. 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
a62a284372 Define Echidna sics_config.ini with configurable sample stage. 2014-07-24 13:53:33 +10:00
Douglas Clowes
972e3232cd Change the names in all of the files 2014-07-23 17:30:44 +10:00
Douglas Clowes
ac24d330c2 Absolute encoders/resolvers changed on PCX, PCR and MOM on Echidna 2014-06-27 14:28:28 +10:00
Douglas Clowes
27f1f1dfa0 Merge from Echidna 2014-06-26 16:26:36 +10:00
Douglas Clowes
e3377553bd Sort the *.ini files so we can better compare them 2014-06-24 17:22:46 +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
d7acb7c16c Load drivers which have been enabled in the SICS config ini files. 
Lakeshore 336 drivers with known IP addresses have been added to the ini files with unique IDs.
All entries in the ini files now have unique IDs
The wombat ini now has radio buttons to select sample stage motor configurations.
 2014-05-05 12:25:00 +10:00
Ferdi Franceschini
1c75c336de Load the Oxford 12T driver code for Echidna. 2014-04-29 15:29:05 +10:00
Ferdi Franceschini
d0c9f39464 Update the SIS IP address for the plc status driver on Echidna. 2014-04-29 15:29:05 +10:00
Ferdi Franceschini
bea943ddf2 Add new reactor status object to instruments. 2014-03-25 09:23:57 +11:00
Douglas Clowes
b558f9d696 Add files to Echidna manifest and configuration to reflect changes out there 2014-02-24 14:17:06 +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
685a9b1373 SICS-587 Setup hostport dictionary based configuration for Echidna. 2013-06-21 11:13:42 +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
Douglas Clowes
010aa7f945 Adjust stth creep_offset and settle parameters to speed up detector movement 
r3519 | dcl | 2012-03-30 17:04:05 +1100 (Fri, 30 Mar 2012) | 1 line
 2012-11-15 17:26:25 +11:00
Ferdi Franceschini
040de5cb4b pulser and hvcommands are available in the common config/commands path 
r3357 | ffr | 2012-01-27 14:27:27 +1100 (Fri, 27 Jan 2012) | 2 lines
 2012-11-15 17:24:02 +11:00
Ferdi Franceschini
2172e2766f pulser and hvcommands are available in the common config/commands path 
r3356 | ffr | 2012-01-27 14:26:23 +1100 (Fri, 27 Jan 2012) | 2 lines
 2012-11-15 17:23:58 +11:00
Ferdi Franceschini
d416695b4b Merged in-situ changes from Echidna 
r3252 | ffr | 2011-09-23 14:21:09 +1000 (Fri, 23 Sep 2011) | 2 lines
 2012-11-15 17:16:17 +11:00
Ferdi Franceschini
08898a04f4 Get resolver changes for monochromator motors. 
r3073 | ffr | 2011-02-25 19:25:31 +1100 (Fri, 25 Feb 2011) | 1 line
 2012-11-15 17:08:54 +11:00
Ferdi Franceschini
d274698ff4 echidna_configuration.tcl 
Load sct_lakeshore 340 and 336 configurations.  Load new robot pick and place configuration

hmm_configuration.tcl
Override proc CAT_TABLE to add offset and magnification configuration.

motor_configuration.tcl
Modularised for tilt and euler configurations.

Added euler_configuration.tcl and put tilt stage configuration in tilt_configuration.tcl
r3030 | ffr | 2010-12-01 10:29:42 +1100 (Wed, 01 Dec 2010) | 10 lines
 2012-11-15 17:06:37 +11:00
Ferdi Franceschini
8011cec140 Make IP addresses explicit when configuring the old lakeshore 340 drivers. 
r2910 | ffr | 2010-05-07 14:32:51 +1000 (Fri, 07 May 2010) | 2 lines
 2012-11-15 17:01:39 +11:00
Ferdi Franceschini
7a456163b5 Fixed SICS-392 RF Generator command truncation. 
Code cleanup

r2906 | ffr | 2010-05-05 15:33:00 +1000 (Wed, 05 May 2010) | 3 lines
 2012-11-15 17:01:25 +11:00
Ferdi Franceschini
e6e3c3be52 Merged in-situ modifications for Release 2.5 candidate 5 
r2895 | ffr | 2010-04-29 16:02:15 +1000 (Thu, 29 Apr 2010) | 2 lines
 2012-11-15 17:00:43 +11:00
Ferdi Franceschini
4068f99180 Fixed some deployment problems 
r2871 | ffr | 2010-01-15 18:53:30 +1100 (Fri, 15 Jan 2010) | 2 lines
 2012-11-15 16:59:34 +11:00
Ferdi Franceschini
fd6a955d6b Remove keywords to simplify merging branches. 
r2859 | ffr | 2010-01-13 15:41:46 +1100 (Wed, 13 Jan 2010) | 2 lines
 2012-11-15 16:59:06 +11:00
Ferdi Franceschini
3f53864468 Merging changes made in-situ 
r2852 | ffr | 2009-12-16 09:01:46 +1100 (Wed, 16 Dec 2009) | 2 lines
 2012-11-15 16:58:52 +11:00
(no author)
7c75771acf This commit was manufactured by cvs2svn to create branch 
'RELEASE-2_5-BRANCH'.
r2846 | (no author) | 2009-12-11 13:09:57 +1100 (Fri, 11 Dec 2009) | 2 lines
 2012-11-15 16:58:34 +11:00
Ferdi Franceschini
35d1930d1b Initial commit 
r2845 | ffr | 2009-12-11 13:09:56 +1100 (Fri, 11 Dec 2009) | 2 lines
 2012-11-15 16:58:26 +11:00
Ferdi Franceschini
b6ed01fc13 Merge changes made in-situ. 
r2842 | ffr | 2009-12-10 14:57:53 +1100 (Thu, 10 Dec 2009) | 2 lines
 2012-11-15 16:58:14 +11:00
Ferdi Franceschini
2ec6505ef8 Merged 2.4 branch 
r2828 | ffr | 2009-11-25 09:56:49 +1100 (Wed, 25 Nov 2009) | 2 lines
 2012-11-15 16:57:26 +11:00
Ferdi Franceschini
8e5b7842e3 Merged changes made in-situ 
r2768 | ffr | 2009-03-31 17:25:20 +1100 (Tue, 31 Mar 2009) | 2 lines
 2012-11-15 16:57:09 +11:00