Commit Graph

24 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
Douglas Clowes
f27b1c8e87 Configure Monochromator focus motor
r1613 | dcl | 2007-03-08 13:30:10 +1100 (Thu, 08 Mar 2007) | 2 lines
2012-11-15 13:05:03 +11:00
Ferdi Franceschini
903c446391 Set zero posn to right edge of detector for detector rotate.
r1554 | ffr | 2007-02-26 13:15:32 +1100 (Mon, 26 Feb 2007) | 2 lines
2012-11-15 13:02:06 +11:00
Douglas Clowes
507725d402 remove duplicate movecount
r1549 | dcl | 2007-02-23 08:26:09 +1100 (Fri, 23 Feb 2007) | 2 lines
2012-11-15 13:01:52 +11:00
Douglas Clowes
961aa0b8aa Add movecount from echidna, reduce mtth settling to 5 seconds
r1547 | dcl | 2007-02-23 08:17:25 +1100 (Fri, 23 Feb 2007) | 2 lines
2012-11-15 13:01:46 +11:00
Douglas Clowes
405981c815 Tighten up MOM and MTTH, add new airpads code
r1542 | dcl | 2007-02-22 16:36:25 +1100 (Thu, 22 Feb 2007) | 2 lines
2012-11-15 13:01:32 +11:00
Ferdi Franceschini
14a244d014 Use new dir structure.
r1515 | ffr | 2007-02-20 08:03:21 +1100 (Tue, 20 Feb 2007) | 2 lines
2012-11-15 13:00:19 +11:00