Commit Graph

1176 Commits

Author SHA1 Message Date
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 b4fb916018 New common reactor source config
r2643 | ffr | 2008-07-11 10:48:32 +1000 (Fri, 11 Jul 2008) | 2 lines
2012-11-15 13:40:03 +11:00
Ferdi Franceschini cff9290272 SICS-195
countdriv.h
CounterDriver:  iControlMonitor id (default=0)

countdriv.c
CreateCounterDriver: set the default control monitor to channel zero

counter.h
counter.c
Commands to get and set the control monitor
GetCounts return the counts from the current control monitor, ie iControlMonitor
TODO loadCountData, get time from controlling monitor.

scan.c
Set control monitor on counter when setting scan channel

multicounter.c
MMCStart, set slave monitors with a  timer preset of about a year to make sure that they don't stop before the controlling monitor.

r2642 | ffr | 2008-07-10 15:21:21 +1000 (Thu, 10 Jul 2008) | 20 lines
2012-11-15 13:39:59 +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 c2186b037e Increase srce maxspeed to allow setting speed to 5 degrees/s
r2637 | ffr | 2008-06-23 12:58:58 +1000 (Mon, 23 Jun 2008) | 2 lines
2012-11-15 13:39:50 +11:00
Ferdi Franceschini e76d2094c6 SICS-168 Increase srce speed to 5 degrees per second
r2636 | ffr | 2008-06-23 12:54:30 +1000 (Mon, 23 Jun 2008) | 2 lines
2012-11-15 13:39:46 +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 eea4d4d9eb L2mm depends on sample position (ported from RELEASE-2_0P1)
r2634 | ffr | 2008-06-18 10:56:27 +1000 (Wed, 18 Jun 2008) | 2 lines
2012-11-15 13:39:38 +11:00
Ferdi Franceschini ee1ffd4468 Fix segfault triggered by addition of version info to low side server document element
r2631 | ffr | 2008-06-17 12:27:29 +1000 (Tue, 17 Jun 2008) | 2 lines
2012-11-15 13:39:34 +11:00
Douglas Clowes e59b073066 Align nhq200.c and orhvps.c to be more alike (and more diffable)
r2629 | dcl | 2008-06-12 17:23:40 +1000 (Thu, 12 Jun 2008) | 2 lines
2012-11-15 13:39:30 +11:00
Douglas Clowes 1795e07504 Add a beam monitor counter to Koala
r2628 | dcl | 2008-06-12 17:21:40 +1000 (Thu, 12 Jun 2008) | 2 lines
2012-11-15 13:39:26 +11:00
Douglas Clowes 4a88bf6fc1 cut out some older code
r2627 | dcl | 2008-06-12 17:20:58 +1000 (Thu, 12 Jun 2008) | 2 lines
2012-11-15 13:39:22 +11:00
Ferdi Franceschini 6c6156174f Manually merged the following changes from RELEASE-2_0P1
commands_common.tcl
fixed counter feedback

anticollider_common.tcl
implement anticollider administrative override

reflectometer,sans/.../anticollider.tcl
implement administrative override to move detector

r2626 | ffr | 2008-06-12 12:55:28 +1000 (Thu, 12 Jun 2008) | 11 lines
2012-11-15 13:39:18 +11:00
Ferdi Franceschini 177d5f3ed6 Provide a parameters and parameters/derived_parameters section as a one stop shop for all your instrument parameter needs.
r2625 | ffr | 2008-06-12 12:42:17 +1000 (Thu, 12 Jun 2008) | 2 lines
2012-11-15 13:39:14 +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 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 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
Douglas Clowes d495c3b43a Accept uA instead of mA in response to '#' as found on 6kV suplies
r2613 | dcl | 2008-06-06 14:18:25 +1000 (Fri, 06 Jun 2008) | 2 lines
2012-11-15 13:38:58 +11:00
Douglas Clowes 17e0c0b5bc get msd into gumtree
r2612 | dcl | 2008-06-05 16:24:32 +1000 (Thu, 05 Jun 2008) | 2 lines
2012-11-15 13:38:54 +11:00
Douglas Clowes c61c709b11 add msd klass unitsa and long_name
r2611 | dcl | 2008-06-05 15:32:42 +1000 (Thu, 05 Jun 2008) | 2 lines
2012-11-15 13:38:50 +11:00
Douglas Clowes 03853605c9 Redo stth and sz
r2610 | dcl | 2008-06-04 17:00:46 +1000 (Wed, 04 Jun 2008) | 2 lines
2012-11-15 13:38:46 +11:00
Douglas Clowes 419a746c77 Update sample stage limits and speeds
r2607 | dcl | 2008-06-04 16:08:08 +1000 (Wed, 04 Jun 2008) | 2 lines
2012-11-15 13:38:41 +11:00
Douglas Clowes 62de717b11 adjust limits and add Mono-Samp Distance (msd) simulated motor
r2606 | dcl | 2008-06-04 15:21:36 +1000 (Wed, 04 Jun 2008) | 2 lines
2012-11-15 13:38:37 +11:00
Douglas Clowes 588a44305a Change sz to temporary replacement
r2605 | dcl | 2008-06-02 14:41:14 +1000 (Mon, 02 Jun 2008) | 2 lines
2012-11-15 13:38:33 +11:00
Douglas Clowes 6af0b58582 Change cntsPerX
r2604 | dcl | 2008-06-02 11:59:50 +1000 (Mon, 02 Jun 2008) | 2 lines
2012-11-15 13:38:30 +11:00
Douglas Clowes e462982897 Change slit gaps to floating point to avoid integer truncation in expressions
r2603 | dcl | 2008-05-30 17:39:29 +1000 (Fri, 30 May 2008) | 2 lines
2012-11-15 13:38:26 +11:00
Douglas Clowes bc7e224820 Changed to reflect different value on loaner tilt stage
r2602 | dcl | 2008-05-30 17:38:22 +1000 (Fri, 30 May 2008) | 2 lines
2012-11-15 13:38:21 +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 4a937e1608 extraconfig.tcl should not be kept on CVS or deployed to ics boxes.
We should put commissioning configurations in a config/commissioning directory

r2600 | ffr | 2008-05-30 10:14:56 +1000 (Fri, 30 May 2008) | 3 lines
2012-11-15 13:38:11 +11:00
Douglas Clowes 55a5f2c538 add "-x" option for "executable only" to deply patched SICServer
r2599 | dcl | 2008-05-29 14:57:42 +1000 (Thu, 29 May 2008) | 2 lines
2012-11-15 13:38:07 +11:00
Douglas Clowes 4b81f0836b temporary addition of separate sample Z motors
r2598 | dcl | 2008-05-29 14:56:27 +1000 (Thu, 29 May 2008) | 2 lines
2012-11-15 13:38:03 +11:00
Douglas Clowes be033cddcd stth and monochromator focussing
r2597 | dcl | 2008-05-29 14:55:49 +1000 (Thu, 29 May 2008) | 2 lines
2012-11-15 13:37:59 +11:00
Douglas Clowes 0f4b77cce0 take out extraconfig
r2596 | dcl | 2008-05-29 14:55:08 +1000 (Thu, 29 May 2008) | 2 lines
2012-11-15 13:37:55 +11:00
Douglas Clowes a0ddc569b2 Make like an echidna
r2595 | dcl | 2008-05-29 14:54:42 +1000 (Thu, 29 May 2008) | 2 lines
2012-11-15 13:37:51 +11:00
Douglas Clowes a9746d1190 Monochromator focussing
r2594 | dcl | 2008-05-29 14:54:06 +1000 (Thu, 29 May 2008) | 2 lines
2012-11-15 13:37:48 +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 a0684a033e cleanups and add encoder bias code
r2592 | dcl | 2008-05-29 14:52:41 +1000 (Thu, 29 May 2008) | 2 lines
2012-11-15 13:37:40 +11:00
Douglas Clowes 9f479bc136 register the new nhq driver
r2591 | dcl | 2008-05-29 14:51:06 +1000 (Thu, 29 May 2008) | 2 lines
2012-11-15 13:37:36 +11:00
Douglas Clowes 28e39b963a update in line with nhq driver
r2590 | dcl | 2008-05-29 14:50:35 +1000 (Thu, 29 May 2008) | 2 lines
2012-11-15 13:37:32 +11:00
Douglas Clowes a87c8149db complete rewrite
r2589 | dcl | 2008-05-29 14:50:16 +1000 (Thu, 29 May 2008) | 2 lines
2012-11-15 13:37:28 +11:00
Douglas Clowes cf5d570a52 update nhq driver and add koala instrument
r2588 | dcl | 2008-05-29 14:49:59 +1000 (Thu, 29 May 2008) | 2 lines
2012-11-15 13:37:24 +11:00
Douglas Clowes 34f7139ebc add timer value to event trace
r2587 | dcl | 2008-05-29 14:49:26 +1000 (Thu, 29 May 2008) | 2 lines
2012-11-15 13:37:20 +11:00
Douglas Clowes e20d3f0f63 remove old nhq driver
r2586 | dcl | 2008-05-29 14:48:48 +1000 (Thu, 29 May 2008) | 2 lines
2012-11-15 13:37:16 +11:00
Douglas Clowes c12595c6a4 Access to current timer from callback and to time value
r2585 | dcl | 2008-05-29 14:47:52 +1000 (Thu, 29 May 2008) | 2 lines
2012-11-15 13:37:12 +11:00
Douglas Clowes 63cd8f3ea3 Add compiler option for C99 std
r2524 | dcl | 2008-05-12 11:09:19 +1000 (Mon, 12 May 2008) | 2 lines
2012-11-15 13:37:09 +11:00
Douglas Clowes 1087dcf7ce Implement SC (stop code)
r2523 | dcl | 2008-05-12 11:08:15 +1000 (Mon, 12 May 2008) | 2 lines
2012-11-15 13:37:05 +11:00
Douglas Clowes fba2b55fb9 Adjust sx,sy homes
r2522 | dcl | 2008-05-12 11:06:54 +1000 (Mon, 12 May 2008) | 2 lines
2012-11-15 13:37:01 +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 445a332370 Set Motor status to HWBusy in State_Unknown
Discard outstanding message response on entering State_Unknown (timing window)
Don't break if it times out while waiting
Defer various faults until motor has stopped
Rename absenc to absencoder in list command (if has encoder)
Modify absenc to report integer encoder value
Allow manager to set various sensitive values in motor debug mode
Make motor "reset" command wait until motor reinitialised (timing window)

r2520 | dcl | 2008-05-12 11:05:35 +1000 (Mon, 12 May 2008) | 9 lines
2012-11-15 13:36:53 +11:00