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

102 Commits

Author SHA1 Message Date
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
Douglas Clowes
d5db9de5a6 Change over to Platypus SIS PLC address 
r2492 | dcl | 2008-04-30 11:55:37 +1000 (Wed, 30 Apr 2008) | 2 lines
 2012-11-15 13:36:13 +11:00
Douglas Clowes
1eda12ffb6 Change sphi home position after running it off the end of the screw with Nan and broken limit switch. 
r2485 | dcl | 2008-04-24 12:11:01 +1000 (Thu, 24 Apr 2008) | 2 lines
 2012-11-15 13:36:02 +11:00
Douglas Clowes
a9d493382f Fix Chopper IP address 
r2484 | dcl | 2008-04-24 12:10:00 +1000 (Thu, 24 Apr 2008) | 2 lines
 2012-11-15 13:35:58 +11:00
Douglas Clowes
6009f273c8 Add two theta virtual motor 
r2452 | dcl | 2008-04-14 13:53:18 +1000 (Mon, 14 Apr 2008) | 2 lines
 2012-11-15 13:35:31 +11:00
Douglas Clowes
0787189156 Changes to backlash, creep and precision for many motors 
r2315 | dcl | 2008-02-04 12:30:44 +1100 (Mon, 04 Feb 2008) | 2 lines
 2012-11-15 13:33:01 +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
Douglas Clowes
2ebe674425 Detector Y motor initial configuration 
r2279 | dcl | 2008-01-15 12:36:59 +1100 (Tue, 15 Jan 2008) | 2 lines
 2012-11-15 13:32:04 +11:00
Douglas Clowes
0634295e45 Detector Y axis 
r2259 | dcl | 2007-12-07 10:19:54 +1100 (Fri, 07 Dec 2007) | 2 lines
 2012-11-15 13:30:49 +11:00
Ferdi Franceschini
a9617da982 Don't make plc object when in simulated mode. 
r2248 | ffr | 2007-11-08 17:02:24 +1100 (Thu, 08 Nov 2007) | 2 lines
 2012-11-15 13:30:07 +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
a1a07d3d0f Set the default scan finish behaviour for the "runscan" command to to reset the scan motor to the start position 
r2244 | ffr | 2007-11-07 15:56:33 +1100 (Wed, 07 Nov 2007) | 2 lines
 2012-11-15 13:29:52 +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
8d3817c9ef Some code cleanup. 
r2218 | ffr | 2007-11-01 13:04:31 +1100 (Thu, 01 Nov 2007) | 2 lines
 2012-11-15 13:28:14 +11:00
Ferdi Franceschini
6308cd312a pre_hmm_scan_prepare now gets the chopper status and sets the histogram memor frequency to match it. 
r2217 | ffr | 2007-11-01 13:03:16 +1100 (Thu, 01 Nov 2007) | 2 lines
 2012-11-15 13:28:10 +11:00
Ferdi Franceschini
59b953be0e Move creation of hmm objects to common hmm configuration file. 
pre_count does nothing now.
Added function to set hmm freq to match chopper freq and extended _histmem with a tochfreq subcommand.

r2216 | ffr | 2007-11-01 13:01:39 +1100 (Thu, 01 Nov 2007) | 4 lines
 2012-11-15 13:28:06 +11:00
Ferdi Franceschini
f7d01ceb6b Implemented ::scan::pre_hmm_scan_prepare hook to make sure that the chopper is ready before commencing a scan. 
r2208 | ffr | 2007-10-31 17:05:15 +1100 (Wed, 31 Oct 2007) | 2 lines
 2012-11-15 13:27:37 +11:00
Ferdi Franceschini
5b5b3b4cc8 Use x,y bin boundaries for histogram horizontal and vertical axes. 
Set the hmm frequency with the ::histogram_memory::set_frame_freq command to make sure that the maximum time bin is set properly.

r2207 | ffr | 2007-10-31 17:03:01 +1100 (Wed, 31 Oct 2007) | 3 lines
 2012-11-15 13:27:33 +11:00
Ferdi Franceschini
03b583655c Added chopper "ready?" query and "get_frequency" command. 
Also added chopper simulation mode.

r2206 | ffr | 2007-10-31 17:00:54 +1100 (Wed, 31 Oct 2007) | 3 lines
 2012-11-15 13:27:30 +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
f33f62ba20 Added pre_count method which sets the histogram frame frequency from the chopper frequency. 
r2196 | ffr | 2007-10-23 14:01:36 +1000 (Tue, 23 Oct 2007) | 2 lines
 2012-11-15 13:26:53 +11:00
Ferdi Franceschini
a35b5573cf Added dy attributes required for building hdb tree. 
r2195 | ffr | 2007-10-23 13:59:36 +1000 (Tue, 23 Oct 2007) | 2 lines
 2012-11-15 13:26:49 +11:00
Douglas Clowes
67810158ee refactor SZ steps and counts equations 
r2170 | dcl | 2007-10-02 12:43:43 +1000 (Tue, 02 Oct 2007) | 2 lines
 2012-11-15 13:25:18 +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
Douglas Clowes
07a1d939d9 Posit config for collimator 
Config for detector Y translation motor

r2153 | dcl | 2007-09-26 09:31:44 +1000 (Wed, 26 Sep 2007) | 3 lines
 2012-11-15 13:24:16 +11:00
Ferdi Franceschini
826633c70a Re-enable PLC 
r2129 | ffr | 2007-08-16 17:00:28 +1000 (Thu, 16 Aug 2007) | 2 lines
 2012-11-15 13:22:50 +11:00
Ferdi Franceschini
2b2ec38ceb Don't MakeAsyncQueue when using simulated driver. 
r2124 | ffr | 2007-08-16 16:40:00 +1000 (Thu, 16 Aug 2007) | 2 lines
 2012-11-15 13:22:32 +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
8770acc191 Merged new hdb and nexus code. 
r2099 | ffr | 2007-07-22 15:23:41 +1000 (Sun, 22 Jul 2007) | 2 lines
 2012-11-15 13:21:03 +11:00
Douglas Clowes
063fafbe83 Update the beam attenuator (bat) home, increase deceleration for slit motors to prevent overrun, adjust slit ranges individually for maximum scan range 
r2031 | dcl | 2007-06-27 11:02:36 +1000 (Wed, 27 Jun 2007) | 2 lines
 2012-11-15 13:19:59 +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
27d849ea23 multichan becomes AsyncQueue and AsyncProtocol 
r1963 | dcl | 2007-05-15 12:47:58 +1000 (Tue, 15 May 2007) | 2 lines
 2012-11-15 13:17:18 +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
83744c2e15 Added "master" motor name lists for configurable virtualmotors. 
r1901 | ffr | 2007-04-20 12:47:27 +1000 (Fri, 20 Apr 2007) | 2 lines
 2012-11-15 13:15:43 +11:00
Ferdi Franceschini
65a1fc1a1d Added safety plc configuration files. 
r1900 | ffr | 2007-04-20 12:46:11 +1000 (Fri, 20 Apr 2007) | 2 lines
 2012-11-15 13:15:39 +11:00
Douglas Clowes
34da43b4ee Update slit gearing ratio to computed 6 * 7:3 stages 
r1885 | dcl | 2007-04-19 10:08:59 +1000 (Thu, 19 Apr 2007) | 2 lines
 2012-11-15 13:15:19 +11:00
Ferdi Franceschini
c8558d0a5b Reverted hipadaba paths to original settings. 
r1861 | ffr | 2007-04-16 16:16:57 +1000 (Mon, 16 Apr 2007) | 2 lines
 2012-11-15 13:15:02 +11:00
Ferdi Franceschini
784b391415 Added part and type info to motors and modified hpaths to work with new hipadaba config code. 
r1858 | ffr | 2007-04-16 14:46:49 +1000 (Mon, 16 Apr 2007) | 2 lines
 2012-11-15 13:14:59 +11:00
Ferdi Franceschini
3e5a3d1201 motor_hpath now maps part identifiers to hipadaba nodes 
r1855 | ffr | 2007-04-13 16:37:02 +1000 (Fri, 13 Apr 2007) | 2 lines
 2012-11-15 13:14:49 +11:00
Ferdi Franceschini
e2f968c923 Added part identifiers to support the new hipadaba path generation code. 
Added long_name fields to support nexus file writing.

r1854 | ffr | 2007-04-13 16:33:48 +1000 (Fri, 13 Apr 2007) | 3 lines
 2012-11-15 13:14:45 +11:00
Douglas Clowes
466e1bf4a9 Change stepsPerX and CountsPerX calculations to floating point 
r1843 | dcl | 2007-04-10 09:56:18 +1000 (Tue, 10 Apr 2007) | 2 lines
 2012-11-15 13:14:12 +11:00
Douglas Clowes
62aa98edf7 fix sz steprate and limits 
r1783 | dcl | 2007-04-02 17:33:11 +1000 (Mon, 02 Apr 2007) | 2 lines
 2012-11-15 13:13:35 +11:00
Douglas Clowes
2da08390b8 Change sz count rate, remove obsolete code and do some cleaning 
r1782 | dcl | 2007-04-02 15:02:21 +1000 (Mon, 02 Apr 2007) | 2 lines
 2012-11-15 13:13:32 +11:00
Douglas Clowes
c944a7383d Should not be in CVS 
r1780 | dcl | 2007-04-02 14:58:24 +1000 (Mon, 02 Apr 2007) | 2 lines
 2012-11-15 13:13:25 +11:00
Douglas Clowes
81f12eadda fix typo 
r1750 | dcl | 2007-03-30 18:44:30 +1000 (Fri, 30 Mar 2007) | 2 lines
 2012-11-15 13:11:46 +11:00
Douglas Clowes
57bf7f35c6 change 90 to zero degrees 
r1749 | dcl | 2007-03-30 18:44:13 +1000 (Fri, 30 Mar 2007) | 2 lines
 2012-11-15 13:11:43 +11:00
Douglas Clowes
a96d267d57 Add c1ht and m1ro to hpaths 
r1740 | dcl | 2007-03-30 13:28:09 +1000 (Fri, 30 Mar 2007) | 2 lines
 2012-11-15 13:11:13 +11:00
Douglas Clowes
6261c37519 Update slit motor limits to overlap by 5 and open 25 each (50mm gap). 
r1739 | dcl | 2007-03-29 17:30:42 +1000 (Thu, 29 Mar 2007) | 2 lines
 2012-11-15 13:11:10 +11:00
Douglas Clowes
b43ae4e50a reduce slit motion ranges 
r1738 | dcl | 2007-03-29 08:57:26 +1000 (Thu, 29 Mar 2007) | 2 lines
 2012-11-15 13:11:07 +11:00