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

210 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
4dbaa0f73d SICS-723 Provide a detector/reset_trip node to notify GumTree and allow reset. 2014-11-07 09:44:34 +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
7d35f7e696 SICS-797: Bring GIT up to date with changes made on ics1-quokka 2014-10-09 14:21:10 +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
00f4dfe588 Fix directories for quokka_configuration.tcl 2014-09-11 15:35:31 +10:00
Douglas Clowes
f4eb6c63d8 Pullback sics_config changes from Quokka 2014-09-10 15:15:53 +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
Ferdi Franceschini
a0acd1e5b4 SICS-458: Add dsc command to run a DSC acquisition on Quokka. 
Also added dsc.py utility which finds the start of a DSC profile in hdf files.
 2014-08-26 10:32:43 +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
c95d2d6885 Add temperature subdirectory to lakeshore 218 and m370 fileeval 2014-08-08 09:45:30 +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
Ferdi Franceschini
de264c5f02 Update 5T magnet driver name in Quokka sics_config.ini 2014-07-16 10:11:37 +10:00
Ferdi Franceschini
c03bbdc38e Add permlink to 5T magnet driver and load the driver in the quokka config. 2014-07-16 10:11:07 +10:00
Ferdi Franceschini
994f4a48c1 Add 5T New Zealand magnet configuration to Quokka configuration. 2014-07-15 17:30:51 +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
58a64da712 Wrapper code for legacy drivers. 2014-07-15 08:59:18 +10:00
Ferdi Franceschini
67b8576f35 Modify legacy drivers so that they can be called by sct wrappers and define wrapper templates. 2014-07-15 08:59:17 +10:00
Ferdi Franceschini
16b228dc0e Sort and save the the Quokka sics_config.ini file in its default configuration. 2014-07-11 09:30:59 +10:00
Douglas Clowes
852f87f131 Sort and massage Quokka's sics_config.ini 2014-07-07 13:59:41 +10:00
Ferdi Franceschini
7193129956 Set bruker IP address and port 2014-07-07 10:25:09 +10:00
Ferdi Franceschini
8a8a08e57f Add sics_config.ini to quokka. 2014-07-07 10:22:06 +10:00
Ferdi Franceschini
cc39cc08fe Select sample changer from sics_config.ini 2014-07-07 09:15:54 +10:00
Douglas Clowes
3ffcdb08da Merge from Quokka quokka_configuration.tcl (partial) 2014-06-25 17:09:27 +10:00
Douglas Clowes
d404bdbb06 Merge from Quokka sans sct_flipper, environment, motor_config 2014-06-25 17:09:22 +10:00
Douglas Clowes
ed7c371080 Add the huber bath Pilot ONE driver 2014-06-17 14:53:48 +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
be653c91fe Make instrument specific Oxford configs consistent for Quokka and Taipan. 2014-05-01 09:18:55 +10:00
Ferdi Franceschini
bea943ddf2 Add new reactor status object to instruments. 2014-03-25 09:23:57 +11:00
Ferdi Franceschini
52f28117ef Updated from ics2-quokka 2013-12-20 09:08:54 +11:00
Ferdi Franceschini
713ae0b263 SICS-504 Quokka beamstops:Try to get within 0.05 degrees of the target without raising an error. 2013-10-28 15:33:42 +11:00
Ferdi Franceschini
b1ab4f8b1a SICS-675: Change lens configuration for Quokka 2013-10-28 15:33:41 +11:00
Ferdi Franceschini
e666d980fd Don't use the SICS telnet port for the fake velocity selector. 2013-10-28 15:33:41 +11:00
Ferdi Franceschini
653f113ecc Quokka performance enhancements made by Dan Bartlett 12/09/13. 2013-10-15 02:24:00 +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
b842421f12 Use NVS40 velocity selector on quokka 2013-08-15 08:09:15 +10:00
Ferdi Franceschini
335eda0a55 Allow wavelengths below 4.6125 Angstroms for velocity selector on quokka 2013-08-15 08:08:36 +10:00
Ferdi Franceschini
d038891bc1 Get new det_home value 2013-08-15 08:08:08 +10:00
Ferdi Franceschini
dd0ee77a26 Get voltage settings as measured by Mark Lesha on 30/7/13 for SN003 2013-08-15 08:07:39 +10:00
Ferdi Franceschini
36caadd3af Do not make an instance of the oxford labview driver when initialising SICS. 2013-08-15 08:07:07 +10:00
Ferdi Franceschini
fef7d4382e Allow selecting external or bath sensor when using a Julabo on Quokka 2013-08-15 08:05:49 +10:00