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

198 Commits

Author SHA1 Message Date
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
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
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
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
b5d157c67a incorporate Dan's change to resolver code 
r2508 | dcl | 2008-05-08 16:48:32 +1000 (Thu, 08 May 2008) | 2 lines
 2012-11-15 13:36:41 +11:00
Douglas Clowes
8ced552998 Change comments 
r2493 | dcl | 2008-04-30 11:56:22 +1000 (Wed, 30 Apr 2008) | 2 lines
 2012-11-15 13:36:17 +11:00
Douglas Clowes
b8711e9bc4 Motor Off Delay is in milliSeconds 
r2483 | dcl | 2008-04-24 12:09:25 +1000 (Thu, 24 Apr 2008) | 2 lines
 2012-11-15 13:35:54 +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
4562daf398 Implement changes made on instrument during commissioning 
r2451 | dcl | 2008-04-14 13:51:07 +1000 (Mon, 14 Apr 2008) | 2 lines
 2012-11-15 13:35:27 +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
Ferdi Franceschini
cb89c02daf Use ::histogram_memory::upload_config instead of the deprecated ::histogram_memory::configure_server procedure. 
r2284 | ffr | 2008-01-15 15:03:41 +1100 (Tue, 15 Jan 2008) | 2 lines
 2012-11-15 13:32:23 +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
94987872cb Code cleanup 
r2228 | ffr | 2007-11-05 13:29:31 +1100 (Mon, 05 Nov 2007) | 2 lines
 2012-11-15 13:28:52 +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
67a8a8c0c3 Fixed maximum and minimum bin boundaries. 
Code cleanup.

r2172 | ffr | 2007-10-03 10:08:40 +1000 (Wed, 03 Oct 2007) | 3 lines
 2012-11-15 13:25:25 +11:00
Mark Lesha
565267647b Temporarily keep evcontroller config here 
Two extra temperature controllers have been added.

r2148 | mle | 2007-09-04 15:46:58 +1000 (Tue, 04 Sep 2007) | 3 lines
 2012-11-15 13:23:58 +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
4495f867e4 Use new common hipada config file. 
r2128 | ffr | 2007-08-16 16:55:36 +1000 (Thu, 16 Aug 2007) | 2 lines
 2012-11-15 13:22:47 +11:00
Ferdi Franceschini
d469bb8aa0 Added empty set_sobj_attributes proc. 
r2127 | ffr | 2007-08-16 16:53:24 +1000 (Thu, 16 Aug 2007) | 2 lines
 2012-11-15 13:22:43 +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
Douglas Clowes
d0ac56e112 reduce mx and my hard and soft limits to be within limit switches 
r2101 | dcl | 2007-07-26 12:22:57 +1000 (Thu, 26 Jul 2007) | 2 lines
 2012-11-15 13:21:10 +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
Ferdi Franceschini
5b683ecbe0 Fixed botched merge. 
The merge effectively created  duplicate setmode procs.

r1953 | ffr | 2007-05-10 13:28:27 +1000 (Thu, 10 May 2007) | 3 lines
 2012-11-15 13:16:44 +11:00
Ferdi Franceschini
a151a2a163 Set motor_driver_type to "asim" when motor_simulation flag is true, otherwise set it to DMC2280. 
r1952 | ffr | 2007-05-10 13:24:28 +1000 (Thu, 10 May 2007) | 2 lines
 2012-11-15 13:16:40 +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
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
Ferdi Franceschini
55f45afcc4 Fixes to RELEASE-1_1 
Tubes weren't paired when folding
Fix sign for cartesian coordinates on slits.

r1838 | ffr | 2007-04-06 19:32:57 +1000 (Fri, 06 Apr 2007) | 4 lines
 2012-11-15 13:13:59 +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
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
6d673e01dc Added missing long_name mphi. 
r1767 | ffr | 2007-04-01 12:24:16 +1000 (Sun, 01 Apr 2007) | 2 lines
 2012-11-15 13:12:42 +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
51079b5e9d Set part names for real motors. 
r1757 | ffr | 2007-03-31 13:34:29 +1000 (Sat, 31 Mar 2007) | 2 lines
 2012-11-15 13:12:09 +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