Commit Graph

278 Commits

Author SHA1 Message Date
Ferdi Franceschini
d99d9cc7ee SICS-435: Save setpoint in data file.
r3612 | ffr | 2012-06-19 20:42:15 +1000 (Tue, 19 Jun 2012) | 2 lines
2012-11-15 17:31:11 +11:00
Ferdi Franceschini
a24df1fc78 SICS-477 In the runscan command restrict mode to 'time' and 'monitor' when the detector type is
set to 'bmon'.  Also check that detector type is either 'bmon' or
'histmem'.

r3592 | ffr | 2012-06-05 08:21:33 +1000 (Tue, 05 Jun 2012) | 4 lines
2012-11-15 17:30:06 +11:00
Ferdi Franceschini
d5da9eba15 SICS-477 Added the "detector" parameter to the "runscan" command tree
with a default value of "histmem".  Also created a "detector"
convenience macro so that the detector type can be easily queried and
set from the command line.

r3590 | ffr | 2012-06-04 20:16:07 +1000 (Mon, 04 Jun 2012) | 5 lines
2012-11-15 17:29:56 +11:00
Ferdi Franceschini
6b3f71cc6a SICS-477 Modified the runscan command to do bmon scans as well as
hmscans.  The type of scan is determined by the new "detector" parameter
on the /commands/scan/runscan tree.  It is fixed to 'bmon' for Taipan
but is selectable on other instruments with default="histmem"

r3589 | ffr | 2012-06-04 20:11:51 +1000 (Mon, 04 Jun 2012) | 5 lines
2012-11-15 17:29:52 +11:00
Jing Chen
66aa3f943c create initial SICS file for Dingo
r3574 | jgn | 2012-06-01 16:07:14 +1000 (Fri, 01 Jun 2012) | 1 line
2012-11-15 17:29:19 +11:00
Ferdi Franceschini
a5d64c28ab SICS-467 Catch the bm COUNTSTART and COUNTEND events to set the feedback
status even if the counter is started via "bm count" or stopped by an
INT1712.

r3541 | ffr | 2012-05-03 17:28:34 +1000 (Thu, 03 May 2012) | 4 lines
2012-11-15 17:28:01 +11:00
Douglas Clowes
17c5d43030 Brain-dead driver for Aerotech Soloist "driver" for 12T magnet sample rotation motor
r3532 | dcl | 2012-04-10 11:16:36 +1000 (Tue, 10 Apr 2012) | 1 line
2012-11-15 17:27:20 +11:00
Douglas Clowes
534459e51f Add a needed SplitReply tom the bmonscan noscanvar
r3520 | dcl | 2012-04-02 12:56:40 +1000 (Mon, 02 Apr 2012) | 1 line
2012-11-15 17:26:30 +11:00
Douglas Clowes
810788577b Set the link property to data_set for all of the bmonscan axes
r3505 | dcl | 2012-03-29 10:42:57 +1100 (Thu, 29 Mar 2012) | 1 line
2012-11-15 17:26:16 +11:00
Douglas Clowes
38c4ef833a This change sets the @axes property on the bmonscan data
r3503 | dcl | 2012-03-29 07:57:33 +1100 (Thu, 29 Mar 2012) | 1 line
2012-11-15 17:26:07 +11:00
Jing Chen
0ed6a9a9ef add kookaburra
r3487 | jgn | 2012-03-27 15:19:40 +1100 (Tue, 27 Mar 2012) | 1 line
2012-11-15 17:25:58 +11:00
Jing Chen
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
Jing Chen
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
Ferdi Franceschini
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
Ferdi Franceschini
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
Douglas Clowes
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
Ferdi Franceschini
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
Ferdi Franceschini
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
Ferdi Franceschini
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
Douglas Clowes
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
Ferdi Franceschini
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
Jing Chen
acd1b9e036 add sct_oxford_labview.tcl
r3324 | jgn | 2012-01-03 12:00:22 +1100 (Tue, 03 Jan 2012) | 1 line
2012-11-15 17:21:34 +11:00
Douglas Clowes
2954216d2d A driver for the Cybaman goniometer
r3317 | dcl | 2011-12-12 16:17:39 +1100 (Mon, 12 Dec 2011) | 1 line
2012-11-15 17:21:03 +11:00
Jing Chen
1069dbc6e9 add pelican to the animal list
r3285 | jgn | 2011-11-25 12:18:37 +1100 (Fri, 25 Nov 2011) | 1 line
2012-11-15 17:18:41 +11:00
Ferdi Franceschini
e5431d5e97 tas/config/hmm/hmm_configuration.tcl
Taipan doesn't not have a histogram memory server.

tas/config/motors/positmotor_configuration.tcl
Taipan doesn't currently have discrete position motors

config/commands/commands_common.tcl
Taipan doesn't have a histogram memory server.

config/nexus/nxscripts_common_1.tcl
Specify internal path name convention for Taipan hdf files

r3282 | ffr | 2011-11-25 10:11:59 +1100 (Fri, 25 Nov 2011) | 13 lines
2012-11-15 17:18:28 +11:00
Jing Chen
fac72e3abb setup pelican config
r3268 | jgn | 2011-11-18 15:44:28 +1100 (Fri, 18 Nov 2011) | 1 line
2012-11-15 17:17:27 +11:00
Douglas Clowes
a172bed449 Add ";*IDN?" in SetValue and setPoint functions (after commands that don't elicit a response) to force a response that avoids the timeout and reconnect sequence that gives problems on the LS336
r3259 | dcl | 2011-10-18 16:13:01 +1100 (Tue, 18 Oct 2011) | 1 line
2012-11-15 17:16:47 +11:00
Ferdi Franceschini
d778dd2bfe sicshipacaba.c
SICS-418 Make sure hnotify sends messages as hdbevents when using the
JSON protocl

site_ansto/instrument/config/hmm/hmm_object.tcl
Initialise the hmm object to make sure the read type is set.

nxscripts_common_1.tcl
Set the read type when saving the hmm data.

server_config.tcl
Fix the autosave command so that you can enable/disable autosave while
the histogram memory is running.

protocol.c
Reduce noise in log files when using the JSON protocol.  Don't log
messages generated during macro execution (ie within a TCL proc).

motor.c:MotorStatus
Abort the current operation, the scan command and batch files when a
motor object returns a hardware fault status value.

motor_dmc2280.c
set driver status to HWFault when the driver is in the error state.

r3251 | ffr | 2011-09-23 08:49:00 +1000 (Fri, 23 Sep 2011) | 25 lines
2012-11-15 17:16:12 +11:00
Douglas Clowes
c765c33f6d Make instance data properties of a params node instead of namespace global variables
This is to allow multiple instance of the same device type without clashing of persistent data
r3248 | dcl | 2011-08-22 11:30:20 +1000 (Mon, 22 Aug 2011) | 3 lines
2012-11-15 17:16:07 +11:00
Ferdi Franceschini
5e50f2cb43 Removed the dependency on some global variables so that you can drive
two lakeshore controllers.  Most of the remaining globals are harmless
or unused but they should be removed.

r3237 | ffr | 2011-08-12 08:41:56 +1000 (Fri, 12 Aug 2011) | 4 lines
2012-11-15 17:15:59 +11:00
Ferdi Franceschini
169aa5ed2f Display/Value and setpoint should be numeric to save arrays of readings.
We can't save arrays of text.

r3235 | ffr | 2011-07-25 17:06:35 +1000 (Mon, 25 Jul 2011) | 3 lines
2012-11-15 17:15:50 +11:00
Douglas Clowes
d33a957d01 differentiate rdValue and rdData and add experimental treewalk
r3232 | dcl | 2011-07-20 14:45:17 +1000 (Wed, 20 Jul 2011) | 1 line
2012-11-15 17:15:37 +11:00
Douglas Clowes
cffc765197 Add ;*IDN? after writes to get a response
r3231 | dcl | 2011-07-06 10:00:25 +1000 (Wed, 06 Jul 2011) | 1 line
2012-11-15 17:15:32 +11:00
Douglas Clowes
a76803c242 Keithley 2700 DMM
r3230 | dcl | 2011-07-05 16:23:52 +1000 (Tue, 05 Jul 2011) | 1 line
2012-11-15 17:15:28 +11:00
Douglas Clowes
5b94e43689 log catch messages
r3225 | dcl | 2011-06-24 13:02:38 +1000 (Fri, 24 Jun 2011) | 1 line
2012-11-15 17:15:06 +11:00
Douglas Clowes
cd2dafceb3 Syringe Pump Driver
for New Era Pump Systems Inc NE-1000 syringe pumps
r3224 | dcl | 2011-06-24 13:01:08 +1000 (Fri, 24 Jun 2011) | 3 lines
2012-11-15 17:15:02 +11:00
Douglas Clowes
992e32bc10 Driver for the Hamilton Modular Valve Positioner (MVP)
r3223 | dcl | 2011-06-22 17:09:21 +1000 (Wed, 22 Jun 2011) | 1 line
2012-11-15 17:14:58 +11:00
Ferdi Franceschini
f66a91d6d6 Remove accidental commit
r3214 | ffr | 2011-06-20 09:45:22 +1000 (Mon, 20 Jun 2011) | 1 line
2012-11-15 17:14:19 +11:00
Ferdi Franceschini
9c93861ae7 Autosave
r3213 | ffr | 2011-06-20 09:41:41 +1000 (Mon, 20 Jun 2011) | 1 line
2012-11-15 17:14:14 +11:00
Ferdi Franceschini
c1b90c4f7d Added rva_datafile name and added rva to /sample group
r3151 | ffr | 2011-05-20 12:02:45 +1000 (Fri, 20 May 2011) | 1 line
2012-11-15 17:13:57 +11:00
Douglas Clowes
afa42563a0 Implement a reset capability
r3150 | dcl | 2011-05-20 10:26:59 +1000 (Fri, 20 May 2011) | 1 line
2012-11-15 17:13:53 +11:00
Douglas Clowes
df6f44a2ac Change limits and tolerance
r3149 | dcl | 2011-05-20 10:25:05 +1000 (Fri, 20 May 2011) | 1 line
2012-11-15 17:13:49 +11:00
Douglas Clowes
f0ac8f82d9 Implement driveable and end of drive condition
r3148 | dcl | 2011-05-20 10:21:08 +1000 (Fri, 20 May 2011) | 1 line
2012-11-15 17:13:44 +11:00
Douglas Clowes
e65cc662c6 Add read of tower down switch
Must be down to run test
r3146 | dcl | 2011-05-19 12:47:06 +1000 (Thu, 19 May 2011) | 3 lines
2012-11-15 17:13:36 +11:00
Ferdi Franceschini
b43ea76fc4 hmm_configuration_common_1.tcl
Added daq_dirname to data files for Platypus.
r3138 | ffr | 2011-05-19 08:41:58 +1000 (Thu, 19 May 2011) | 2 lines
2012-11-15 17:13:01 +11:00
Ferdi Franceschini
ef4763e68f common_instrument_dictionary.tcl
Removed "reduce" group, the parameters in this group will be moved to the NXparameters group.
r3137 | ffr | 2011-05-19 08:39:48 +1000 (Thu, 19 May 2011) | 2 lines
2012-11-15 17:12:57 +11:00
Ferdi Franceschini
579fd8ebd0 sct_oxford_itc.tcl
Revert changes to drving state.
r3136 | ffr | 2011-05-19 08:39:00 +1000 (Thu, 19 May 2011) | 2 lines
2012-11-15 17:12:52 +11:00
Ferdi Franceschini
12b524cfbb sct_bruker_BEC1.tcl
Arndt's latest updates, this is sct_bruker_BEC1_20100625.tcl
r3135 | ffr | 2011-05-19 08:38:09 +1000 (Thu, 19 May 2011) | 2 lines
2012-11-15 17:12:48 +11:00
Douglas Clowes
c62f3dd24b Adjust ramp rate to 1/45 instead of 1/32 and calculate ramp anyway
r3130 | dcl | 2011-05-11 10:11:50 +1000 (Wed, 11 May 2011) | 1 line
2012-11-15 17:12:31 +11:00
Douglas Clowes
4303047433 Lift limit on profile size and partial implementation of drive command
r3129 | dcl | 2011-05-10 16:13:07 +1000 (Tue, 10 May 2011) | 1 line
2012-11-15 17:12:27 +11:00