815eeefc1c
Incorporated the cg123He_temp local mod from the R2_1 deployment. Added validation and fixed attributes.
Ferdi Franceschini
2008-09-25 10:49:06 +10:00
e1978867e9
Set home for sx, sy, som, ephi, echi Set motOffDelay for mtth Enable sz and disable debug Incorporated config parameter changes for sz,sy,som, stth, psho, psp, psw, ssho, ssp, ssw Incorporated eulerian config: TODO Use a flag to select the eulerian config.
Ferdi Franceschini
2008-09-25 09:42:08 +10:00
1f755ccb0d
Added allowed CAT_TABLE elements and echidna specific cat config
Ferdi Franceschini
2008-09-24 14:28:45 +10:00
79d54fb1fe
Generate md5 sums for SICS server files so we can check for local modifications during a release cycle.
Ferdi Franceschini
2008-09-24 12:23:41 +10:00
e1cea8763e
common_instrument_dictionary.tcl instrument/slits is now an NXaperture and collects all 'slits' objects.
Ferdi Franceschini
2008-09-24 08:44:01 +10:00
e1c9d6348d
Fix invalid slit motor names. Set correct IP address for detector voltage controller.
Ferdi Franceschini
2008-09-22 16:42:08 +10:00
ab218f64b6
source_common.tcl SICS-280 Check RCMS data-type and return -1 if it's invalid
Ferdi Franceschini
2008-09-22 15:58:31 +10:00
02015668e2
Mark Lesha fixed some bugs associated with "send"
Ferdi Franceschini
2008-09-17 08:39:33 +10:00
801ec1430b
The motor lowerlimits were being checked against the scan target position instead of the scan start position.
Ferdi Franceschini
2008-09-16 14:33:15 +10:00
7d36e98479
SICS-263 Provide access to histogram memory veto Added a ::histogram_memory::veto proc but it can't be used yet because you need to run hmm init to update the veto flag
Ferdi Franceschini
2008-08-29 22:22:53 +10:00
19e448cda7
Load the new eventutil.tcl
Ferdi Franceschini
2008-08-29 22:14:19 +10:00
c6b5e65a71
SICS-264 Allow sequencing of motors while counting A "waitfor" command has been implement which waits for an object to finish after running the given command.
Ferdi Franceschini
2008-08-29 22:09:19 +10:00
c53b56b97b
SICS-262 TC1 and TC2 sensor readings are duplicates of each other for lakeshore An AsyncQueue is now being created for each temperature controller.
Ferdi Franceschini
2008-08-29 21:55:02 +10:00
e390dcb920
SICS-261 hmscan aborts when instrument isn't ready You can now call "force_scan" to force an hmscan
Ferdi Franceschini
2008-08-29 21:47:57 +10:00
6a3b8e2f49
SICS-260: "File saving fails and aborts scans" SICS was trying to save the AttRotDeg and RotApDeg status feedback nodes The data property of the status feedback nodes has been set to false.
Ferdi Franceschini
2008-08-29 21:38:20 +10:00
5411611352
First draft of "action" and "waitacion" commands
Ferdi Franceschini
2008-08-26 14:09:09 +10:00
06a18bc86d
The two_theta configurable motor may have been made obsolete by the commands.tcl:omega_2theta command.
Ferdi Franceschini
2008-08-26 09:09:50 +10:00
165f1b90a4
lakeshore340_common.tcl Lakeshore controllers will be connected to the ca5-[instrument] moxa box Default config parameters are now available via a tc_dfltPar array IP and socket number are now mandatory when creating an ls340 object
Ferdi Franceschini
2008-08-19 15:11:55 +10:00
8a07f5eaf6
SICS-188 hdb_path is now a comma separated list of paths. NOTE: nodes listed as derived parameter dependencies aren't added to the path.
Ferdi Franceschini
2008-08-13 14:16:30 +10:00
7c7ed6cbf9
SICS-188 hdb_path is now a comma separated list of paths. NOTE: nodes listed as derived parameter dependencies aren't added to the path.
Ferdi Franceschini
2008-08-07 16:43:57 +10:00
3398c75eaf
beamstopaction.[ch] NEW: Implements an action command to drive the quokka beamstops up and down.
Ferdi Franceschini
2008-08-07 13:19:12 +10:00
d7cea6914c
oscillate.c SICS-232 You can now run the oscillating collimator for a specified number of cycles. A MOTEND event is now sent when the oscillator stops. Also temporarily set status to eEager to allow changing the motor accesscode parameter while something else is running, (eg a counter)
Ferdi Franceschini
2008-08-07 13:17:29 +10:00
dd984f6327
Prevent x/y translation of detector when voltage >= 800V
Ferdi Franceschini
2008-08-06 12:47:47 +10:00
8fb864ee37
Incorporate changes from deployed motor configurations.
Ferdi Franceschini
2008-07-18 12:39:35 +10:00
dd927d18af
hmm_configuration_common_1.tcl Set histmem view mag to auto Workaround for SICS-204 hmc sets bm preset to 0
Ferdi Franceschini
2008-07-14 15:15:58 +10:00
d5d42806bf
counter_common_1.tcl commands_common.tcl Make sure that bm mode and preset are saved by adding bm_mode and bm_preset 'getset macros' to the hdb tree
Ferdi Franceschini
2008-07-11 14:27:56 +10:00
0f96e4f82f
server_config.tcl server_init now calls ::counter::isc_initialize, ::histogram_memory::isc_initialize and ::scan::isc_initialize
Ferdi Franceschini
2008-07-01 17:02:26 +10:00
c2186b037e
Increase srce maxspeed to allow setting speed to 5 degrees/s
Ferdi Franceschini
2008-06-23 12:58:58 +10:00
e76d2094c6
SICS-168 Increase srce speed to 5 degrees per second
Ferdi Franceschini
2008-06-23 12:54:30 +10:00
ef7c2a6f87
histmem.c sicvar.c SICS-93 Save histogram data and instrument state during an acquisition
Ferdi Franceschini
2008-06-23 12:41:12 +10:00
eea4d4d9eb
L2mm depends on sample position (ported from RELEASE-2_0P1)
Ferdi Franceschini
2008-06-18 10:56:27 +10:00
ee1ffd4468
Fix segfault triggered by addition of version info to low side server document element
Ferdi Franceschini
2008-06-17 12:27:29 +10:00
e59b073066
Align nhq200.c and orhvps.c to be more alike (and more diffable)
Douglas Clowes
2008-06-12 17:23:40 +10:00
1795e07504
Add a beam monitor counter to Koala
Douglas Clowes
2008-06-12 17:21:40 +10:00
4a88bf6fc1
cut out some older code
Douglas Clowes
2008-06-12 17:20:58 +10:00
6c6156174f
Manually merged the following changes from RELEASE-2_0P1
Ferdi Franceschini
2008-06-12 12:55:28 +10:00
177d5f3ed6
Provide a parameters and parameters/derived_parameters section as a one stop shop for all your instrument parameter needs.
Ferdi Franceschini
2008-06-12 12:42:17 +10:00
528d125efe
Fixes SICS-144 target value was wrong when checking scan variable.
Ferdi Franceschini
2008-06-11 16:26:36 +10:00
3d3ecdd83e
Merged configuration from release 2.0P1 Added appropriate defaults for frame source for each instrument.
Ferdi Franceschini
2008-06-10 14:40:30 +10:00
d495c3b43a
Accept uA instead of mA in response to '#' as found on 6kV suplies
Douglas Clowes
2008-06-06 14:18:25 +10:00
17e0c0b5bc
get msd into gumtree
Douglas Clowes
2008-06-05 16:24:32 +10:00
c61c709b11
add msd klass unitsa and long_name
Douglas Clowes
2008-06-05 15:32:42 +10:00
03853605c9
Redo stth and sz
Douglas Clowes
2008-06-04 17:00:46 +10:00
419a746c77
Update sample stage limits and speeds
Douglas Clowes
2008-06-04 16:08:08 +10:00
62de717b11
adjust limits and add Mono-Samp Distance (msd) simulated motor
Douglas Clowes
2008-06-04 15:21:36 +10:00
588a44305a
Change sz to temporary replacement
Douglas Clowes
2008-06-02 14:41:14 +10:00
6af0b58582
Change cntsPerX
Douglas Clowes
2008-06-02 11:59:50 +10:00
e462982897
Change slit gaps to floating point to avoid integer truncation in expressions
Douglas Clowes
2008-05-30 17:39:29 +10:00
bc7e224820
Changed to reflect different value on loaner tilt stage
Douglas Clowes
2008-05-30 17:38:22 +10:00
4a937e1608
extraconfig.tcl should not be kept on CVS or deployed to ics boxes. We should put commissioning configurations in a config/commissioning directory
Ferdi Franceschini
2008-05-30 10:14:56 +10:00
55a5f2c538
add "-x" option for "executable only" to deply patched SICServer
Douglas Clowes
2008-05-29 14:57:42 +10:00
4b81f0836b
temporary addition of separate sample Z motors
Douglas Clowes
2008-05-29 14:56:27 +10:00
be033cddcd
stth and monochromator focussing
Douglas Clowes
2008-05-29 14:55:49 +10:00
0f4b77cce0
take out extraconfig
Douglas Clowes
2008-05-29 14:55:08 +10:00
a0ddc569b2
Make like an echidna
Douglas Clowes
2008-05-29 14:54:42 +10:00
a9746d1190
Monochromator focussing
Douglas Clowes
2008-05-29 14:54:06 +10:00
a16d3d38d4
fix typo
Douglas Clowes
2008-05-29 14:53:32 +10:00
a0684a033e
cleanups and add encoder bias code
Douglas Clowes
2008-05-29 14:52:41 +10:00
9f479bc136
register the new nhq driver
Douglas Clowes
2008-05-29 14:51:06 +10:00
28e39b963a
update in line with nhq driver
Douglas Clowes
2008-05-29 14:50:35 +10:00
a87c8149db
complete rewrite
Douglas Clowes
2008-05-29 14:50:16 +10:00
cf5d570a52
update nhq driver and add koala instrument
Douglas Clowes
2008-05-29 14:49:59 +10:00
34f7139ebc
add timer value to event trace
Douglas Clowes
2008-05-29 14:49:26 +10:00
e20d3f0f63
remove old nhq driver
Douglas Clowes
2008-05-29 14:48:48 +10:00
c12595c6a4
Access to current timer from callback and to time value
Douglas Clowes
2008-05-29 14:47:52 +10:00
63cd8f3ea3
Add compiler option for C99 std
Douglas Clowes
2008-05-12 11:09:19 +10:00
1087dcf7ce
Implement SC (stop code)
Douglas Clowes
2008-05-12 11:08:15 +10:00
fba2b55fb9
Adjust sx,sy homes
Douglas Clowes
2008-05-12 11:06:54 +10:00
e235fd85cc
Adjust limits to reflect reality
Douglas Clowes
2008-05-12 11:06:18 +10:00
445a332370
Set Motor status to HWBusy in State_Unknown Discard outstanding message response on entering State_Unknown (timing window) Don't break if it times out while waiting Defer various faults until motor has stopped Rename absenc to absencoder in list command (if has encoder) Modify absenc to report integer encoder value Allow manager to set various sensitive values in motor debug mode Make motor "reset" command wait until motor reinitialised (timing window)
Douglas Clowes
2008-05-12 11:05:35 +10:00
2a469d6b89
Dan's changes for small sample Z stage (temporary)
Douglas Clowes
2008-05-08 16:50:32 +10:00
Ferdi Franceschini