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

3687 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ferdi Franceschini
5bb2d6ca6f SICS-608: Implemented detector protection using anticollider using a voltage limit of 56 volts. 2014-09-30 15:12:41 +10: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
5bedffc9c3 Strip the date and time from server_date_time in FILEMAP.TXT 2014-09-26 15:33:00 +10:00
Douglas Clowes
98b5a89225 There is no mkdriver_args 2014-09-26 15:30:25 +10:00
Douglas Clowes
cf77588861 Add some more checking and fix drive end bug 2014-09-22 13:48:49 +10:00
Ferdi Franceschini
9f8d01bebe SICS-785 Use scientific notation to return small floats in SICSvariables. 2014-09-19 14:53:06 +10:00
Ferdi Franceschini
cca9029270 Enable plc on Dingo 2014-09-19 12:17:38 +10:00
Ferdi Franceschini
84cc1d5b4c SICS-782 Configure autofocussing on Taipan. 2014-09-19 12:16:32 +10:00
Ferdi Franceschini
018ba90189 SICS-783 Load extra environment driver configurations for Echidna. 2014-09-19 12:16:31 +10:00
Ferdi Franceschini
cf386ec3ef SICS-781 lakeshore 370 driver does not save data. 2014-09-19 12:16:31 +10:00
Ferdi Franceschini
e31737379c SICS-780 Set attributes on environment control objects even if there are errors setting up other objects. 2014-09-19 12:16:30 +10:00
Ferdi Franceschini
0ba5045fd9 Update motor configuration from ics1-taipan. 
Also put off renaming s1 to ms1 for magnet config.  We need to make sure
that there is a sample/s1 link to sample/ms1 and use ms1 in tasub.
 2014-09-19 12:16:30 +10:00
Ferdi Franceschini
85cbe1eb38 Use actual motor names when reporting a tasub setup error. 2014-09-19 12:16:29 +10:00
Douglas Clowes
b3d8f1bdae Regenerate knauer_pump.sct 2014-09-19 12:08:13 +10:00
Douglas Clowes
522865f264 Restructure knauer_pump.sct 2014-09-19 12:07:51 +10:00
Douglas Clowes
1a15aa5de6 Generated Knauer driver 2014-09-18 17:07:30 +10:00
Douglas Clowes
12d4e7dce5 First pass driver for the Knauer BlueShadow Pump 40P 2014-09-18 17:07:00 +10:00
Douglas Clowes
2852cc9d79 Fix IP address of Pelican HV 2014-09-16 11:27:37 +10:00
Ferdi Franceschini
0606e66f90 Add new sics_config.ini for Taipan 
TODO SICS-779 Changing sample_stage to 12tmagnet_sample_insert doesn't work.
 2014-09-12 13:36:26 +10:00
Douglas Clowes
042119898d SICS-778 Fix crash in conman.c hookFunc 2014-09-12 13:00:26 +10:00
Douglas Clowes
cc9d59ee73 SICS-777 Use SICS_INIT_LOGPATH to move script_validator logs in runsics.py 2014-09-12 10:42:00 +10:00
Douglas Clowes
c93b4d30a3 SICS-777 Allow the log directory to be set by SICS_INIT_LOGPATH environement variable 2014-09-12 10:41:22 +10:00
Douglas Clowes
e8ec81ad5d SICS-776 Close the anti-collider file 2014-09-12 10:40:56 +10:00
Douglas Clowes
00f4dfe588 Fix directories for quokka_configuration.tcl 2014-09-11 15:35:31 +10:00
Ferdi Franceschini
4a4f464485 Copied prun and pdrive from RELEASE-3_2 branch. 2014-09-11 14:29:24 +10:00
Ferdi Franceschini
863eef2378 SICS-753: Add named positions for kookaburra sample changer samz. 2014-09-11 14:29:24 +10:00
Ferdi Franceschini
48794002f6 Moved dOmega and gDQv on Kookaburra as requested by Christine. 
See email Subj RE:Slight Modification ..., Date 7/5/2014
 2014-09-11 14:29:23 +10:00
Douglas Clowes
6b6fd5131c Add vactex.tcl found on wombat (fixed) 2014-09-11 13:48:38 +10:00
Douglas Clowes
0cb3f4f91c Regenerated drivers 2014-09-11 13:29:52 +10:00
Douglas Clowes
65b50f3fcc Allow sct drivers to get device_class and simulation_group from ini file 2014-09-11 13:27:09 +10:00
Douglas Clowes
8b4bcc4c9e Pelican does not currently have a PLC interface 2014-09-10 17:03:00 +10:00
Ferdi Franceschini
1fa1595821 SICS-733 Added gumtree_version, gumtree_status and gumtree_time_estimate to /experiment. 
Only gumtree_version is saved to the hdf file.
 2014-09-10 16:00:26 +10:00
Douglas Clowes
d1920069ae Pullback motor changes on Taipan 2014-09-10 15:25:26 +10:00
Douglas Clowes
f4eb6c63d8 Pullback sics_config changes from Quokka 2014-09-10 15:15:53 +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
Ferdi Franceschini
fb5addfe64 Add chopper configuration to Bilby INI file. 
TODO: There should be an instrument INI file for this.
 2014-09-10 15:01:27 +10:00
Ferdi Franceschini
e9e4d81c30 Add variables for Bilby beamcenter position and selected beamstop. 2014-09-10 15:01:26 +10:00
Ferdi Franceschini
55744da3b5 Use nhq200 driver for Bilby detector voltage control. 2014-09-10 15:01:25 +10:00
Ferdi Franceschini
7bd9409144 SICS-771 Save name of selected sample aperture and improve nguide command. 2014-09-10 15:01:25 +10:00
Ferdi Franceschini
b70fb72e8f Always allow driving collimation table into the aperture position or higher. 2014-09-10 15:01:24 +10:00
Ferdi Franceschini
3c51b17eb9 Fix beamstop targets in Bilby selbs command. 2014-09-10 15:01:24 +10:00
Ferdi Franceschini
f0202fad51 Use the new anstocapture command SICS-764 2014-09-10 15:01:23 +10:00
Ferdi Franceschini
ea7ce034b0 Make sure we return a value when querying nguide. 2014-09-10 15:01:23 +10:00
Ferdi Franceschini
2d2b76dcb5 Fix chopper frequency modification. 2014-09-10 15:01:22 +10:00
Ferdi Franceschini
9a7f4608b7 SICS-771 Add sample_aperture size macro. 
Make sure that positions are saved as -9999 if the guides are misaligned.
 2014-09-10 15:01:04 +10:00
Ferdi Franceschini
6ec4cf66cb Fix direction for beamstop motors. 2014-09-10 15:01:04 +10:00
Ferdi Franceschini
c827933d0d SICS-771 Implement selbs command and set beamstop ID in data file. 2014-09-10 15:01:03 +10:00
Ferdi Franceschini
b6b4c4fb72 Return frequency for reference chopper 2014-09-10 15:01:03 +10:00
Ferdi Franceschini
23df15f7e8 SICS-771 Add frequency for each chopper disk. 2014-09-10 15:01:03 +10:00
Douglas Clowes
b0812e5fea Pullback Bilby sics_config.ini to new bilby/util directory 2014-09-10 14:57:07 +10:00