335400ec58
Updates from ics1-taipan
...
r3476 | dcl | 2012-03-21 12:53:06 +1100 (Wed, 21 Mar 2012) | 1 line
2012-11-15 17:25:49 +11:00
c400e75f6d
Revert changes made in rev3453 for the lyrebird and taipan SICSDIR. We NEED the /usr/local/nbi directories.
...
r3475 | ffr | 2012-03-20 15:11:13 +1100 (Tue, 20 Mar 2012) | 2 lines
2012-11-15 17:25:44 +11:00
6d45b5d0ac
add kookaburra
...
r3465 | jgn | 2012-03-15 13:52:31 +1100 (Thu, 15 Mar 2012) | 1 line
2012-11-15 17:25:40 +11:00
a8feaac47a
add kookaburra
...
r3453 | jgn | 2012-03-13 11:19:08 +1100 (Tue, 13 Mar 2012) | 1 line
2012-11-15 17:25:35 +11:00
c9051e1b67
add kookaburra
...
r3452 | jgn | 2012-03-13 11:09:10 +1100 (Tue, 13 Mar 2012) | 1 line
2012-11-15 17:25:31 +11:00
d1ce3837b7
Must use tabs for Makefile indents, not spaces.
...
r3451 | ffr | 2012-03-13 10:39:04 +1100 (Tue, 13 Mar 2012) | 2 lines
2012-11-15 17:25:26 +11:00
155d16e888
add kookaburra
...
r3450 | jgn | 2012-03-13 10:20:10 +1100 (Tue, 13 Mar 2012) | 1 line
2012-11-15 17:25:20 +11:00
f3eb27c282
dynamicly setting the xAT tables
...
r3443 | jgn | 2012-03-12 09:48:42 +1100 (Mon, 12 Mar 2012) | 1 line
2012-11-15 17:25:15 +11:00
909667298d
add kookaburra
...
r3442 | jgn | 2012-03-05 15:21:01 +1100 (Mon, 05 Mar 2012) | 1 line
2012-11-15 17:25:11 +11:00
49bcdfb9e8
init config for kookaburra
...
r3441 | jgn | 2012-03-05 15:14:55 +1100 (Mon, 05 Mar 2012) | 1 line
2012-11-15 17:25:06 +11:00
0c98267e84
add pmc6 into config
...
r3440 | jgn | 2012-03-05 14:49:16 +1100 (Mon, 05 Mar 2012) | 1 line
2012-11-15 17:25:01 +11:00
f097b7f47f
update hmm file from Mark
...
r3439 | jgn | 2012-03-05 14:20:44 +1100 (Mon, 05 Mar 2012) | 1 line
2012-11-15 17:24:57 +11:00
5b4b52c627
add progress reminder at changing temperature and field
...
r3399 | jgn | 2012-02-27 12:13:47 +1100 (Mon, 27 Feb 2012) | 1 line
2012-11-15 17:24:52 +11:00
a24420bf69
Add TasMot motors to hipadaba tree and NeXus data files.
...
nxscripts_common_1.tcl
Set the savecmd and sdsinfo attributes for the TasMot motors in
::nexus::set_sobj_attributes
instdict_specification.tcl
Add tasmot to the sobj_sicstype_list
hipadaba_configuration_common.tcl
Add tasmot to the motor switch statement of ::hdb::sobjadd
util/utility.tcl
Add TasMot to ::utility::set_motor_attributes
r3367 | ffr | 2012-02-13 20:59:50 +1100 (Mon, 13 Feb 2012) | 15 lines
2012-11-15 17:24:48 +11:00
3ceb24c5c6
Fix typo
...
r3366 | ffr | 2012-02-13 20:54:34 +1100 (Mon, 13 Feb 2012) | 2 lines
2012-11-15 17:24:43 +11:00
464dbfdf64
Moved the pre_count and post_count procs from the oxford labview driver
...
to here and added the lakeshore temperature readings.
r3365 | ffr | 2012-02-12 19:03:15 +1100 (Sun, 12 Feb 2012) | 3 lines
2012-11-15 17:24:39 +11:00
3b4247c8d2
Moved the pre_count and post_count procs to quokka's environment.tcl because
...
their definition is specific to quokka. They have also been modified to
include the lakeshore readings.
r3364 | ffr | 2012-02-12 18:55:07 +1100 (Sun, 12 Feb 2012) | 4 lines
2012-11-15 17:24:34 +11:00
d52e112481
Adjust encoder values for home position on s2 and a2 after maintenance
...
r3363 | dcl | 2012-02-01 11:03:02 +1100 (Wed, 01 Feb 2012) | 1 line
2012-11-15 17:24:30 +11:00
b64217e6de
Map range to +/-180 and limit step motion for A-axis
...
r3362 | dcl | 2012-01-30 14:21:31 +1100 (Mon, 30 Jan 2012) | 1 line
2012-11-15 17:24:25 +11:00
07207fd41c
Updated chopper socket numbers.
...
r3361 | ffr | 2012-01-30 11:34:14 +1100 (Mon, 30 Jan 2012) | 2 lines
2012-11-15 17:24:20 +11:00
ebf297eac8
Load modbus protocol handler into SICS.
...
r3360 | ffr | 2012-01-30 11:11:42 +1100 (Mon, 30 Jan 2012) | 2 lines
2012-11-15 17:24:16 +11:00
20ce9381bb
Added modbus protocol handler and Fermi chopper support for Pelican
...
r3359 | ffr | 2012-01-30 11:09:25 +1100 (Mon, 30 Jan 2012) | 2 lines
2012-11-15 17:24:11 +11:00
790fb6a062
Added HV pulser control
...
r3358 | ffr | 2012-01-27 14:46:02 +1100 (Fri, 27 Jan 2012) | 2 lines
2012-11-15 17:24:07 +11:00
040de5cb4b
pulser and hvcommands are available in the common config/commands path
...
r3357 | ffr | 2012-01-27 14:27:27 +1100 (Fri, 27 Jan 2012) | 2 lines
2012-11-15 17:24:02 +11:00
2172e2766f
pulser and hvcommands are available in the common config/commands path
...
r3356 | ffr | 2012-01-27 14:26:23 +1100 (Fri, 27 Jan 2012) | 2 lines
2012-11-15 17:23:58 +11:00
0a800bbffc
pulser and hvcommands are available in the common config/commands path
...
r3355 | ffr | 2012-01-27 14:25:14 +1100 (Fri, 27 Jan 2012) | 2 lines
2012-11-15 17:23:53 +11:00
4ef2f989ba
Use the common pulser and hvcommands files.
...
r3354 | ffr | 2012-01-27 14:21:57 +1100 (Fri, 27 Jan 2012) | 2 lines
2012-11-15 17:23:49 +11:00
7cf52c6a86
pulser and hvcommands are available in the common config/commands path
...
r3353 | ffr | 2012-01-27 14:16:54 +1100 (Fri, 27 Jan 2012) | 2 lines
2012-11-15 17:23:44 +11:00
2c862d24c6
Added HV pulser commands from Wombat. Made some bug fixes and modified
...
commands to provide feedback when setting a parameter because the
sctcontroller expects feedback from all commands.
r3352 | ffr | 2012-01-27 13:57:19 +1100 (Fri, 27 Jan 2012) | 4 lines
2012-11-15 17:23:40 +11:00
dd12f15603
Remove references to missing files
...
r3351 | ffr | 2012-01-20 16:05:00 +1100 (Fri, 20 Jan 2012) | 2 lines
2012-11-15 17:23:35 +11:00
1762688c7a
Adjust detector width to give 121 degrees
...
r3350 | ffr | 2012-01-20 15:53:21 +1100 (Fri, 20 Jan 2012) | 2 lines
2012-11-15 17:23:31 +11:00
af90872ef7
Add julabo driver
...
r3349 | ffr | 2012-01-20 15:49:59 +1100 (Fri, 20 Jan 2012) | 2 lines
2012-11-15 17:23:26 +11:00
f498b3ce6a
sct_julabo_lh45.tcl
...
Add bath temperature to feedback. Allow switching between reading the
bath or external sensor for the sensor value. Check the data type of
replies from the Julabo because it can return values like "___.__" if
you're reading the wrong sensor.
sct_lakeshore_340.tcl, sct_lakeshore_336.tcl
Use the tolerance set on the control/tolerance node so the user can
change it while running.
r3348 | ffr | 2012-01-20 15:25:46 +1100 (Fri, 20 Jan 2012) | 10 lines
2012-11-15 17:23:22 +11:00
2d56b5ea5f
Update to reflect encoder for A2 and S2 at zero, also motor on delay to allow for airpads ON transition
...
r3347 | dcl | 2012-01-19 16:43:38 +1100 (Thu, 19 Jan 2012) | 1 line
2012-11-15 17:23:18 +11:00
b7bb5f7e9b
Lakeshore 370 AC "Resistance Bridge" Temperature Controller
...
r3343 | dcl | 2012-01-16 17:39:14 +1100 (Mon, 16 Jan 2012) | 1 line
2012-11-15 17:23:00 +11:00
a06ed5c6e9
Modified eulerian configuration to allow selection of either the Huber
...
or tiny black cradle.
r3342 | ffr | 2012-01-16 12:04:45 +1100 (Mon, 16 Jan 2012) | 3 lines
2012-11-15 17:22:55 +11:00
f9245f7532
Make sure that files referenced in the configuration are deployed.
...
r3341 | ffr | 2012-01-16 12:03:34 +1100 (Mon, 16 Jan 2012) | 2 lines
2012-11-15 17:22:50 +11:00
6cb9be21c1
Ported Andrew Studer's pulser code to kowari for HV control experiments.
...
r3340 | ffr | 2012-01-16 12:01:32 +1100 (Mon, 16 Jan 2012) | 2 lines
2012-11-15 17:22:46 +11:00
1026dbb808
Change driveable motor names to GA GB GC
...
r3339 | ffr | 2012-01-13 13:59:20 +1100 (Fri, 13 Jan 2012) | 2 lines
2012-11-15 17:22:42 +11:00
5386c36209
Set crystal speeds and accelerations to more conservative values.
...
r3338 | ffr | 2012-01-11 11:13:48 +1100 (Wed, 11 Jan 2012) | 2 lines
2012-11-15 17:22:37 +11:00
aa860a120b
r3334 | jgn | 2012-01-09 09:17:54 +1100 (Mon, 09 Jan 2012) | 1 line
2012-11-15 17:22:19 +11:00
22fa0b4251
parameter tuning in testing Jan 2012
...
r3333 | jgn | 2012-01-06 15:56:11 +1100 (Fri, 06 Jan 2012) | 1 line
2012-11-15 17:22:15 +11:00
981ef28416
change home position of controller 3
...
r3332 | jgn | 2012-01-06 15:50:15 +1100 (Fri, 06 Jan 2012) | 1 line
2012-11-15 17:22:10 +11:00
f22a6da843
Make the delay after turning the motor ON configurable to allow for motors with slow switch on (e.g. airpads) and default it to the old hard-coded value (200mSec).
...
r3331 | dcl | 2012-01-05 12:28:20 +1100 (Thu, 05 Jan 2012) | 1 line
2012-11-15 17:22:06 +11:00
942b56d249
Fix Typos
...
r3330 | dcl | 2012-01-05 12:24:01 +1100 (Thu, 05 Jan 2012) | 1 line
2012-11-15 17:22:01 +11:00
2e4d446865
Configured focusing and mx and my
...
r3329 | ffr | 2012-01-05 09:53:48 +1100 (Thu, 05 Jan 2012) | 2 lines
2012-11-15 17:21:57 +11:00
ab07d2c1e0
r3328 | jgn | 2012-01-05 09:25:12 +1100 (Thu, 05 Jan 2012) | 1 line
2012-11-15 17:21:52 +11:00
dbc36222e8
fix all motors before init
...
r3327 | jgn | 2012-01-04 11:53:31 +1100 (Wed, 04 Jan 2012) | 1 line
2012-11-15 17:21:48 +11:00
71d6ea99fd
change according to the latest Galil code
...
r3326 | jgn | 2012-01-04 11:53:07 +1100 (Wed, 04 Jan 2012) | 1 line
2012-11-15 17:21:43 +11:00
1fb0967ecc
change according to the latest Galil code
...
r3325 | jgn | 2012-01-04 11:52:59 +1100 (Wed, 04 Jan 2012) | 1 line
2012-11-15 17:21:39 +11:00
Douglas Clowes