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

733 Commits

Author SHA1 Message Date
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
55a5f2c538 add "-x" option for "executable only" to deply patched SICServer 
r2599 | dcl | 2008-05-29 14:57:42 +1000 (Thu, 29 May 2008) | 2 lines
 2012-11-15 13:38:07 +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
0f4b77cce0 take out extraconfig 
r2596 | dcl | 2008-05-29 14:55:08 +1000 (Thu, 29 May 2008) | 2 lines
 2012-11-15 13:37:55 +11:00
Douglas Clowes
a0ddc569b2 Make like an echidna 
r2595 | dcl | 2008-05-29 14:54:42 +1000 (Thu, 29 May 2008) | 2 lines
 2012-11-15 13:37:51 +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
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
1087dcf7ce Implement SC (stop code) 
r2523 | dcl | 2008-05-12 11:08:15 +1000 (Mon, 12 May 2008) | 2 lines
 2012-11-15 13:37:05 +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
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
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
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
0e4be397d5 Rework to make more like updated Echidna and Wombat programs 
r2495 | dcl | 2008-04-30 11:57:55 +1000 (Wed, 30 Apr 2008) | 2 lines
 2012-11-15 13:36:25 +11:00
Douglas Clowes
fe682b39ac Change over to Quokka SIS PLC address 
r2494 | dcl | 2008-04-30 11:57:08 +1000 (Wed, 30 Apr 2008) | 2 lines
 2012-11-15 13:36:21 +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
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
0937bc2ba2 Handle simulated PLC 
r2486 | dcl | 2008-04-24 12:11:51 +1000 (Thu, 24 Apr 2008) | 2 lines
 2012-11-15 13:36:06 +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
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
fd0ab1a3b5 Update to version on controller - adjust comments 
r2457 | dcl | 2008-04-16 10:57:40 +1000 (Wed, 16 Apr 2008) | 2 lines
 2012-11-15 13:35:42 +11:00
Douglas Clowes
1c86cbc665 Update to version on controller - remove comment text on end of line 
r2456 | dcl | 2008-04-16 10:57:21 +1000 (Wed, 16 Apr 2008) | 2 lines
 2012-11-15 13:35:39 +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
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
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
76e63de5a3 adjustments to timings 
r2433 | dcl | 2008-04-14 10:30:07 +1000 (Mon, 14 Apr 2008) | 2 lines
 2012-11-15 13:35:23 +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
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
Douglas Clowes
ed9f92c6ef rotary beam attenuator motor 
r2363 | dcl | 2008-02-19 15:27:19 +1100 (Tue, 19 Feb 2008) | 2 lines
 2012-11-15 13:33:20 +11:00
Mark Lesha
0f2cde7ed9 Changed SICS username and password to 'SICS' to suit new histogram server. Port is still 8080. 
r2361 | mle | 2008-02-19 12:40:12 +1100 (Tue, 19 Feb 2008) | 2 lines
 2012-11-15 13:33:12 +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
Douglas Clowes
7fe22cd172 use REQx/RSPx for braked motors and improve sequencing of braking 
r2314 | dcl | 2008-02-04 10:41:32 +1100 (Mon, 04 Feb 2008) | 2 lines
 2012-11-15 13:32:57 +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
0fc5f6b303 Initial Oak Ridge High Voltage Power Supply for ORDELA detector 
r2289 | dcl | 2008-01-21 09:57:53 +1100 (Mon, 21 Jan 2008) | 2 lines
 2012-11-15 13:32:42 +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
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
1732ecdb99 Made sure that we run "hmm init" in a catch block to catch any attempt to modify an hmm parameter when it's not allowed. 
The histmem command now returns clean error messages.
Stack traces are displayed for errors which are triggered from the second call level with the histmem command.
Made sure that catch blocks don't enclose a 'return' because this triggers the catch to report the contents of errorInfo.
Removed obsolete setup procedure.
Made sure that uploading of configuration files to the histogram server is only enabled for the 'hmm' object in the ::histogram_memory::upload_config procedure.  Uploading config files is disabled for all other histmem objects at all times.

r2282 | ffr | 2008-01-15 14:53:47 +1100 (Tue, 15 Jan 2008) | 7 lines
 2012-11-15 13:32:15 +11:00
Douglas Clowes
b8c0f9ac5b Add mechanism to pop up beam stops small(1) to (large(5) 
r2281 | dcl | 2008-01-15 12:39:04 +1100 (Tue, 15 Jan 2008) | 2 lines
 2012-11-15 13:32:11 +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
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