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

168 Commits

Author SHA1 Message Date
Douglas Clowes
9ee2252138 Merge branch 'RELEASE-3_1' into RELEASE-3_2 
Conflicts:
	sics/site_ansto/instrument/dingo/dingo_configuration.tcl
	sics/site_ansto/instrument/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/kookaburra/kookaburra_configuration.tcl
	sics/site_ansto/instrument/reflectometer/platypus_configuration.tcl
	sics/site_ansto/instrument/sans/quokka_configuration.tcl
 2015-03-13 15:44:32 +11:00
Ferdi Franceschini
25d73eb17a Bring config INI files up to date with new drivers and fix some errors. 2015-03-13 13:09:15 +11:00
Douglas Clowes
f269a17ef3 Merge branch 'RELEASE-3_1' into RELEASE-3_2 
Conflicts:
	sics/site_ansto/instrument/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/hrpd/echidna_configuration.tcl
	sics/site_ansto/instrument/kookaburra/kookaburra_configuration.tcl
	sics/site_ansto/instrument/reflectometer/platypus_configuration.tcl
	sics/site_ansto/instrument/sans/config/environment/sct_antonparr_MCR500.tcl
	sics/site_ansto/instrument/tas/taipan_configuration.tcl
 2015-03-05 13:53:47 +11:00
Douglas Clowes
1bb7f90237 Merge branch 'Pelican' into temp 
Conflicts:
	sics/site_ansto/instrument/config/environment/temperature/sct_lakeshore_218.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
 2015-02-19 14:53:33 +11:00
Douglas Clowes
40d2a1e2f4 Pullback from Pelican 2015-02-19 2015-02-19 11:24:44 +11:00
Ferdi Franceschini
f1eb273db6 Allow selecting histogram memory server as source of beam monitor counts. 2015-02-06 08:48:11 +11:00
Douglas Clowes
e317e4b341 Change names from sct_*.tcl to *_sct.tcl in config/deploy files 2015-01-22 13:16:09 +11:00
Douglas Clowes
c3bb4a9591 Merge branch 'RELEASE-3_1' into RELEASE-3_2 
Conflicts:
	sics/site_ansto/instrument/config/beamline/sct_he3_polanal.tcl
	sics/site_ansto/instrument/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/hrpd/echidna_configuration.tcl
	sics/site_ansto/instrument/pelican/pelican_configuration.tcl
 2015-01-07 13:09:27 +11:00
Douglas Clowes
0afb08a7a3 Adjustments to mtth/vwi/vei for Pelican 
Reverse sign on mom[abc] in set_vwi proc
Add hdbchain for vwi for mtth
Add sicslist setatt ... for vei as for vwi
 2014-12-15 15:33:05 +11:00
Douglas Clowes
51026a09af Pull various config files closer into alignment 2014-11-20 16:06:32 +11:00
Douglas Clowes
f629ea24ed Pull various config files closer into alignment 2014-11-20 15:56:30 +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
Douglas Clowes
16ad9ed8e2 Pull back address change on Pelican 2014-11-03 12:34:56 +11:00
Ferdi Franceschini
d9660d1f7b Add west6100 driver to Pelican. 2014-10-17 16:42:57 +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
2852cc9d79 Fix IP address of Pelican HV 2014-09-16 11:27:37 +10:00
Douglas Clowes
8b4bcc4c9e Pelican does not currently have a PLC interface 2014-09-10 17:03:00 +10:00
Douglas Clowes
377405d2a4 Pullback ls340_pelican and ls218 changes on Pelican 2014-09-10 14:39:00 +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
47d3d0a7e8 Pelican doesn't seem to have a PLC interface. 2014-08-26 10:33:14 +10:00
Ferdi Franceschini
78cfe7f5a9 SICS-770 Fixed SICS reports 'bad status code' when scanning the schp motor 2014-08-26 10:33:13 +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
18c862a609 Adding config INI file to Pelican. 2014-08-06 11:20:45 +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
Douglas Clowes
8bed9404e4 Pelican merge: pelican_configuration.tcl, motor_configuration.tcl 2014-06-26 15:15:58 +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
852bc7462b Updated from ics2-pelican 2013-12-20 09:08:54 +11:00
Ferdi Franceschini
472ca4f9d9 Updated from ics2-pelican. 2013-12-20 09:08:53 +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
Douglas Clowes
f3e2a6cd7f Add LS340 to Pelican deployment 2013-08-30 14:16:19 +10:00
Ferdi Franceschini
d48b771ac3 Updated mom motor stepsperX and cntsperX for Pelican. 2013-08-15 14:56:28 +10:00
Ferdi Franceschini
643017d486 Source channel gains from das1-pelican and set MESYTEC thresholds. 2013-08-15 14:19:05 +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
05f17515cf SICS-645: Setting mtype attribute to stop scan from checking thread0 2013-08-09 05:30:57 +10:00
Ferdi Franceschini
2c36a8f466 SICS-644: Set precision to 50ns on Pelican fermi chopper phase motors. 2013-08-09 05:30:54 +10:00
Ferdi Franceschini
d872aedbec Don't create Pelican fermichopper motors when loading the configuration file. 
This should be done in the local extraconfig.tcl
 2013-05-31 11:13:10 +10:00
Ferdi Franceschini
cd3bbe64e3 SICS-594 Check and update motor configuration for the monochromator motors. 2013-05-21 12:26:32 +10:00
Ferdi Franceschini
735b402655 SICS-606 Anticollision script for Pelican monochromator. 2013-05-17 03:25:27 +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
ea3c8b7821 BUGFIX Set 50ns veto window parameter correctly on the Fermi chopper. 
Also disable the idle setting in the 'run' command.
And check that the 'run' command actually succeeded.
 2013-05-13 22:15:43 +10:00
Ferdi Franceschini
b8d059c266 BUGFIX Forgot to actually send coil value when set. 
Also cleared stale error messages.
 2013-05-13 22:14:22 +10:00
Ferdi Franceschini
0ab6b5f67f Added HMSTAT hostports for pelican. 2013-05-08 11:26:02 +10:00