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

229 Commits

Author SHA1 Message Date
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
6b6fd5131c Add vactex.tcl found on wombat (fixed) 2014-09-11 13:48:38 +10:00
Douglas Clowes
5ce8677195 Pull back config changes from Wombat and add the west_6100 blue furnaces 2014-09-10 15:15:20 +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
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
c8057a89aa Changes pulled back from Wombat 2014-09-09 2014-09-09 14:52:47 +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
bf355fb9ed Load all kinds of environment for Pelican and Wombat because we should be 
able to just add a new device to the sics_config.ini and load it.
 2014-08-06 10:08:12 +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
Douglas Clowes
972e3232cd Change the names in all of the files 2014-07-23 17:30:44 +10:00
Ferdi Franceschini
b29eecc549 Use V1 with I1 for autolab setup on wombat 2014-07-16 09:28:26 +10:00
Ferdi Franceschini
739ab393a5 Add an Autolab setup to the Wombat config and fix the mercury configuration. 2014-07-15 15:20:20 +10:00
Ferdi Franceschini
c83e5d681c Update sics_config.ini files for Wombat and Quokka. 2014-07-15 08:59:19 +10:00
Ferdi Franceschini
ee539a5341 Load wrapper code for legacy drivers. 2014-07-15 08:59:18 +10:00
Ferdi Franceschini
867c6c8eaa Generate a wrapper for the old protek driver from a protekmm.sct template. 2014-07-11 13:52:37 +10:00
Ferdi Franceschini
6aa229ee75 Driver changes made on ics1-wombat-test. 2014-07-11 08:49:40 +10:00
Ferdi Franceschini
7a4ce1f234 Write option id into driver implementation section when saving the sics_config.ini 2014-07-03 16:04:00 +10:00
Ferdi Franceschini
a439601d7d Source mercury scpi driver for Wombat 2014-07-03 16:04:00 +10:00
Douglas Clowes
81554ee0d7 Adjust motor oscillation and SetRadCol command 
Count full cycles on motor oscillate
Add logging on motor oscillate
Add "motor oscillate start high/low" options
Remove SetRadCol offset because it is not needed
 2014-07-03 12:12:52 +10:00
Ferdi Franceschini
87bf34c7b1 Renamed type to optype in sics_config.ini so devices 
like multimeters can set a data type parameter eg datype
config_edit.py uses optype instead of type
Also the listwalker is now being generated dynamically so that in the
future unavailable drivers can be moved from the list of radiobuttons.
 2014-07-02 08:50:17 +10:00
Ferdi Franceschini
d9255be951 Use the 'oscillate' subcommand on oct instead of oscmd 2014-07-01 15:36:49 +10:00
Ferdi Franceschini
e971cd8b64 New sicsconfig.ini file configuration editor. 
Updated wombat sics_config.ini and gen_sct.py
Generated new tcl files from sct templates and
modified some old sct_*.tcl drivers.

TODO
sct_keithley_2700.tcl
magneticField/sct_oxford_labview.tcl
magneticField/sct_bruker_BEC1.tcl
temperature/sct_watlow_st4.tcl
temperature/sct_oxford_mercury.tcl
temperature/sct_mercury_pres.tcl
temperature/sct_julabo_lh45.tcl
temperature/sct_lakeshore_340.tcl
temperature/sct_julabo_lh45_gen.tcl
temperature/sct_watlow_rm.tcl
temperature/sct_eurotherm_2000.tcl
temperature/sct_lakeshore_336.tcl
temperature/sct_watlow_pm.tcl
temperature/sct_oxford_itc.tcl
temperature/sct_lakeshore_370.tcl
temperature/west400.tcl
 2014-06-30 09:08:19 +10:00
Douglas Clowes
648c8003b7 Merge from Wombat, except sics_config.ini 
Conflicts:
	sics/site_ansto/instrument/config/environment/magneticField/sct_green_magnet.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_lakeshore_336.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
	sics/site_ansto/instrument/config/hmm/hmm_object.tcl
	sics/site_ansto/instrument/hipd/config/commands/eulerscan.tcl
	sics/site_ansto/instrument/hipd/config/motors/motor_configuration.tcl
	sics/site_ansto/instrument/hipd/util/sics_config.ini
	sics/site_ansto/instrument/server_config.tcl
 2014-06-25 13:35:28 +10:00
Douglas Clowes
ccc47a4c57 Pull in Wombat changes to hvcommands.tcl 2014-06-25 13:20:20 +10:00
Douglas Clowes
e3377553bd Sort the *.ini files so we can better compare them 2014-06-24 17:22:46 +10:00
Ferdi Franceschini
6dba13a5ab Add CF1 to Wombat INI file and fix ordering of LS336 sections. 2014-06-23 10:29:20 +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
6af68dcb46 Add radio buttons to wombat sics_config.ini for sample stage motor configurations. 2014-05-01 09:03:25 +10:00
Ferdi Franceschini
7039a3726c Don't automatically install the oxford magnet driver when the config is 
loaded.
 2014-04-30 16:21:38 +10:00
Ferdi Franceschini
5f4c586002 Use the right IP address for PLC status. 2014-04-30 16:21:13 +10:00
Ferdi Franceschini
bea943ddf2 Add new reactor status object to instruments. 2014-03-25 09:23:57 +11:00
Ferdi Franceschini
03c00623ee Allow two LS336 and two LS340 temperature controllers to be selected. 2013-12-20 09:09:03 +11:00
Ferdi Franceschini
d2ac198251 Updates from ics1-wombat 2013-12-20 09:09:00 +11:00
Ferdi Franceschini
6ce3f8bd45 SICS-706 Create sics_config.ini for SICS upgrade on Wombat. 2013-12-20 09:08:59 +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
76f323d15a SICS-587 Setup hostport dictionary based configuration for Wombat. 2013-06-21 09:07:56 +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
eddabe79c4 merge back changes from instrument 
r3740 | dcl | 2012-09-19 13:51:37 +1000 (Wed, 19 Sep 2012) | 1 line
 2012-11-15 17:38:25 +11:00
Douglas Clowes
475d29cfb7 Add the Green Magnet driver to the deployment 
r3730 | dcl | 2012-09-03 09:00:45 +1000 (Mon, 03 Sep 2012) | 1 line
 2012-11-15 17:37:37 +11:00
Jing Chen
29a9ad72a8 r3706 | jgn | 2012-08-27 09:13:20 +1000 (Mon, 27 Aug 2012) | 1 line 2012-11-15 17:36:50 +11:00
Jing Chen
d2b917cb99 r3705 | jgn | 2012-08-24 10:51:29 +1000 (Fri, 24 Aug 2012) | 1 line 2012-11-15 17:36:45 +11:00
Jing Chen
06bfc7a917 r3703 | jgn | 2012-08-24 10:41:07 +1000 (Fri, 24 Aug 2012) | 1 line 2012-11-15 17:36:35 +11:00