Commit Graph

125 Commits

Author SHA1 Message Date
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
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
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
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
d2ac198251 Updates from ics1-wombat 2013-12-20 09:09: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
76f323d15a SICS-587 Setup hostport dictionary based configuration for Wombat. 2013-06-21 09:07:56 +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
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
Jing Chen
df847f6239 add magnetic
r3649 | jgn | 2012-07-16 09:56:37 +1000 (Mon, 16 Jul 2012) | 1 line
2012-11-15 17:33:36 +11:00
Douglas Clowes
1326492c00 Add the oxford temperature controller and soloist motor for the 12T magnet
r3538 | dcl | 2012-04-27 14:39:01 +1000 (Fri, 27 Apr 2012) | 1 line
2012-11-15 17:27:47 +11:00
Ferdi Franceschini
4ef2f989ba Use the common pulser and hvcommands files.
r3354 | ffr | 2012-01-27 14:21:57 +1100 (Fri, 27 Jan 2012) | 2 lines
2012-11-15 17:23:49 +11:00
Ferdi Franceschini
7cf52c6a86 pulser and hvcommands are available in the common config/commands path
r3353 | ffr | 2012-01-27 14:16:54 +1100 (Fri, 27 Jan 2012) | 2 lines
2012-11-15 17:23:44 +11:00
Ferdi Franceschini
dd12f15603 Remove references to missing files
r3351 | ffr | 2012-01-20 16:05:00 +1100 (Fri, 20 Jan 2012) | 2 lines
2012-11-15 17:23:35 +11:00
Ferdi Franceschini
1762688c7a Adjust detector width to give 121 degrees
r3350 | ffr | 2012-01-20 15:53:21 +1100 (Fri, 20 Jan 2012) | 2 lines
2012-11-15 17:23:31 +11:00
Ferdi Franceschini
71b71e262c Added eulerscan.tcl from ics1-wombat
Updated to get in-situ changes to motor configurations (eg monochromator resolvers)
r3072 | ffr | 2011-02-25 19:12:19 +1100 (Fri, 25 Feb 2011) | 2 lines
2012-11-15 17:08:50 +11:00
Ferdi Franceschini
bbc133dab9 Quokka environment.tcl
Don't make the temperature getset-macro or select the control sensor for the script validator instance of SICS. (fixed in-situ)
Use new ls340 and ls336 controllers.

script_context_util.tcl
Modified hinitprops so that it can take sub-paths

nxscripts_common_1.tcl
Added ::nexus::OnFirstsave ::nexus:OnLastSave to register commands which will be executed on the first and last save of a data file.

sct_julabo_lh45.tcl
Added start_temperature and end_temperature parameters to record the initial and final temperature readings in the data files.
Also only set the setpoint if the Julabo is in remote mode.

sct_positmotor_common.tcl
Report 99999 if a posit motor table is out of range.

quokka guide_configuration.tcl
Updated aperture size for p1, p1lp, p1lens in the guide configuration table.

r2969 | ffr | 2010-07-01 22:09:09 +1000 (Thu, 01 Jul 2010) | 20 lines
2012-11-15 17:04:40 +11:00
Ferdi Franceschini
3d5d94c1dd sct_rfamp.c
SICS-405 Protocol handler always reports "SET" failed. Implemented workaround so that it always succeeds until we have a proper fix.

server_config.tcl
Set opal_simulation=true until we implement the new LSS feedback

r2940 | ffr | 2010-05-28 11:36:25 +1000 (Fri, 28 May 2010) | 6 lines
2012-11-15 17:03:35 +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
c3ed712321 New commands added by Andrew Studer to SICS Release 2.4
r2896 | ffr | 2010-04-30 14:14:59 +1000 (Fri, 30 Apr 2010) | 2 lines
2012-11-15 17:00:48 +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
c73c4c85c8 Merges from ics1-wombat
r2834 | ffr | 2009-12-09 17:07:45 +1100 (Wed, 09 Dec 2009) | 2 lines
2012-11-15 16:57:39 +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
86d5b0fef9 Update mom hard upper limit to 103
r2770 | ffr | 2009-03-31 17:48:28 +1100 (Tue, 31 Mar 2009) | 2 lines
2012-11-15 16:57:17 +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
Ferdi Franceschini
b134c901c5 Wombat
hipd/config/commands/commands.tcl
Added some of the procedures in extraconfig.tcl as "commands"

motors/sct_jogmotor_common.tcl
Added stop command.  Send SH, JG and BG commands on one line when jogging motor.

fakeDMC
dmc2280Server.tcl
mkSimAxes.tcl
simAxis.tcl
Added jog command.

exebuf.c
Batch file executor now sends a BATCHEND event when there is an AbortBatch interrupt.
This means we can now execute cleanup comands when a batch file terminates.

r2764 | ffr | 2009-01-23 16:06:03 +1100 (Fri, 23 Jan 2009) | 17 lines
2012-11-15 16:56:55 +11:00
Ferdi Franceschini
0c69a21706 Incorporated in-situ modifications to Release 2.2
r2731 | ffr | 2008-11-03 19:59:56 +1100 (Mon, 03 Nov 2008) | 2 lines
2012-11-15 16:56:17 +11:00
Ferdi Franceschini
04e2e75d80 All
Added "STARTING" message to the histmem command status.
Can now make multiple script context positional motors
Added table and table entry IDs for posit motor lookup tables.
Fixed the runsics script so that the stop command sends an EndServer interrupt via the UDP port instead of killing SICS, this ensures that status is saved.

Platypus
Added chopper speed, phase and phase offsets for all choppers on hdb tree and in datafile

Quokka
Replace the sample/select command with the changer_position script context positional motor interface.
Fixed upper limit on apx motor
Added full sample changer and auto aperture positional motors

r2727 | ffr | 2008-10-31 15:37:32 +1100 (Fri, 31 Oct 2008) | 14 lines
2012-11-15 16:56:00 +11:00
Ferdi Franceschini
81f98bd337 commands_common.tcl
Added histmem and runscan command

hmm_configuration_common_1.tcl
Set histmem_cmd  status feedback to IDLE on COUNTEND event

nxscripts_common_1.tcl
When saving a set of files the time-stamp is offset from the time the first file is created.

scan_common_1.tcl
The hmscan hook functions now set feedback on the runscan_cmd

sct_positmotor_common.tcl
Added mk_sct_positmotor command to create a script context controller which runs a motor to an indexed position.

Added positmotor_configuration.tcl to echidna, wombat, kowari, quokka, platypus.

sans/config/motors/positmotor_configuration.tcl
Has an example of a positmotor configuration for the sample changer

sanx/quokka_configuration.tcl
Setup feedback nodes for AttRotDeg and RotApDeg.

motor_utility.tcl
Added reldrive and relrun commands along with getmotpar convenience command.

r2725 | ffr | 2008-10-27 15:55:48 +1100 (Mon, 27 Oct 2008) | 26 lines
2012-11-15 16:55:51 +11:00
Ferdi Franceschini
0adecdcec9 PSI UPDATE
r2720 | ffr | 2008-10-13 15:40:07 +1100 (Mon, 13 Oct 2008) | 2 lines
2012-11-15 16:53:52 +11:00
Ferdi Franceschini
c30ce9c5a0 Added west400.tcl config to wombat config/environment/temperature
util/utility.tcl
The 'setpoint_script' for temperature controllers is now generated by '::utility::macro::getset'

r2706 | ffr | 2008-09-25 08:47:12 +1000 (Thu, 25 Sep 2008) | 5 lines
2012-11-15 13:43:08 +11:00
Ferdi Franceschini
e1cea8763e common_instrument_dictionary.tcl
instrument/slits is now an NXaperture and collects all 'slits' objects.

instdict_specification.tcl
Added 'slits' to sobj_klass_list

motor_configuration.tcl files
Reverted 18/09/08

r2701 | ffr | 2008-09-24 08:44:01 +1000 (Wed, 24 Sep 2008) | 9 lines
2012-11-15 13:42:48 +11:00
Ferdi Franceschini
ab218f64b6 source_common.tcl
SICS-280 Check RCMS data-type and return -1 if it's invalid

motor_configuration.tcl files
Make sure that long_name matches data name for slit motors in data file.

hmm_configuration_common_1.tcl
SICS-268 Don't set VIEW_MAG_X/Y on histmem

r2699 | ffr | 2008-09-22 15:58:31 +1000 (Mon, 22 Sep 2008) | 9 lines
2012-11-15 13:42:39 +11:00
Ferdi Franceschini
cc640e2fb0 lakeshore340_common.tcl
Now supports creation of multiple lakeshore controller objects.

hmm_configuration_common_1.tcl
SICS-275 histmem command now rejects invalid frame source arguments

hipd/config/environment/temperature/lakeshore340.tcl
Now supports creation of multiple lakeshore controller objects.

wombat_configuration.tcl
Added example which creates two lakeshore controllers.

rsd/config/motors/motor_configuration.tcl
SICS-276 Disable debug mode on sz motor.

r2694 | ffr | 2008-09-18 12:20:09 +1000 (Thu, 18 Sep 2008) | 15 lines
2012-11-15 13:42:19 +11:00
Ferdi Franceschini
c35f37420e Added stitch ordering parameter
r2689 | ffr | 2008-08-29 22:18:17 +1000 (Fri, 29 Aug 2008) | 2 lines
2012-11-15 13:41:58 +11:00
Ferdi Franceschini
2b02d7d1f1 SICS-215, SICS-234 Fixed two-theta direction.
r2683 | ffr | 2008-08-29 01:24:56 +1000 (Fri, 29 Aug 2008) | 2 lines
2012-11-15 13:41:34 +11:00
Ferdi Franceschini
8090104407 ##################################
SICS-226

util/utility.tcl
Added set_chopper_attributes to set hdb metadata on chopperadapters

server_config.tcl
Set hdb metadata on chopperadapters

hipadaba_configuration_common.tcl
:hdb::sobjadd can now add chopperadapters to the hdb tree
::hdb::cmd_par now preserves case when adding command parameters.

instdict_specification.tcl
Added chopperadapter sicstype and disk_chopper class

nxscripts_common_1.tcl
Added chopperadapter save and sdsinfo commands.

reflectometer/config/chopper/chopper.tcl
Set units on chopperadapters.

 ##################################

hipd,hrpd,rsd, /config/commands.tcl
Add instrument specific initialisation procedure for commands

reflectometer/config/commands.tcl
Created omega_2theta and set_mode commands from Andrew Nelson's procs in extraconfig.tcl

reflectometer/.../motor_configuration.tcl
Added ds and rs prefix to the two_theta drive and read scripts to prevent name collision with the two_theta procs in commans.tcl

SICS-108 reflectometer/../parameters.tcl
Added parameters for guide, slit and chopper distances and elements.

SICS-108 common_instrument_dictionary.tcl
Make parameters saveable

r2678 | ffr | 2008-08-18 13:01:29 +1000 (Mon, 18 Aug 2008) | 40 lines
2012-11-15 13:41:13 +11:00