Commit Graph

77 Commits

Author SHA1 Message Date
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
Ferdi Franceschini
348bd3aed1 SICS-46
commands_common.tcl
Added ::motor::go_home command to run motors to their home positions.

hrpd,hipd,rsd,sans,reflectometer/commands.tcl
Initilise ::motor::is_homing_list for the ::motor::go_hom command

util/command.tcl
Allow an empty parameter list

server_config.tcl
Call the "commands" initilisation function on server init

motor_asim.c
Added the "home" parameter so we can test the go_home command

r2677 | ffr | 2008-08-14 15:00:18 +1000 (Thu, 14 Aug 2008) | 17 lines
2012-11-15 13:41:09 +11:00
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
e31aa973a6 Merged release 2.1
r2664 | ffr | 2008-07-18 14:33:39 +1000 (Fri, 18 Jul 2008) | 2 lines
2012-11-15 13:40:36 +11:00
Ferdi Franceschini
8fb864ee37 Incorporate changes from deployed motor configurations.
r2663 | ffr | 2008-07-18 12:39:35 +1000 (Fri, 18 Jul 2008) | 2 lines
2012-11-15 13:40:32 +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
3a40ea5693 Merged release 2.0 patch-set 1 (RELEASE-2_0P1 )
r2624 | ffr | 2008-06-12 09:05:36 +1000 (Thu, 12 Jun 2008) | 2 lines
2012-11-15 13:39:10 +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
Douglas Clowes
a16d3d38d4 fix typo
r2593 | dcl | 2008-05-29 14:53:32 +1000 (Thu, 29 May 2008) | 2 lines
2012-11-15 13:37:44 +11:00
Douglas Clowes
e235fd85cc Adjust limits to reflect reality
r2521 | dcl | 2008-05-12 11:06:18 +1000 (Mon, 12 May 2008) | 2 lines
2012-11-15 13:36:57 +11:00
Douglas Clowes
2ea2923399 modify limits on som
r2387 | dcl | 2008-03-07 16:11:52 +1100 (Fri, 07 Mar 2008) | 2 lines
2012-11-15 13:33:43 +11:00
Ferdi Franceschini
e7547a18ab Use ::histogram_memory::upload_config instead of the deprecated ::histogram_memory::configure_server procedure.
r2283 | ffr | 2008-01-15 14:56:36 +1100 (Tue, 15 Jan 2008) | 2 lines
2012-11-15 13:32:19 +11:00
Ferdi Franceschini
45fb8a2865 Set maximum number of channels when using simulated driver.
r2245 | ffr | 2007-11-07 15:57:02 +1100 (Wed, 07 Nov 2007) | 2 lines
2012-11-15 13:29:56 +11:00
Ferdi Franceschini
bc19061460 Don't make plc object when in simulated mode.
r2243 | ffr | 2007-11-07 15:54:45 +1100 (Wed, 07 Nov 2007) | 2 lines
2012-11-15 13:29:48 +11:00
Ferdi Franceschini
04d0a2ab9a Nexus dictionaries are now generated dynamically from the hdb tree, we no longer need to cobble together operation specific dictionaries when deploying SICS.
r2239 | ffr | 2007-11-07 15:44:44 +1100 (Wed, 07 Nov 2007) | 2 lines
2012-11-15 13:29:33 +11:00
Ferdi Franceschini
0b53e28ef0 We're now saving two theta, not polar angle.
r2230 | ffr | 2007-11-05 14:23:46 +1100 (Mon, 05 Nov 2007) | 2 lines
2012-11-15 13:29:00 +11:00
Ferdi Franceschini
a9b10d5451 Added placeholder for pre_hmscan_prepare hook.
r2227 | ffr | 2007-11-05 13:27:14 +1100 (Mon, 05 Nov 2007) | 2 lines
2012-11-15 13:28:48 +11:00
Ferdi Franceschini
e8982428e0 Add convenience histmem command wrapper for command line users.
Improve simulation support.

r2226 | ffr | 2007-11-05 13:25:15 +1100 (Mon, 05 Nov 2007) | 3 lines
2012-11-15 13:28:44 +11:00
Douglas Clowes
317c7398ca Move functions to motor_utility
r2199 | dcl | 2007-10-29 13:59:58 +1100 (Mon, 29 Oct 2007) | 2 lines
2012-11-15 13:27:04 +11:00
Ferdi Franceschini
a173158d0e Create extra hmm objects to fetch xy, yt, t, ..., etc. data from the histogram server.
r2166 | ffr | 2007-09-26 16:22:43 +1000 (Wed, 26 Sep 2007) | 2 lines
2012-11-15 13:25:03 +11:00
Ferdi Franceschini
091dc0d2d2 Copy config files for new hdb/nexus support.
Copy cylindrical detector configuration

r2125 | ffr | 2007-08-16 16:45:23 +1000 (Thu, 16 Aug 2007) | 3 lines
2012-11-15 13:22:36 +11:00
Ferdi Franceschini
950037bfc3 Don't MakeAsyncQueue when using simulated driver.
Add metedata to slit gap and offset motors for new hdb and nexus code.

r2123 | ffr | 2007-08-16 16:37:45 +1000 (Thu, 16 Aug 2007) | 3 lines
2012-11-15 13:22:29 +11:00
Ferdi Franceschini
307e29e60e Added instrument specific initialisation function.
r2122 | ffr | 2007-08-16 16:31:37 +1000 (Thu, 16 Aug 2007) | 2 lines
2012-11-15 13:22:25 +11:00
Ferdi Franceschini
33af13cdd1 Use new common hipada config file.
r2121 | ffr | 2007-08-16 16:09:42 +1000 (Thu, 16 Aug 2007) | 2 lines
2012-11-15 13:22:22 +11:00
Ferdi Franceschini
a483a327b0 Added empty set_sobj_attributes proc.
r2120 | ffr | 2007-08-16 16:05:50 +1000 (Thu, 16 Aug 2007) | 2 lines
2012-11-15 13:22:18 +11:00
Douglas Clowes
f374e445bf multichan becomes AsyncQueue and AsyncProtocol
r1965 | dcl | 2007-05-15 13:15:34 +1000 (Tue, 15 May 2007) | 2 lines
2012-11-15 13:17:25 +11:00
Douglas Clowes
bc3224a9c4 changes to mtth
r1959 | dcl | 2007-05-11 17:34:24 +1000 (Fri, 11 May 2007) | 2 lines
2012-11-15 13:17:04 +11:00
Ferdi Franceschini
6d9120f796 Added motor_driver_type variable so we can switch between the real (DMC2280) drivers and the simulated drivers.
r1956 | ffr | 2007-05-10 16:12:25 +1000 (Thu, 10 May 2007) | 2 lines
2012-11-15 13:16:54 +11:00
Ferdi Franceschini
717f9beea7 Tidied up indents etc, to make it easy to compare diffs against the echidna config.
r1950 | ffr | 2007-05-10 13:18:06 +1000 (Thu, 10 May 2007) | 2 lines
2012-11-15 13:16:34 +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
86b99280d4 Merged the simulation mode setup from the trunk with the modified setmode command from the branch.
r1945 | ffr | 2007-05-08 14:59:26 +1000 (Tue, 08 May 2007) | 2 lines
2012-11-15 13:16:20 +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
d0b8de93b1 Provided option to use simulated hmm drivers.
r1852 | ffr | 2007-04-13 12:57:17 +1000 (Fri, 13 Apr 2007) | 2 lines
2012-11-15 13:14:39 +11:00
Ferdi Franceschini
1c65171e4e Create beam monitor in instrument specific configuration and provide option for creating simulated beam monitor driver.
r1851 | ffr | 2007-04-13 12:52:49 +1000 (Fri, 13 Apr 2007) | 2 lines
2012-11-15 13:14:35 +11:00
Douglas Clowes
3534fcefb9 Remove trailing spaces to reduce differences with echidna
r1845 | dcl | 2007-04-10 10:31:41 +1000 (Tue, 10 Apr 2007) | 2 lines
2012-11-15 13:14:19 +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
b250273deb Change filter "type" for slits to "aperture" and add grouping information.
r1788 | ffr | 2007-04-02 18:22:56 +1000 (Mon, 02 Apr 2007) | 2 lines
2012-11-15 13:13:48 +11:00
Ferdi Franceschini
f338cf5b4e Map motor types to hipadaba paths in the motor_hpath tuple list.
r1787 | ffr | 2007-04-02 18:20:20 +1000 (Mon, 02 Apr 2007) | 2 lines
2012-11-15 13:13:45 +11:00
Douglas Clowes
636fb54aa7 Make the slits cartesian and do a little cleaning up
r1781 | dcl | 2007-04-02 15:00:20 +1000 (Mon, 02 Apr 2007) | 2 lines
2012-11-15 13:13:29 +11:00
Ferdi Franceschini
bb588c7d05 Fixed duplication of ss1u for long_name calls.
r1768 | ffr | 2007-04-01 12:25:40 +1000 (Sun, 01 Apr 2007) | 2 lines
2012-11-15 13:12:46 +11:00
Ferdi Franceschini
4712347649 Both hipd and hrpd motors have now been configured with part identifiers and and long names, and the hpaths now use the long_name fields.
r1766 | ffr | 2007-04-01 11:58:58 +1000 (Sun, 01 Apr 2007) | 2 lines
2012-11-15 13:12:39 +11:00
Ferdi Franceschini
467943d64c Set motor position datasets to rank 1.
r1761 | ffr | 2007-04-01 10:03:26 +1000 (Sun, 01 Apr 2007) | 2 lines
2012-11-15 13:12:23 +11:00
Ferdi Franceschini
db9a45ff1e The instrument specific hmm configurations are now responsible for creating the hmm and hmc objects. This makes it possible to drop dummy or instrumented histogram memory objects into the common setup and control code.
r1754 | ffr | 2007-03-31 11:30:31 +1000 (Sat, 31 Mar 2007) | 2 lines
2012-11-15 13:11:59 +11:00
Douglas Clowes
5960ce1d00 Modify to use multichannel controller for motor connections
r1722 | dcl | 2007-03-26 08:09:46 +1000 (Mon, 26 Mar 2007) | 2 lines
2012-11-15 13:10:14 +11:00
Ferdi Franceschini
aaba6ffb44 Set new browser view display format.
r1700 | ffr | 2007-03-22 18:34:14 +1100 (Thu, 22 Mar 2007) | 2 lines
2012-11-15 13:09:12 +11:00
Ferdi Franceschini
737635dbd7 Source common counter configuration.
r1699 | ffr | 2007-03-22 18:32:29 +1100 (Thu, 22 Mar 2007) | 2 lines
2012-11-15 13:09:09 +11:00
Ferdi Franceschini
69d58fbaca Reduce entries for each "real" motor to just three types by nexus group.
TODO: Configurable virtual motors.

r1686 | ffr | 2007-03-20 12:03:35 +1100 (Tue, 20 Mar 2007) | 3 lines
2012-11-15 13:08:31 +11:00
Ferdi Franceschini
978b06587c Use new hmm setup and initialisation functions and initialise hmm_start to read from the start of the histogram memory for each instrument.
r1685 | ffr | 2007-03-20 11:59:53 +1100 (Tue, 20 Mar 2007) | 2 lines
2012-11-15 13:08:28 +11:00