linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,775 Commits 1 Branch 0 Tags
f2568b681dde1025c3b696590dfdbb07d0b4f4a0
Commit Graph

236 Commits

Author SHA1 Message Date
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
bdf5e24cc0 Remove extraconfig 
r2453 | dcl | 2008-04-14 13:53:40 +1000 (Mon, 14 Apr 2008) | 2 lines
 2012-11-15 13:35:35 +11:00
Douglas Clowes
7220f040ef wait for motion to complete before turning air and motor off (was crashing thread 0) 
r2430 | dcl | 2008-04-14 09:50:38 +1000 (Mon, 14 Apr 2008) | 2 lines
 2012-11-15 13:35:11 +11:00
Douglas Clowes
106159ca58 Substantially modified controller software: mainly limit switches and deceleration. 
r2388 | dcl | 2008-03-07 16:12:47 +1100 (Fri, 07 Mar 2008) | 2 lines
 2012-11-15 13:33:47 +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
b3d5464454 Interim iteration 
r2383 | dcl | 2008-03-05 15:25:32 +1100 (Wed, 05 Mar 2008) | 2 lines
 2012-11-15 13:33:39 +11:00
Douglas Clowes
02508cfcda Remove previous comment from end of line which kills thread0 
r2373 | dcl | 2008-02-27 09:47:54 +1100 (Wed, 27 Feb 2008) | 2 lines
 2012-11-15 13:33:35 +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
56f7cde455 Remove old code. 
r2246 | ffr | 2007-11-07 15:57:40 +1100 (Wed, 07 Nov 2007) | 2 lines
 2012-11-15 13:30:00 +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
a85720686b Make sure that the last things we do are to set the sics object attributes and then build the hdb tree. 
r2138 | ffr | 2007-08-21 08:54:45 +1000 (Tue, 21 Aug 2007) | 2 lines
 2012-11-15 13:23:22 +11:00
Ferdi Franceschini
5c9b53efbc Added new hdb/nexus support. 
r2126 | ffr | 2007-08-16 16:46:12 +1000 (Thu, 16 Aug 2007) | 2 lines
 2012-11-15 13:22:40 +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
Dan Bartlett
76d4c83793 Oscillating collimator code added 
r1967 | dbx | 2007-05-16 17:05:58 +1000 (Wed, 16 May 2007) | 2 lines
 2012-11-15 13:17:32 +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
Dan Bartlett
911c0d8450 no message 
r1937 | dbx | 2007-05-03 16:53:56 +1000 (Thu, 03 May 2007) | 2 lines
 2012-11-15 13:15:53 +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
98a2081f99 Update safety PLC multichan to remove RS232 controller 
r1868 | dcl | 2007-04-18 09:32:58 +1000 (Wed, 18 Apr 2007) | 2 lines
 2012-11-15 13:15:05 +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
6d17aca411 Counters have a mode subcommand, not countmode! 
r1765 | ffr | 2007-04-01 10:46:51 +1000 (Sun, 01 Apr 2007) | 2 lines
 2012-11-15 13:12:36 +11:00
Ferdi Franceschini
9d9937a5b7 Control simulated hmm driver with simulated counter to mimic the real hmc. 
r1764 | ffr | 2007-04-01 10:41:26 +1000 (Sun, 01 Apr 2007) | 2 lines
 2012-11-15 13:12:32 +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
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
307d7ba068 Renamed the dummy hmm control procs to match the names in the real hmm setup. 
count_bm_controlled now does a blocking count for the simulated hmm.

r1751 | ffr | 2007-03-31 09:27:28 +1000 (Sat, 31 Mar 2007) | 3 lines
 2012-11-15 13:11:49 +11:00