db1a7d3b4d
fix a couple of memory leaks
Douglas Clowes
2007-05-23 08:52:31 +10:00
0646439d1c
trivial bug/typo
Douglas Clowes
2007-05-23 08:51:45 +10:00
377ce04879
Fix warnings for printf formats
Douglas Clowes
2007-05-22 08:29:38 +10:00
6d449014fc
remove misleading comment
Douglas Clowes
2007-05-22 08:15:56 +10:00
163b03b557
Configurable terminators for normal protocols
Douglas Clowes
2007-05-21 17:57:33 +10:00
4e5ea6a61c
use separate function for delayed start now that CommandTimeout has been changed to include retries and other stuff.
Douglas Clowes
2007-05-21 17:51:50 +10:00
65b36cf992
Silly typos "==" should be "="
Douglas Clowes
2007-05-21 17:50:27 +10:00
dbcdf0e38c
do not use port if it was not supplied
Douglas Clowes
2007-05-21 14:17:27 +10:00
ef76d668bf
return on error to prevent crash
Douglas Clowes
2007-05-21 14:16:44 +10:00
1320d14426
multichan becomes AsyncQueue and AsyncProtocol
Douglas Clowes
2007-05-21 14:15:33 +10:00
76d4c83793
Oscillating collimator code added
Dan Bartlett
2007-05-16 17:05:58 +10:00
20e00a8504
Beam attenuator commissioned
Dan Bartlett
2007-05-16 17:04:01 +10:00
f374e445bf
multichan becomes AsyncQueue and AsyncProtocol
Douglas Clowes
2007-05-15 13:15:34 +10:00
1ea715020a
Remove old multichanfactory
Douglas Clowes
2007-05-15 13:14:25 +10:00
27d849ea23
multichan becomes AsyncQueue and AsyncProtocol
Douglas Clowes
2007-05-15 12:47:58 +10:00
c47e4ad45c
Make finite state machine the default. Make blocked motors fail the default. Add "data" to display computed data for motor. Improve blocked motor test message.
Douglas Clowes
2007-05-15 12:35:24 +10:00
1eb1698d79
make the arguments case insensitive i.e. allow test or TEST
Douglas Clowes
2007-05-15 12:31:22 +10:00
a181e68d36
multichan becomes AsyncQueue and AsyncProtocol
Douglas Clowes
2007-05-14 08:26:24 +10:00
bc3224a9c4
changes to mtth
Douglas Clowes
2007-05-11 17:34:24 +10:00
c41f37b657
Better cleanup of CVS and build files and directories, improve tar and ssh commands
Douglas Clowes
2007-05-11 17:29:57 +10:00
a18500cbf0
multichan becomes AsyncQueue and AsyncProtocol
Douglas Clowes
2007-05-11 17:28:31 +10:00
6d9120f796
Added motor_driver_type variable so we can switch between the real (DMC2280) drivers and the simulated drivers.
Ferdi Franceschini
2007-05-10 16:12:25 +10:00
7a2f0c238a
Make sure default drive speed is non-zero, otherwise we're no going anywhere.
Ferdi Franceschini
2007-05-10 16:10:35 +10:00
691ea5dbf0
Reverted support for text value parameters. This has been made obsolete by the pActionRoutine.
Ferdi Franceschini
2007-05-10 16:09:04 +10:00
5b683ecbe0
Fixed botched merge. The merge effectively created duplicate setmode procs.
Ferdi Franceschini
2007-05-10 13:28:27 +10:00
a151a2a163
Set motor_driver_type to "asim" when motor_simulation flag is true, otherwise set it to DMC2280.
Ferdi Franceschini
2007-05-10 13:24:28 +10:00
ebba5a8052
Added motor_simulation flag. If true then the motor_configuration.tcl files should create ANSTO simulated motor drivers.
Ferdi Franceschini
2007-05-10 13:21:51 +10:00
717f9beea7
Tidied up indents etc, to make it easy to compare diffs against the echidna config.
Ferdi Franceschini
2007-05-10 13:18:06 +10:00
73d144340d
Modified the ANSTO simulated motor driver so that it now accepts a list of named parameters, and supports the extra metadata parameters needed for generating hipadaba interfaces. This means that ASIM motor drivers can now be configured with the same configuration file as the DMC2280 driver. Also ensured that motors drive instantly to there target position, this streamlines testing and is useful for the script validation server.
Ferdi Franceschini
2007-05-10 13:15:21 +10:00
cb7d9fc8ae
no message
Dan Bartlett
2007-05-09 12:27:37 +10:00
55347984ec
Checked files modified by the merge with: cvs diff -u -rRELEASE-1_2-MERGEPOINT -rHEAD <filepath> and found no modifications on the trunk between the release 1.2 mergepoint and cvs HEAD
Ferdi Franceschini
2007-05-08 15:01:16 +10:00
86b99280d4
Merged the simulation mode setup from the trunk with the modified setmode command from the branch.
Ferdi Franceschini
2007-05-08 14:59:26 +10:00
4594b23f13
Merged in favour of branch. Get the horizontal and vertical axis names for the data from the _hmm_{hor,vert}_axis SICS variables when saving data. These variables are set by the command which collects the data.
Ferdi Franceschini
2007-05-08 14:58:51 +10:00
e6c78ef4d6
Resolved conflict in favour of release 1.3
Ferdi Franceschini
2007-05-07 16:27:07 +10:00
a33918149c
Bringing kowari layout and config inline with the current requirements of the deployment script.
Ferdi Franceschini
2007-05-07 15:54:09 +10:00
6fc1a8feca
Bringing kowari layout and config inline with the current requirements of the deployment script.
Ferdi Franceschini
2007-05-07 15:30:02 +10:00
84f883f5d7
Implement finite state machine model. Improved backlash (unidirectional motor driving). Precision motor creeping. Ensure thread zero is operating. Floating point steps and counts per unit. "send", "reset", "state" and "trace" commands.
Douglas Clowes
2007-05-04 14:01:19 +10:00
bbdc2f820d
minor, trivial and cosmetic changes not related to state machine implementation
Douglas Clowes
2007-05-04 13:47:21 +10:00
911c0d8450
no message
Dan Bartlett
2007-05-03 16:53:56 +10:00
4e3e0e7247
Bug fix - when inserting timers into timer queue timer could go missing. Also clear next pointer on insert into tail and clear vrfy on free.
Douglas Clowes
2007-04-24 17:18:57 +10:00
c01188bc8b
Fixed order of histogram memory data axes.
Ferdi Franceschini
2007-04-23 10:34:44 +10:00
83744c2e15
Added "master" motor name lists for configurable virtualmotors.
Ferdi Franceschini
2007-04-20 12:47:27 +10:00
d0957b18d5
Move things around, fix typo
Douglas Clowes
2007-04-20 09:11:03 +10:00
093bf92438
cosmetic changes
Douglas Clowes
2007-04-20 09:08:32 +10:00
8b27116358
backlash preseek made internal
Douglas Clowes
2007-04-19 15:56:56 +10:00
34da43b4ee
Update slit gearing ratio to computed 6 * 7:3 stages
Douglas Clowes
2007-04-19 10:08:59 +10:00
4b33abe79c
change comment and reposition stepsPerX in list command
Douglas Clowes
2007-04-18 09:59:04 +10:00
a77d9feb59
Add MakeStateMon
Douglas Clowes
2007-04-18 09:38:07 +10:00
4693ad1686
move string parameters from "list" to "slist" because non-numerics in "list" upset hipadaba stuff. Also implement motor "setpos" command with two arguments.
Douglas Clowes
2007-04-18 09:35:32 +10:00
98a2081f99
Update safety PLC multichan to remove RS232 controller
Douglas Clowes
2007-04-18 09:32:58 +10:00
c8558d0a5b
Reverted hipadaba paths to original settings.
Ferdi Franceschini
2007-04-16 16:16:57 +10:00
784b391415
Added part and type info to motors and modified hpaths to work with new hipadaba config code.
Ferdi Franceschini
2007-04-16 14:46:49 +10:00
487f370d5e
Added extended hmake "xhmake" to make it easier to create long paths.
Ferdi Franceschini
2007-04-16 14:44:25 +10:00
40e1042cda
reverse comparison operators
Douglas Clowes
2007-04-16 10:46:55 +10:00
3e5a3d1201
motor_hpath now maps part identifiers to hipadaba nodes
Ferdi Franceschini
2007-04-13 16:37:02 +10:00
e2f968c923
Added part identifiers to support the new hipadaba path generation code. Added long_name fields to support nexus file writing.
Ferdi Franceschini
2007-04-13 16:33:48 +10:00
f48217e383
Added option to select simulation mode for SICS.
Ferdi Franceschini
2007-04-13 13:13:22 +10:00
d0b8de93b1
Provided option to use simulated hmm drivers.
Ferdi Franceschini
2007-04-13 12:57:17 +10:00
1c65171e4e
Create beam monitor in instrument specific configuration and provide option for creating simulated beam monitor driver.
Ferdi Franceschini
2007-04-13 12:52:49 +10:00
57a2cff61c
typo
Douglas Clowes
2007-04-12 17:08:41 +10:00
a3ec8b98a0
First pass at Universal Unidirectional Motor Driving (UUMD)
Douglas Clowes
2007-04-12 16:59:32 +10:00
cff3ac6553
Added code for counter source filtering
Douglas Clowes
2007-04-12 15:54:04 +10:00
f95142b219
no message
Dan Bartlett
2007-04-10 13:40:09 +10:00
3534fcefb9
Remove trailing spaces to reduce differences with echidna
Douglas Clowes
2007-04-10 10:31:41 +10:00
7363a846e1
motion is OK if motor has no absolute encoder
Douglas Clowes
2007-04-10 10:17:01 +10:00
466e1bf4a9
Change stepsPerX and CountsPerX calculations to floating point
Douglas Clowes
2007-04-10 09:56:18 +10:00
36dab66dc7
Change timer calculation based on feedback from PSI. Remove some duplicate code.
Douglas Clowes
2007-04-10 09:53:22 +10:00
a7a480c5d1
Change stepsPerX and CountsPerX to float and revise PA calculation to avoid floting point limitation in GALIL
Douglas Clowes
2007-04-10 09:50:47 +10:00
72fd4d9ff5
no message
Dan Bartlett
2007-04-10 08:08:20 +10:00
55f45afcc4
Fixes to RELEASE-1_1 Tubes weren't paired when folding Fix sign for cartesian coordinates on slits.
Ferdi Franceschini
2007-04-06 19:32:57 +10:00
e7324b8335
Merged RELEASE-1_1 back into trunk.
Ferdi Franceschini
2007-04-06 19:10:02 +10:00
79ac59740f
MJL 4/4/07 Added upload of any dictonary entries starting with 'read_data_' as HTTP options in data read reques to histogram server, allows read data source & format to be adjusted on-the-fly.
Mark Lesha
2007-04-04 07:57:29 +10:00
b250273deb
Change filter "type" for slits to "aperture" and add grouping information.
Ferdi Franceschini
2007-04-02 18:22:56 +10:00
f338cf5b4e
Map motor types to hipadaba paths in the motor_hpath tuple list.
Ferdi Franceschini
2007-04-02 18:20:20 +10:00
f38e44c8d8
Construct motor hipadaba paths from type and group info in the "motor part" field.
Ferdi Franceschini
2007-04-02 18:19:17 +10:00
105cc5650c
add some more checks, defer context deletion, don't double scan
Douglas Clowes
2007-04-02 17:35:44 +10:00
62aa98edf7
fix sz steprate and limits
Douglas Clowes
2007-04-02 17:33:11 +10:00
2da08390b8
Change sz count rate, remove obsolete code and do some cleaning
Douglas Clowes
2007-04-02 15:02:21 +10:00
636fb54aa7
Make the slits cartesian and do a little cleaning up
Douglas Clowes
2007-04-02 15:00:20 +10:00
c944a7383d
Should not be in CVS
Douglas Clowes
2007-04-02 14:58:24 +10:00
f3a6c7bd49
OK, now here's the thing. You have to save a dataset before you can link a VGroup to it.
Ferdi Franceschini
2007-04-01 15:44:56 +10:00
3e8375c974
What's the point? ie I forgot to set the run number.
Ferdi Franceschini
2007-04-01 15:38:16 +10:00
9fbaec72fd
The procedure which writes the data must write the run_number.
Ferdi Franceschini
2007-04-01 15:34:26 +10:00
aded505558
The run number should be written when making a new scan entry.
Ferdi Franceschini
2007-04-01 15:29:08 +10:00
486b82c526
Fixed call to nxscript.
Ferdi Franceschini
2007-04-01 15:19:04 +10:00
cae44262ab
Match up x and y pixel_offsets with the corresponding dimension.
Ferdi Franceschini
2007-04-01 15:15:44 +10:00
935116cb9b
dim0 is vertical dim1 is horizontal It's the C order thing, rows columns.
Ferdi Franceschini
2007-04-01 15:01:27 +10:00
374151be26
Fixed mixups between sics variables and tcl variables, and nxdict aliases with nexus dataset names.
Ferdi Franceschini
2007-04-01 14:53:39 +10:00
b1b0057d8b
For want of a space the battle was lost.
Ferdi Franceschini
2007-04-01 14:51:58 +10:00
2d7cf89385
Set x and y pixel offsets and run number. The run number is used as the first dimension axis for simple count and save operations.
Ferdi Franceschini
2007-04-01 14:36:09 +10:00
e67510e6bd
Fetch descriptive motor name from the motor's long_name field.
Ferdi Franceschini
2007-04-01 12:34:29 +10:00
bb588c7d05
Fixed duplication of ss1u for long_name calls.
Ferdi Franceschini
2007-04-01 12:25:40 +10:00
4712347649
Both hipd and hrpd motors have now been configured with part identifiers and and long names, and the hpaths now use the long_name fields.
Ferdi Franceschini
2007-04-01 11:58:58 +10:00
6d17aca411
Counters have a mode subcommand, not countmode!
Ferdi Franceschini
2007-04-01 10:46:51 +10:00
9d9937a5b7
Control simulated hmm driver with simulated counter to mimic the real hmc.
Ferdi Franceschini
2007-04-01 10:41:26 +10:00
Douglas Clowes