Commit Graph

268 Commits

Author SHA1 Message Date
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
Ferdi Franceschini
445a8c2fce Fix eulerian spelling. 2015-02-23 10:22:29 +11:00
Douglas Clowes
4e383b2af2 Merge branch 'Echidna' into temp
Conflicts:
	sics/site_ansto/instrument/config/environment/sct_knauer_pump.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_west_6100.tcl
	sics/site_ansto/instrument/hrpd/echidna_configuration.tcl
2015-02-19 14:57:43 +11:00
Douglas Clowes
31420ab850 Pullback from Echidna 2015-02-19 2015-02-19 11:43:50 +11:00
Douglas Clowes
f629ea24ed Pull various config files closer into alignment 2014-11-20 15:56:30 +11:00
Ferdi Franceschini
23bd45061b Copy changes made to ics1-echidna since R31C20 deployment. 2014-11-12 17:24:23 +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
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
Ferdi Franceschini
944902c9d4 Added sct wrapper to load legacy sct_oxford_labview.tcl driver. 2014-08-08 11:51:49 +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
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
Ferdi Franceschini
d2f57e4615 SICS-294 anstohttp.c
Histmem now only calls TaskYield after SICS has finished initalising, this stops the statusfile task from being called early and overwriting the status file. Created ANSTO_MakeHistMemory command to install ANSTO_HistAction
Added veto functions.  Mapped the HistDriver interface Pause() and Continue() commands to AnstoHttpVeto and AnstoHttpNoVeto. Implemented an ANSTO_Histaction to call AnstoHttpPause when sent a "pause" subcommand.

hmcontrol_ansto.c
Call AnstoHttpPause() directly when Pause_HM_After_Count is set to preserver current behaviour.

counterdriv.c
Now sends the correct "SICS RESUME" command to resume a paused count.

ansto_sctdriveadapter.c NEW
This lets you create driveable objects from script-context controllers which have one node for setting a parameter and another node for reading the parameter (eg temperature controllers, choppers, velocity selectors)

sctemonadapter.c NEW
This generates an environment monitor interface for script-context controllers so that the emon object in SICS will be able to pause counters if the controller goes out of tolerance.

sct_usbtmcprot.c, usbtmc.h NEW
First attempt at a protocol handler for USB Test and Measurement Class devices

sct_julabo_lh45.tcl NEW
Implements script-context controller for the Julabo LH45 temperature controller.

Makefile
Added ansto_sctdriveadapter and sctemonadapter

hardsup/makefile
Added velocity selector and usbtmc protocol handlers

hardsup/sct_velselprot.c
Simplified, don't worry about trying to implement a login handler for now, just implement a "Reading" handler.

site_ansto.c
Add the velocity selector and USBTMC protocol handlers.
Added the ANSTO_MakeHM command

instrument/config/hipadaba/common_instrument_dictionary.tcl
Added support for auxiliary data, ie extra meta-data entries in the "data" group of the nexus file.
Add new NXvelocity_selector object under /instrument.

instrument/config/hipadaba/hipadaba_configuration_common.tcl
Add the new "sct_object" script-context controller objects to the hdb tree.

instrument/config/hipadaba/instdict_specification.tcl
Define the new sct_object controllers.

instrument/config/hmm/hmm_configuration_common_1.tcl
Use the new ANSTO_MakeHM command to create histmem drivers which support veto.
Define allowed attributes and elements for the BAT_TABLE and FAT_TABLE
Stop between counts instead of pausing because setting pause now sends a veto.

instrument/config/motors/sct_jogmotor_common.tcl
You now need to specify klass when creating a jogmotor.

instrument/config/motors/sct_positmotor_common.tcl
You can now specify an optional function which calculates the instrument parameter (eg attenuation) from a posit table entry when defining a posit motor.

instrument/config/nexus/nxscripts_common_1.tcl
Report file status info in the /experiment section of the hdb tree.  Add auxiliary data to data file.
Handle saving data from script-context controller objects.

instrument/util/script_context_util.tcl
Added procedure to set required properties  for saving script-context object data.

instrument/util/utility.tcl
Added set_sct_object_attributes proc to automatically set required attributes on SCT_OBJECTs
Fixed hlistplainprop to deal with empty property fields on hdb nodes.

instrument/server_config.tcl
Call the new nexus initialisation command and set attributes on sct objects.

hrpd/config/motors/motor_configuration.tcl
New absenc home readings for mchi and mphi. New absenc home and range for mf1

hipd/config/commands/commands.tcl
Exported and published the new ajscmds so that they can be used in batch files.

hipd/config/motors/motor_configuration.tcl
New mchi absenc home

rsd/config/hmm/hmm_configuration.tcl
Provide support for saving corrected hmm data

rsd/config/motors/motor_configuration.tcl
Use simple names for motors.

SICS-329

sans/config/INSTCFCOMMON.TXT
Added julabo and lakeshore configuration files to list.

sans/config/optics/guide_configuration.tcl
Added entrance aperture positions to the configuration table and the cn_maps which map the index to the component ID.

sans/commands/commands.tcl
The "guide" command now set EApPosYmm after driving the guides in place.
The indexed position to component maps (cn_map) have been moved to the guide_configuration.tcl file.

sans/motors/motor_configuration.tcl
Set samy home to 56.1mm

sans/config/velsel/sct_velsel.tc NEW
Implements script-context controller object for the NVS40 velocity selector. TODO tilt-angle control, driveable interface.

sans/config/hmm/hmm_configuration.tcl
Set 5.08mm spacing on detector width. Use pixel-offset for vertical and horizontal detector axes.

sans/config/motors/motor_configuration.tcl
Swap directions of beamstops 4 and 5 (the two smallest)
New config parameters for samx, samthet, apx, det, detoff, bsz,

sans/config/motors/positmotor_configuration.tcl
Added descriptive headers to positmotor configuration tables and new synstax for the make positmotor command.

sans/config/nexus/nxscripts.tcl
Implemented initialisation command.

sans/config/parameters/parameters.tcl
Added SampleThickness and TransmissionFlag.  Calculate SamplePosYmm from samy and SamyOffsetmm.
Added beamstops to hdb tree.

reflectometer/config/nexus/nxscripts.tcl
Implement the initialisation procedure.

r2767 | ffr | 2009-03-31 10:16:54 +1100 (Tue, 31 Mar 2009) | 123 lines
2012-11-15 16:57:04 +11:00