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

77 Commits

Author SHA1 Message Date
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
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
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
2a469d6b89 Dan's changes for small sample Z stage (temporary) 
r2510 | dcl | 2008-05-08 16:50:32 +1000 (Thu, 08 May 2008) | 2 lines
 2012-11-15 13:36:49 +11:00
Douglas Clowes
3076fccac3 change speeds add focussing motors 
r2509 | dcl | 2008-05-08 16:50:04 +1000 (Thu, 08 May 2008) | 2 lines
 2012-11-15 13:36:45 +11:00
Douglas Clowes
4b17ca99da Bring into line with changes made on Echidna and Wombat 
r2432 | dcl | 2008-04-14 10:28:07 +1000 (Mon, 14 Apr 2008) | 2 lines
 2012-11-15 13:35:19 +11:00
Douglas Clowes
03394dcc9e tweak sz configuration 
r2431 | dcl | 2008-04-14 09:51:48 +1000 (Mon, 14 Apr 2008) | 2 lines
 2012-11-15 13:35:15 +11:00
Douglas Clowes
4f92b60077 Incremental commissioning and calibration 
r2302 | dcl | 2008-01-31 10:32:41 +1100 (Thu, 31 Jan 2008) | 2 lines
 2012-11-15 13:32:53 +11:00
Douglas Clowes
168e0d1bfa Add encoder initialisation for changed encoders (not working) 
r2285 | dcl | 2008-01-16 16:34:15 +1100 (Wed, 16 Jan 2008) | 2 lines
 2012-11-15 13:32:27 +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
2c334ba3c2 commissioning refinement 
r2278 | dcl | 2008-01-15 12:36:08 +1100 (Tue, 15 Jan 2008) | 2 lines
 2012-11-15 13:32:00 +11:00
Douglas Clowes
32595554bc Incremental commissioning and calibration 
r2261 | dcl | 2007-12-07 10:22:38 +1100 (Fri, 07 Dec 2007) | 2 lines
 2012-11-15 13:30:56 +11:00
Douglas Clowes
a2fb2b9571 Redirect from Echidna to Kowari PLC inputs 
r2260 | dcl | 2007-12-07 10:21:00 +1100 (Fri, 07 Dec 2007) | 2 lines
 2012-11-15 13:30:53 +11:00
Douglas Clowes
83ac14eeac commissioning refinement 
r2254 | dcl | 2007-11-09 10:38:23 +1100 (Fri, 09 Nov 2007) | 2 lines
 2012-11-15 13:30:30 +11:00
Douglas Clowes
5eb6f4330b commissioning refinement 
r2252 | dcl | 2007-11-09 09:47:47 +1100 (Fri, 09 Nov 2007) | 2 lines
 2012-11-15 13:30:22 +11:00
Douglas Clowes
0cf9f1d35f commissioning refinement 
r2247 | dcl | 2007-11-08 09:46:46 +1100 (Thu, 08 Nov 2007) | 2 lines
 2012-11-15 13:30:04 +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
75ae6a9445 Don't create a plc object when in the simulated plc mode. 
r2235 | ffr | 2007-11-06 14:48:13 +1100 (Tue, 06 Nov 2007) | 2 lines
 2012-11-15 13:29:18 +11:00
Douglas Clowes
f4f1c5f152 commissioning refinement 
r2231 | dcl | 2007-11-06 08:47:17 +1100 (Tue, 06 Nov 2007) | 2 lines
 2012-11-15 13:29:03 +11:00
Ferdi Franceschini
a8e95faacf Cleanup 
r2229 | ffr | 2007-11-05 13:30:16 +1100 (Mon, 05 Nov 2007) | 2 lines
 2012-11-15 13:28:56 +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
50ac8c30e7 commissioning iteration 
r2181 | dcl | 2007-10-11 17:57:58 +1000 (Thu, 11 Oct 2007) | 2 lines
 2012-11-15 13:25:58 +11:00
Douglas Clowes
e04b31a2b8 Turn axis F motor on/off 
r2180 | dcl | 2007-10-09 11:44:16 +1000 (Tue, 09 Oct 2007) | 2 lines
 2012-11-15 13:25:54 +11:00
Douglas Clowes
4c569fcd5e Fix typo in variable name 
r2179 | dcl | 2007-10-09 09:28:53 +1000 (Tue, 09 Oct 2007) | 2 lines
 2012-11-15 13:25:50 +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
Dan Bartlett
846d6e7b15 no message 
r2151 | dbx | 2007-09-24 11:29:31 +1000 (Mon, 24 Sep 2007) | 2 lines
 2012-11-15 13:24:09 +11:00
Dan Bartlett
5bbbe9b419 no message 
r2150 | dbx | 2007-09-24 11:20:08 +1000 (Mon, 24 Sep 2007) | 2 lines
 2012-11-15 13:24:05 +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
b09d07915c Restore status from status.tcl when initialising SICS 
Initialise hmm.

r2130 | ffr | 2007-08-16 17:04:07 +1000 (Thu, 16 Aug 2007) | 3 lines
 2012-11-15 13:22:54 +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
2494fa6ad3 Updated kowari for new hdb and nexus code. 
r2100 | ffr | 2007-07-22 15:58:52 +1000 (Sun, 22 Jul 2007) | 2 lines
 2012-11-15 13:21:07 +11:00
Ferdi Franceschini
7d9d72a79d Updated the mtth encoder value to match what Vladimir tells me is 90 degrees. 
mx is now positive towards dance floor.

r2046 | ffr | 2007-07-05 11:56:58 +1000 (Thu, 05 Jul 2007) | 3 lines
 2012-11-15 13:20:16 +11:00
Douglas Clowes
a63bf65270 Set mtth home encoder position at 90 degrees 
r2037 | dcl | 2007-07-05 10:32:19 +1000 (Thu, 05 Jul 2007) | 2 lines
 2012-11-15 13:20:13 +11:00
Douglas Clowes
3aa3c41114 Reverse sense of X on monochromator (left is positive) 
r2036 | dcl | 2007-07-05 10:30:46 +1000 (Thu, 05 Jul 2007) | 2 lines
 2012-11-15 13:20:09 +11:00
Douglas Clowes
5c0036fe87 Swap MX and MY and change sign 
r2033 | dcl | 2007-07-05 09:42:46 +1000 (Thu, 05 Jul 2007) | 2 lines
 2012-11-15 13:20:02 +11:00
Douglas Clowes
c30c1a97f8 add sics_ports.tcl because it breaks deployment when this file is empty 
r2007 | dcl | 2007-06-13 09:57:10 +1000 (Wed, 13 Jun 2007) | 2 lines
 2012-11-15 13:19:45 +11:00
Douglas Clowes
3431ff478f Calibration of monochromator motors 
r2005 | dcl | 2007-06-13 09:51:49 +1000 (Wed, 13 Jun 2007) | 2 lines
 2012-11-15 13:19:38 +11:00
Douglas Clowes
c8d13fef1d Commissioning of monochromator stage 
r2001 | dcl | 2007-06-05 11:56:59 +1000 (Tue, 05 Jun 2007) | 2 lines
 2012-11-15 13:19:28 +11:00
Douglas Clowes
fa5e2711e8 Gross changes for commissioning. 
r1999 | dcl | 2007-06-01 16:54:25 +1000 (Fri, 01 Jun 2007) | 2 lines
 2012-11-15 13:19:21 +11:00
Douglas Clowes
fe63096315 Change Flight Tube to use REQx/RSPx instead of FTUBE/APDONE variables. Now workks for RSD Sample raise dual motor as well. 
r1998 | dcl | 2007-06-01 16:53:25 +1000 (Fri, 01 Jun 2007) | 2 lines
 2012-11-15 13:19:17 +11:00
Douglas Clowes
d75f423f43 Change Flight Tube to use REQx/RSPx instead of APDONE variables. 
r1997 | dcl | 2007-06-01 16:52:06 +1000 (Fri, 01 Jun 2007) | 2 lines
 2012-11-15 13:19:14 +11:00
Dan Bartlett
98e8fb742f no message 
r1993 | dbx | 2007-05-31 16:33:10 +1000 (Thu, 31 May 2007) | 2 lines
 2012-11-15 13:19:00 +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
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