Commit Graph

44 Commits

Author SHA1 Message Date
Douglas Clowes
92d3acb5d5 Remove superfluous trailing white space from TCL files 2014-05-16 17:23:58 +10:00
Ferdi Franceschini
5d40914ee0 Fix typo to stop the scan command from checking thread0 on tclmot motors. 2013-12-20 09:09:02 +11:00
Ferdi Franceschini
ffdd508bc8 Make sure that scans only save scratch files if called with 'savetype nosave' 2013-10-15 02:56:43 +11:00
Ferdi Franceschini
82567c7394 Rename mvrunscan to mscan 2013-08-22 07:55:47 +10:00
Ferdi Franceschini
0de5ee41e2 SICS-656 Make a multivariable runscan command.
SICS-649 Return to initial position after a scan for Platypus
2013-08-09 05:30:58 +10:00
Ferdi Franceschini
1486481a4c Revert scan config changes made for Dingo. They broke the bmonscan and hmscan objects. 2013-07-08 11:42:25 +10:00
Jing Chen
17e5c61d62 Integrate Dingo Camera Server Stuffs 2013-05-22 11:10:21 +10:00
Ferdi Franceschini
e7a478489e Copied in-situ modifications from ics1-quokka. 2013-02-20 18:19:44 +11:00
Ferdi Franceschini
9ef0bb8afd Make sure bmon scans can save scratch files when the savetype is set to nosave.
r3624 | ffr | 2012-06-29 16:12:30 +1000 (Fri, 29 Jun 2012) | 2 lines
2012-11-15 17:31:53 +11:00
Ferdi Franceschini
a24df1fc78 SICS-477 In the runscan command restrict mode to 'time' and 'monitor' when the detector type is
set to 'bmon'.  Also check that detector type is either 'bmon' or
'histmem'.

r3592 | ffr | 2012-06-05 08:21:33 +1000 (Tue, 05 Jun 2012) | 4 lines
2012-11-15 17:30:06 +11:00
Ferdi Franceschini
6b3f71cc6a SICS-477 Modified the runscan command to do bmon scans as well as
hmscans.  The type of scan is determined by the new "detector" parameter
on the /commands/scan/runscan tree.  It is fixed to 'bmon' for Taipan
but is selectable on other instruments with default="histmem"

r3589 | ffr | 2012-06-04 20:11:51 +1000 (Mon, 04 Jun 2012) | 5 lines
2012-11-15 17:29:52 +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
d9da95a5df sct_protek608.c
Implements a protocol handler for the protek  608 multimeters which just allows us to read the display.
It reports all elements of the display including the bar graph, it does not provide remote control of the multimeter.  The protocol handler broadcasts a warning to all clients if the auto-off function is enabled.

sct_rfamp.c
This is a protocol handler for the Mirrortron 35V 7A AC Generator (ANSFR-83B).

sinqhttpprot.c
Copied the PSI script context http protocol handler.

sct_orhvpsprot.c
Ordela high voltage power supply protocol handler now catches unknown commands.

sct_eurotherm_2000.tcl
Eurotherm controller for the kowari load frame by Douglas Clowes.

sct_lakeshore_3xx.tcl
Latest update from Arndt.  The two control loops are now independent, settletime and tolerance now work properly.

common_instrument_dictionary.tcl
Make instrument/status saveable.

sct_orhvps_common.tcl
Provides voltage ramping and implements the dhv1 command for the Ordela HVPS via the sct_orhpsprot.c protocol handler.

hmm_configuration_common_1.tcl
Adds new "histmem clockscale" subcommand to get and set the clock scale from the fat_clock_scale FAT parameter.
You can now upload the FAT FRAME_BUFFER and FRAME_DUTYCYCLE parameters to the histogram memory.
The veto commands are now "histmem veto on" and "histmem veto off".

hmm_object.tcl
The axis order for the histmem object has been restore to t,y,x

sct_positmotor_common.tcl
Code has been simplified.

nxscripts_common_1.tcl
Removed obsolete ::nexus::data function.  TOF axis now correctly report time_of_flight instead of "time".

plc_common_1.tcl
Make PLC info saveable.

scan_common_1.tcl
SICS-385 The scan command should check the final scan variable value against he soft upper and lower limits, not against the hard limits.
Make sure that the scan variable axis is saved.

platypus, kowari, quokka hmm_configuration.tcl
Use the HOR and VER entries in the new histmem_axes hash to select the horizontal and vertical axes for the histmem.

kowari motor_configuration.tcl secondary_slit_configuration.tcl
Flatten slits motor structure to match old layout in data files.

quokka commands.tcl
SICS-380 EApPosYmm -> EApPosY

quokka detector.tcl
Use new script context controller for Ordela HVPS

quokka hmm_configuration.tcl
Set detector height to 5.08*192 the same as the width

quokka motor_configuration.tcl
Code cleanup

quokka positmotor_configuration.tcl
Use new positmotor code.

quokka aperture_configuration.tcl
Added attenuation factor column to AttRotLookupTable

quokka parameters.tcl
SICS-380 Refactor nexus, remove redundant parameters.

site_ansto.c
Added the following protocols, Httpl, Protek608, aand RFAmp.

scriptcontext.c
SICS-386 SctActionHandler: set "send" string to NULL when a chain of scripts completes with state=idle.
It turns out that if none of the scripts in the "read chain" call [sct send] each time the chain is executed, then SICS will hammer the device with calls to AsconWrite(). This can be avoided if SctActionHandler sets the 'send' string to NULL before "goto finish" in the idle state. This will be safer and still let you have chains with multiple [sct send] and read scripts.

asyncprotocol.c
Fix platypus memory leak.

devser.c
SICS-387 Started adding code to pass signals on to script context drivers.

ascon.c
AsconTask(): Make sure we return to the AsconIdle state when sending a command which expect no response, also only reconnect if there is a Timeout when there has been an error.

r2888 | ffr | 2010-04-19 14:04:41 +1000 (Mon, 19 Apr 2010) | 90 lines
2012-11-15 17:00:29 +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
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
801ec1430b The motor lowerlimits were being checked against the scan target position instead of the
scan start position.

r2691 | ffr | 2008-09-16 14:33:15 +1000 (Tue, 16 Sep 2008) | 3 lines
2012-11-15 13:42:06 +11:00
Ferdi Franceschini
e390dcb920 SICS-261 hmscan aborts when instrument isn't ready
You can now call "force_scan" to force an hmscan

r2685 | ffr | 2008-08-29 21:47:57 +1000 (Fri, 29 Aug 2008) | 3 lines
2012-11-15 13:41:42 +11:00
Ferdi Franceschini
dd927d18af hmm_configuration_common_1.tcl
Set histmem view mag to auto
Workaround for SICS-204 hmc sets bm preset to 0

hrpd/config/count/counter.tcl
reflectometer/config/count/counter.tcl
echidna only has two beam monitors enabled
SICS should not start or stop the third beam monitor on platypus

config/scan/scan_common_1.tcl
Show counts from available beam monitors during scans

r2649 | ffr | 2008-07-14 15:15:58 +1000 (Mon, 14 Jul 2008) | 12 lines
2012-11-15 13:40:27 +11:00
Ferdi Franceschini
7431af42d9 Remove obsolete code
r2648 | ffr | 2008-07-11 14:46:01 +1000 (Fri, 11 Jul 2008) | 2 lines
2012-11-15 13:40:23 +11:00
Ferdi Franceschini
1f0f5fe72e commands_common.tcl
scan_common_t.tcl
Remove redundant filename entries from bmonscan and hmscan feedback

reflectometer/config/parameters/parameters.tcl
Put instrument parameters under hdb parameters section a la Quokka

r2645 | ffr | 2008-07-11 11:42:52 +1000 (Fri, 11 Jul 2008) | 7 lines
2012-11-15 13:40:11 +11:00
Ferdi Franceschini
01be487c52 pelican
Create pas/config/source/source.tcl
config/source/source_common.tcl
pelican_configuration.tcl

deploySICS.sh
Don't deploy script validator configs, they are obsolete

server_config.tcl
Source config has been moved to  config/source and is specialised for each instrument by calling the instrument specific initialiser ::source:isc_initalize

commands_common_1.tcl
The monitor mode and preset are recorded when running the count command

counter_common_1.tcl
Report and record the counts and time for the multicounter and each monitor.  Also record the mode and preset for the multicounter.

hmm_configuration_common_1.tcl
Cleanup, remove obsolete code.
Report and record the hmm total counts and time.
Allow monitor controlled acquisition from the histogram server

nxscripts_common_1.tcl
Add DataType to NXdata section, preserve case in text attributes.

scan_common_1.tcl
Provide sensible feedback for our bmonscan and hmscan objects.
Set run_mode when doing a scan.  Allow users to select the datatype for histmem scans and to force a scan

wombat_configuration.tcl
echidna_configuration.tcl
platypus_configuration.tcl
kowari_configuration.tcl
quokka_configuration.tcl
Load source config.

quokka_configuration.tcl
SICS-198 HACK, Add AttrotDeg and RotApDeg status feedback.

sans/commands/commands.tcl
Add status feedback for quokka "guide" command.

sans/parameters/parameters.tcl
Make sure data can be saved as xml (replace % with _percent)
SICS-198 HACK, add AttRotDeg and RotApDeg status feedback.

utility.tcl
Fix nasty "params array generator" bug.  SICS commands execute at runlevel 0 which means that the params anonymous array must be made at this level.
Provide the normalattlist command to enable creating attribute lists with the case preserved.

Added the runsics, runtestsics and sicsclient scripts to CVS.
Added source configurations for echidna, wombat, kowari, quokka, platypus, and pelican to CVS

r2644 | ffr | 2008-07-11 11:09:57 +1000 (Fri, 11 Jul 2008) | 53 lines
2012-11-15 13:40:07 +11:00
Ferdi Franceschini
0f96e4f82f server_config.tcl
server_init now calls ::counter::isc_initialize, ::histogram_memory::isc_initialize and ::scan::isc_initialize

scan.c
SICS-158  Restrict bmonscan and hmscan to only one scan variable

count_common.tcl
Create a mulicounter which uses the available monitors as channels.  The multicounter is used in bmonscans

hipadaba_configuration_common.tcl
Use _link as the suffix for the nxvgroup name when making nexus file links.

hmm_configuration_common.tcl
SICS-190 Create hdb entries for bm_counts, bm_event_rate, bm_status
SICS-164 Allow running histmem in simulated mode.

hmm_cylindrical_detector_configuration.tcl
Only refer to detector SICSVariables when necessary, otherwise we get dependency problems.

nxscripts_common_1.tcl
Separate histmem_filtype_spec from bmon_filetype_spec so that we can use the histem_filetyp_spec names to restrict the histmem scan filetypes.
Close the data file on error in proc ::nexus::save
Allow int and text types when saving macro data

scan_common_1.tcl
SICS-173  Allow users to force a scan when the instrument isn't ready
Added ic_initialize proc so we can make dependencies explicit in the init_server proc
SICS-186 Allow monitor modes for histmem scans
Allow selection of histmem file policies from runscan command

echidna, wombat, kowari, quokka and platypus component and server configurations
Added instrument specific configuration initialisation functions in the component configuration files.
Add a catch block to the top-level instrument server configuration file and printout the errorContext and callStack

r2641 | ffr | 2008-07-01 17:02:26 +1000 (Tue, 01 Jul 2008) | 34 lines
2012-11-15 13:39:55 +11:00
Ferdi Franceschini
528d125efe Fixes SICS-144
target value was wrong when checking scan variable.

r2623 | ffr | 2008-06-11 16:26:36 +1000 (Wed, 11 Jun 2008) | 3 lines
2012-11-15 13:39:06 +11:00
Ferdi Franceschini
0749b0effa Merging release 2.0 branch with CVS trunk
r2601 | ffr | 2008-05-30 10:26:57 +1000 (Fri, 30 May 2008) | 2 lines
2012-11-15 13:38:17 +11:00
Ferdi Franceschini
6c63380822 Provide a runscan_reset_position variable so we can make the "runscan" command behaviour instrument specific. It defaults to false, which means that the scan motor position won't be reset on scan finish.
r2242 | ffr | 2007-11-07 15:51:37 +1100 (Wed, 07 Nov 2007) | 2 lines
2012-11-15 13:29:44 +11:00
Ferdi Franceschini
5eaae53de0 Remove namespace qualification when setting attributes on runscan
r2234 | ffr | 2007-11-06 14:47:01 +1100 (Tue, 06 Nov 2007) | 2 lines
2012-11-15 13:29:14 +11:00
Ferdi Franceschini
c661cf16a7 Check that the instrument is ready before starting a scan.
Added "runscan" command using syntax requested by Andy Nelson for platypus.

r2205 | ffr | 2007-10-31 16:51:16 +1100 (Wed, 31 Oct 2007) | 3 lines
2012-11-15 13:27:26 +11:00
Ferdi Franceschini
8b1996996a Terminition conditions when acquiring detector data are now controlled by the histogram server instead of the beam monitor. So more termination methods are now available and timed counts should be more precise.
hmm_configuration_common_1.tcl
Map hmm dim0,1,2 to histogram server OAT dimensions.
Added commands to set the histogram server count method, size and stop condition.

scan_common_1.tcl
hmscan is now controlled by the histogram server instead of the beam monitor.
NOTE: the mode and preset parameters for hmscan run are now ignored in favour of the parameters set on the hmm object.

r2189 | ffr | 2007-10-23 12:40:09 +1000 (Tue, 23 Oct 2007) | 10 lines
2012-11-15 13:26:27 +11:00
Ferdi Franceschini
78c42a2427 Don't set plottable data links and data save policy here, this is now taken care of when setting the data file policy with the 'newfile' command.
Only check if  scan variables of type=motor are locked (ie 'fixed') in position before running a scan.

r2161 | ffr | 2007-09-26 16:13:03 +1000 (Wed, 26 Sep 2007) | 3 lines
2012-11-15 13:24:45 +11:00
Ferdi Franceschini
6ce90065d3 Check scan variable limits before starting a scan.
Added reset_position option to hmm_scan_finish to drive motors back to their start position at the end of a scan.

r2119 | ffr | 2007-08-16 16:03:14 +1000 (Thu, 16 Aug 2007) | 3 lines
2012-11-15 13:22:14 +11:00
Ferdi Franceschini
8770acc191 Merged new hdb and nexus code.
r2099 | ffr | 2007-07-22 15:23:41 +1000 (Sun, 22 Jul 2007) | 2 lines
2012-11-15 13:21:03 +11:00
Ferdi Franceschini
55347984ec Checked files modified by the merge with:
cvs diff -u -rRELEASE-1_2-MERGEPOINT -rHEAD <filepath>
and found no modifications on the trunk between the release 1.2 mergepoint and cvs HEAD

r1946 | ffr | 2007-05-08 15:01:16 +1000 (Tue, 08 May 2007) | 4 lines
2012-11-15 13:16:23 +11:00
Ferdi Franceschini
ade5216ea9 Merged Release 1.2
r1897 | ffr | 2007-04-20 11:53:31 +1000 (Fri, 20 Apr 2007) | 2 lines
2012-11-15 13:15:32 +11:00
Ferdi Franceschini
d49a7be3bb Create single entry nexus files for scans with instrument state in 1D arrays indexed by scan point.
Use putslab and sics data objects to grow arrays.

r1725 | ffr | 2007-03-27 08:04:19 +1000 (Tue, 27 Mar 2007) | 3 lines
2012-11-15 13:10:24 +11:00
Ferdi Franceschini
5d593ff615 Bring into line with changes in the hmm common configuration file.
r1718 | ffr | 2007-03-24 19:21:21 +1100 (Sat, 24 Mar 2007) | 2 lines
2012-11-15 13:10:07 +11:00
Ferdi Franceschini
4568b365a6 Make bmonscan graphics view info independent of the bmonscan feedback.
r1715 | ffr | 2007-03-24 14:44:03 +1100 (Sat, 24 Mar 2007) | 2 lines
2012-11-15 13:09:58 +11:00
Ferdi Franceschini
e2c2657dcd Use the following generic node names for graph data
(see Jira SICS-32)
axis - 1D float array for x axis data
data - 1D float array for y axis data
lastaxis - last updated x value
lastdata -last updated y value

r1698 | ffr | 2007-03-22 18:31:18 +1100 (Thu, 22 Mar 2007) | 7 lines
2012-11-15 13:09:06 +11:00
Ferdi Franceschini
17b5fe7ca6 Bring into line with changes in nxscripts_common_1.tcl
Code cleanup.

r1681 | ffr | 2007-03-20 11:43:24 +1100 (Tue, 20 Mar 2007) | 3 lines
2012-11-15 13:08:15 +11:00
Ferdi Franceschini
abc0b0a3f3 Added channel select to GTI bmonscan command.
r1655 | ffr | 2007-03-15 09:46:33 +1100 (Thu, 15 Mar 2007) | 2 lines
2012-11-15 13:06:56 +11:00
Ferdi Franceschini
1adad6351f Refactoring: for new utility.tcl:getinfo
Use consistent naming scheme for scancommand variables

r1646 | ffr | 2007-03-14 08:26:05 +1100 (Wed, 14 Mar 2007) | 3 lines
2012-11-15 13:06:34 +11:00
Ferdi Franceschini
b9731fc0ac Provide bmonscan graphics view and command feedback.
r1643 | ffr | 2007-03-13 16:43:45 +1100 (Tue, 13 Mar 2007) | 2 lines
2012-11-15 13:06:25 +11:00
Ferdi Franceschini
075cdabfa2 Use commands_hpath_setup and graphics_hpath_setup to generate scancommand hpaths.
r1638 | ffr | 2007-03-13 09:11:39 +1100 (Tue, 13 Mar 2007) | 2 lines
2012-11-15 13:06:16 +11:00
Ferdi Franceschini
0e348f7750 Refactoring:
Added init{} and hpath_setp{} to be called by hipadaba module to initialise variables and setup hpaths.
Transformed nxaddpoint and bm_nxaddpoint to a generic write_nxentry  which will be used by scan specific write commands.

r1626 | ffr | 2007-03-12 08:55:45 +1100 (Mon, 12 Mar 2007) | 4 lines
2012-11-15 13:05:39 +11:00
Ferdi Franceschini
0ac4cbaa94 Common instrument configuration files.
r1585 | ffr | 2007-03-05 16:34:13 +1100 (Mon, 05 Mar 2007) | 2 lines
2012-11-15 13:03:37 +11:00