Commit Graph

37 Commits

Author SHA1 Message Date
Ferdi Franceschini
d7cea6914c oscillate.c SICS-232
You can now run the oscillating collimator for a specified number of cycles.
A MOTEND event is now sent when the oscillator stops.
Also temporarily set status to eEager to allow changing the motor accesscode parameter while something else is running, (eg a counter)

motor.c
finishDriving is no longer static so we can call it from the oscilator and generate a MOTEND event.

west4100.c
Return 'success' from wrapper on "controlsensor" and "sensorlist" queries so we can test and capture their values in scripts.

Makefile
Compile the quokka beamstopaction object

site_ansto.c
Add the MakeActionObject command.  Currently only makes the hardcoded beamstopaction object

obpar.c
Report object name and parameter on an illegal attempt to set a parameter

hmm_configuration_common_1.tcl
Add oscillating collimator control flag for Wombat.  If true we use hmm to start the histogram server instead of hmc.  TODO remove hmc and always use hmm.

hipd/config/motors/motor_configuration.tcl
Don't load anticollider config twice.  Fix oct limits

wombat_configuration.tcl
Environment configuration must be loaded before running server_init.

hrpd/config/hmm/hmm_configuration.tcl
Fix default time-bin to match 10Hz frame frequency

hrpd/config/motors/motor_configuration.tcl
Added dummy motor for testing.

reflectometer/config/hmm/detector.tcl
Fill in dhv1 configuration parameters.

sans/config/hmm/detector.tcl
Enable detector voltage control

sans/config/hmm/hmm_configuration.tcl
SICS-227 set default resolution to 192x192

sans/config/motors/motor_configuration.tcl
Added dummy motor for testing

quokka parameters.tcl
Fix L2mm calculation, Fix SICS-228 users cannot set rotapdeg

beamstopaction.[ch]
NEW: Implements an action command to drive the quokka beamstops up and down.

r2670 | ffr | 2008-08-07 13:17:29 +1000 (Thu, 07 Aug 2008) | 53 lines
2012-11-15 13:40:44 +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
cc579068e5 Add num_events_filled_to_histo acq_dataset_active_sec to simulated hmm
r2646 | ffr | 2008-07-11 12:15:55 +1000 (Fri, 11 Jul 2008) | 2 lines
2012-11-15 13:40:15 +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
ef7c2a6f87 histmem.c
sicvar.c
SICS-93 Save histogram data and instrument state during an acquisition

hipadaba_configuration_common.tcl
SICS-185 Preserve case on hdb node names

hmm_configuration_common_1.tcl
nxscripts_common_1.tcl
sicvar.c
SICS-174 Allow saving of histmem data and instrument status during a count operation.

wombat_configuration.tcl
echidna_configuration.tcl
platypus_configuration.tcl
kowari_configuration.tcl
quokka_configuration.tcl
SICS-153 Move setup of statemon to new server_init function for the new sics_uid state variable

server_config.tcl
SICS-153 set attributes on the sics_suid var which is now created by MakeStateMon
SICS-187 Add cold source info (TODO move to platypus,quokka and pelican configs)

utility.tcl
SICS-185 Added normalgetatt to preserve case on hdb node names etc.

sans/config/optics/aperture_configuration.tcl
New file, Provides lookup tables for attenuation and entrance apertures. (SICS-157)

sans/config/optics/optics.tcl
Load the new aperture_configuration.tcl

sans/config/parameters/parameters.tcl
SICS-157 Add instrument parameters section with derived parameters and their dependencies

statemon.c
SICS-153 Create sics_suid sicsvariable when loading statemon and increment it on each status change.

r2635 | ffr | 2008-06-23 12:41:12 +1000 (Mon, 23 Jun 2008) | 38 lines
2012-11-15 13:39:42 +11:00
Ferdi Franceschini
3d3ecdd83e Merged configuration from release 2.0P1
Added appropriate defaults for frame source for each instrument.

r2619 | ffr | 2008-06-10 14:40:30 +1000 (Tue, 10 Jun 2008) | 3 lines
2012-11-15 13:39:02 +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
Mark Lesha
0f2cde7ed9 Changed SICS username and password to 'SICS' to suit new histogram server. Port is still 8080.
r2361 | mle | 2008-02-19 12:40:12 +1100 (Tue, 19 Feb 2008) | 2 lines
2012-11-15 13:33:12 +11:00
Ferdi Franceschini
1732ecdb99 Made sure that we run "hmm init" in a catch block to catch any attempt to modify an hmm parameter when it's not allowed.
The histmem command now returns clean error messages.
Stack traces are displayed for errors which are triggered from the second call level with the histmem command.
Made sure that catch blocks don't enclose a 'return' because this triggers the catch to report the contents of errorInfo.
Removed obsolete setup procedure.
Made sure that uploading of configuration files to the histogram server is only enabled for the 'hmm' object in the ::histogram_memory::upload_config procedure.  Uploading config files is disabled for all other histmem objects at all times.

r2282 | ffr | 2008-01-15 14:53:47 +1100 (Tue, 15 Jan 2008) | 7 lines
2012-11-15 13:32:15 +11:00
Ferdi Franceschini
b07f75f756 Added frame source option to histmem.
Allow forcing of frame source to internal (useful for scans on Platypus)

r2257 | ffr | 2007-11-09 17:09:36 +1100 (Fri, 09 Nov 2007) | 3 lines
2012-11-15 13:30:41 +11:00
Ferdi Franceschini
3d81b204d6 Frame source now defaults to EXTERNAL if setting a non-zero frame frequency.
r2251 | ffr | 2007-11-09 08:34:17 +1100 (Fri, 09 Nov 2007) | 2 lines
2012-11-15 13:30:19 +11:00
Ferdi Franceschini
0c6e24747f Make the default frame source setting instrument specific
r2240 | ffr | 2007-11-07 15:47:34 +1100 (Wed, 07 Nov 2007) | 2 lines
2012-11-15 13:29:37 +11:00
Ferdi Franceschini
2853f0ae66 Hide hmm objects from gumtree control view.
Improve feedback.

r2233 | ffr | 2007-11-06 14:43:46 +1100 (Tue, 06 Nov 2007) | 3 lines
2012-11-15 13:29:11 +11:00
Ferdi Franceschini
8550b93a00 Adapted ::nexus::script::save to use sicsdata objects for data arrays returned from script -arrayname
Added data, control, nxsave, mutable attributes to axes data scripts.

r2223 | ffr | 2007-11-05 13:17:36 +1100 (Mon, 05 Nov 2007) | 4 lines
2012-11-15 13:28:33 +11:00
Ferdi Franceschini
9a17f9249c Moved creation of histogram objects (including simulated drivers) to here.
Added frame_source parameter ::histogram_memory::set_frame_freq with a default of INTERNAL.  NOTE If the frequency parameter is zero then the frequency is set to 50Hz and the source is set to INTERNAL.

The instrument specific histogram memory configuration must now implement the "histmem" command and call the _histmem procedure, this lets us extend the command with instrument specific functions.

r2215 | ffr | 2007-11-01 12:57:43 +1100 (Thu, 01 Nov 2007) | 5 lines
2012-11-15 13:28:03 +11:00
Ferdi Franceschini
beb622526f Remove type prefixes from the "commands" which were refactored as tcl procedures.
r2214 | ffr | 2007-11-01 09:03:54 +1100 (Thu, 01 Nov 2007) | 2 lines
2012-11-15 13:27:59 +11:00
Ferdi Franceschini
5c66aa29ac Histogram memory data acquisition is now controlled by the histogram server.
Implemented "histmem" convenience command for use on command line and in batch files.
Make sure that the maximum time bin is set when setting the histogram memory frame frequency.
x_bin and y_bin axes are now available for nexus data entries.

r2203 | ffr | 2007-10-31 16:39:00 +1100 (Wed, 31 Oct 2007) | 5 lines
2012-11-15 13:27:19 +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
75e7862cc6 Fix order of axes to match the order in which the histogram memory is written
ie Time, Vertical, Horizontal.

r2171 | ffr | 2007-10-03 10:07:27 +1000 (Wed, 03 Oct 2007) | 3 lines
2012-11-15 13:25:21 +11:00
Ferdi Franceschini
baaeb44fc3 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.
Use common interface for hmm server TABLE configuration commands.
Remove obsolete code.

r2160 | ffr | 2007-09-26 16:11:40 +1000 (Wed, 26 Sep 2007) | 4 lines
2012-11-15 13:24:42 +11:00
Ferdi Franceschini
a8d5cff322 Added detector height and width variables.
Use anstohm_linked.xml so we can override default config.
Specify alias names for data axes.
Define macros for generating X, Y, T axes from bin boundaries.
XXX_TABLE procs now support the following subcommands, -clear, -init, -get, -list
OAT_TABLE now calculates bin boundaries, this is useful for generating axes.
Initialise OAT and FAT tables.

r2116 | ffr | 2007-08-16 14:50:04 +1000 (Thu, 16 Aug 2007) | 8 lines
2012-11-15 13:22:04 +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
4594b23f13 Merged in favour of branch.
Get the horizontal and vertical axis names for the data from the _hmm_{hor,vert}_axis SICS variables when saving data.
These variables are set by the command which collects the data.

r1944 | ffr | 2007-05-08 14:58:51 +1000 (Tue, 08 May 2007) | 4 lines
2012-11-15 13:16:16 +11:00
Ferdi Franceschini
c01188bc8b Fixed order of histogram memory data axes.
r1903 | ffr | 2007-04-23 10:34:44 +1000 (Mon, 23 Apr 2007) | 2 lines
2012-11-15 13:15:46 +11:00
Ferdi Franceschini
e7324b8335 Merged RELEASE-1_1 back into trunk.
r1836 | ffr | 2007-04-06 19:10:02 +1000 (Fri, 06 Apr 2007) | 2 lines
2012-11-15 13:13:55 +11:00
Ferdi Franceschini
f3a6c7bd49 OK, now here's the thing.
You have to save a dataset before you can link a VGroup to it.

r1779 | ffr | 2007-04-01 15:44:56 +1000 (Sun, 01 Apr 2007) | 3 lines
2012-11-15 13:13:22 +11:00
Ferdi Franceschini
3e8375c974 What's the point?
ie I forgot to set the run number.

r1778 | ffr | 2007-04-01 15:38:16 +1000 (Sun, 01 Apr 2007) | 3 lines
2012-11-15 13:13:19 +11:00
Ferdi Franceschini
9fbaec72fd The procedure which writes the data must write the run_number.
r1777 | ffr | 2007-04-01 15:34:26 +1000 (Sun, 01 Apr 2007) | 2 lines
2012-11-15 13:13:15 +11:00
Ferdi Franceschini
486b82c526 Fixed call to nxscript.
r1775 | ffr | 2007-04-01 15:19:04 +1000 (Sun, 01 Apr 2007) | 2 lines
2012-11-15 13:13:09 +11:00
Ferdi Franceschini
2d7cf89385 Set x and y pixel offsets and run number.
The run number is used as the first dimension axis for
simple count and save operations.

r1770 | ffr | 2007-04-01 14:36:09 +1000 (Sun, 01 Apr 2007) | 4 lines
2012-11-15 13:12:52 +11:00
Ferdi Franceschini
7526a7b93d Modified the simulated hmm configurations so that they now source the common config and override the hmc control, the histogram::initialize and the histogram::hmmdititemval procs.
r1753 | ffr | 2007-03-31 11:27:52 +1000 (Sat, 31 Mar 2007) | 2 lines
2012-11-15 13:11:56 +11:00
Ferdi Franceschini
a617837388 Update ::histogram_memory::save to handle writing to growable 3D arrays.
r1745 | ffr | 2007-03-30 17:51:35 +1000 (Fri, 30 Mar 2007) | 2 lines
2012-11-15 13:11:30 +11:00
Ferdi Franceschini
8ee21d58f4 The prepare count_with_bm and finish functions can now be used independently of scans.
Added count_with_bm and save commands

r1716 | ffr | 2007-03-24 19:12:51 +1100 (Sat, 24 Mar 2007) | 3 lines
2012-11-15 13:10:01 +11:00
Ferdi Franceschini
f19a328280 Store hmm_setup parameters in hmm_* SICS variables for use in file writing, the GumTree interface and commandline feedback code.
Set place holders for hpath setup and initialisation functions.

r1682 | ffr | 2007-03-20 11:50:11 +1100 (Tue, 20 Mar 2007) | 3 lines
2012-11-15 13:08:18 +11:00
Ferdi Franceschini
962dfd484b Created histogram_memory namespace.
Created functions to initialise and setup the histogram memory.

r1624 | ffr | 2007-03-12 08:41:30 +1100 (Mon, 12 Mar 2007) | 3 lines
2012-11-15 13:05:33 +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