c36768a722
Removed junk which that dopey computer in the Koala cabin keeps pasting into files.
Ferdi Franceschini
2007-09-03 12:52:35 +10:00
65550b1fb8
Mark Lesha - General Debugging
Mark Lesha
2007-09-03 12:36:02 +10:00
69e67f0e67
Mark Lesha - General debug
Mark Lesha
2007-09-03 12:35:36 +10:00
0ed6ecbffb
Fixed insane typo.
Mark Lesha
2007-08-23 17:05:35 +10:00
943b0c8293
Added evcontroller sdsinfo and save commands
Mark Lesha
2007-08-23 16:42:40 +10:00
88489adc49
fast shutter code added
Dan Bartlett
2007-08-23 15:48:22 +10:00
e76c3922f0
Fixed general bugs.
Mark Lesha
2007-08-23 15:08:52 +10:00
a85720686b
Make sure that the last things we do are to set the sics object attributes and then build the hdb tree.
Ferdi Franceschini
2007-08-21 08:54:45 +10:00
c4fd7a4d9f
Added environment controller as a sics object type to the new hdb/nexus code.
Ferdi Franceschini
2007-08-21 08:52:25 +10:00
9d9bf24775
Replaced space with underscore in environment controller descriptor to stop it from being represented as a list of two words in programs.
Ferdi Franceschini
2007-08-21 08:49:18 +10:00
df40d6a26f
Provide cylindrical detector support for Echidna and Wombat. Includes a proc to generate a two_theta axis from the X bin boundaries.
Ferdi Franceschini
2007-08-16 17:14:51 +10:00
29cbc6e01f
Added support to generate SICS port numbers from user ID if SICS is launched from a subdirectory of the user's home.
Ferdi Franceschini
2007-08-16 17:13:19 +10:00
1a620a08ea
debug_msg now works from shallow calls.
Ferdi Franceschini
2007-08-16 17:09:50 +10:00
4495f867e4
Use new common hipada config file.
Ferdi Franceschini
2007-08-16 16:55:36 +10:00
d469bb8aa0
Added empty set_sobj_attributes proc.
Ferdi Franceschini
2007-08-16 16:53:24 +10:00
5c9b53efbc
Added new hdb/nexus support.
Ferdi Franceschini
2007-08-16 16:46:12 +10:00
091dc0d2d2
Copy config files for new hdb/nexus support. Copy cylindrical detector configuration
Ferdi Franceschini
2007-08-16 16:45:23 +10:00
2b2ec38ceb
Don't MakeAsyncQueue when using simulated driver.
Ferdi Franceschini
2007-08-16 16:40:00 +10:00
950037bfc3
Don't MakeAsyncQueue when using simulated driver. Add metedata to slit gap and offset motors for new hdb and nexus code.
Ferdi Franceschini
2007-08-16 16:37:45 +10:00
33af13cdd1
Use new common hipada config file.
Ferdi Franceschini
2007-08-16 16:09:42 +10:00
a483a327b0
Added empty set_sobj_attributes proc.
Ferdi Franceschini
2007-08-16 16:05:50 +10:00
6ce90065d3
Check scan variable limits before starting a scan. Added reset_position option to hmm_scan_finish to drive motors back to their start position at the end of a scan.
Ferdi Franceschini
2007-08-16 16:03:14 +10:00
530436b257
Set metadata for plc variables.
Ferdi Franceschini
2007-08-16 15:42:07 +10:00
01890b5cff
Initial scratch file support Added support for aliasing data.
Ferdi Franceschini
2007-08-16 15:11:07 +10:00
a8d5cff322
Added detector height and width variables. Use anstohm_linked.xml so we can override default config. Specify alias names for data axes. Define macros for generating X, Y, T axes from bin boundaries. XXX_TABLE procs now support the following subcommands, -clear, -init, -get, -list OAT_TABLE now calculates bin boundaries, this is useful for generating axes. Initialise OAT and FAT tables.
Ferdi Franceschini
2007-08-16 14:50:04 +10:00
000de2ec2b
Remove children list from spec. Added instrument klass.
Ferdi Franceschini
2007-08-16 14:34:46 +10:00
bf8d5e63be
Add macros to hdb.
Ferdi Franceschini
2007-08-16 14:31:50 +10:00
85774be9f9
no message
Dan Bartlett
2007-08-16 14:31:07 +10:00
127249e294
Fixup paths to match nexus spec.
Ferdi Franceschini
2007-08-16 14:28:14 +10:00
1feea01434
Fixup data paths and names to match nexus spec.
Ferdi Franceschini
2007-08-16 14:27:13 +10:00
f873ffce89
Allow named ports or port numbers for the SICS ports Use nexus data names. Set SICS object attributes for new hdb and nexus support.
Ferdi Franceschini
2007-08-16 14:25:37 +10:00
3fb134872b
Added support to disable status checking when a scan is aborted. See JIRA:SICS-65
Ferdi Franceschini
2007-08-16 14:18:23 +10:00
ce3e240c53
fix some typos and update measured home positions
Douglas Clowes
2007-08-10 10:34:32 +10:00
7f0a479080
Simple two-theta virtual motor
Douglas Clowes
2007-08-10 10:33:21 +10:00
77657615e6
MAJOR changes: remove deprecated pre state machine code, revise state transitions, add state entry events, part of the RUNx implementation, comments, ....
Douglas Clowes
2007-08-10 10:32:40 +10:00
c415db8352
Add timestamps to log file, fix? line terminations
Douglas Clowes
2007-08-10 10:26:56 +10:00
b701a69b15
Add queue/controller level opaque pointer for units to coordinate controller access. Read multiple bytes at a time and pass them sequentially to the input callback to reduce number of system calls.
Douglas Clowes
2007-08-10 10:25:40 +10:00
ecfd182a2e
Add queue/controller level opaque pointer for units to coordinate controller access
Douglas Clowes
2007-08-10 10:24:34 +10:00
18ab7a86b8
Before removal of deprecated code
Douglas Clowes
2007-08-02 08:06:01 +10:00
d0ac56e112
reduce mx and my hard and soft limits to be within limit switches
Douglas Clowes
2007-07-26 12:22:57 +10:00
2494fa6ad3
Updated kowari for new hdb and nexus code.
Ferdi Franceschini
2007-07-22 15:58:52 +10:00
8770acc191
Merged new hdb and nexus code.
Ferdi Franceschini
2007-07-22 15:23:41 +10:00
4e407d0a73
Detector Y and analyser axes added
Dan Bartlett
2007-07-20 10:37:05 +10:00
6696692353
no message
Dan Bartlett
2007-07-20 10:36:10 +10:00
1d35fb41b4
IP addresses changed. reduced by 2
Dan Bartlett
2007-07-20 10:35:09 +10:00
85d58121a5
progressive commissioning
Douglas Clowes
2007-07-20 10:05:00 +10:00
9bd5dee0ec
Add the chopper config file
Douglas Clowes
2007-07-12 08:49:33 +10:00
e36f220d23
Add QUOKKA/SANS to Makefile
Douglas Clowes
2007-07-12 08:48:39 +10:00
8a7108deca
Copied from Platypus Reflectometer
Douglas Clowes
2007-07-09 16:02:35 +10:00
9404d80fb9
place holder
Douglas Clowes
2007-07-09 15:55:16 +10:00
75deabc9cc
moved to config/velsel
Douglas Clowes
2007-07-09 15:27:18 +10:00
416fbe4879
Configuration files mostly copied from Platypus Reflectometer
Douglas Clowes
2007-07-09 15:25:57 +10:00
47f31054aa
Configuration directories mostly copied from Platypus Reflectometer
Douglas Clowes
2007-07-09 15:24:03 +10:00
802dbe3e88
Configuration directories mostly copied from Platypus Reflectometer
Douglas Clowes
2007-07-09 15:08:08 +10:00
7d9d72a79d
Updated the mtth encoder value to match what Vladimir tells me is 90 degrees. mx is now positive towards dance floor.
Ferdi Franceschini
2007-07-05 11:56:58 +10:00
a63bf65270
Set mtth home encoder position at 90 degrees
Douglas Clowes
2007-07-05 10:32:19 +10:00
3aa3c41114
Reverse sense of X on monochromator (left is positive)
Douglas Clowes
2007-07-05 10:30:46 +10:00
22bdf5bebd
Reduce difference detection between hipadaba floats
Douglas Clowes
2007-07-05 09:43:27 +10:00
5c0036fe87
Swap MX and MY and change sign
Douglas Clowes
2007-07-05 09:42:46 +10:00
063fafbe83
Update the beam attenuator (bat) home, increase deceleration for slit motors to prevent overrun, adjust slit ranges individually for maximum scan range
Douglas Clowes
2007-06-27 11:02:36 +10:00
4ce55c17ac
Logic inversion from "if true" to "if not false"
Douglas Clowes
2007-06-27 10:59:52 +10:00
d27a9cb9b6
periodically poll and update the motor position, specifically for hipadaba, to capture motion that is not commanded (e.g. homing slit motors and turning motors by hand)
Douglas Clowes
2007-06-27 10:58:42 +10:00
423e9c65c0
Spelling and typos
Douglas Clowes
2007-06-13 10:05:00 +10:00
c30c1a97f8
add sics_ports.tcl because it breaks deployment when this file is empty
Douglas Clowes
2007-06-13 09:57:10 +10:00
90c48ae7c5
Move gumxml.tcl to instrument directory
Douglas Clowes
2007-06-13 09:53:39 +10:00
3431ff478f
Calibration of monochromator motors
Douglas Clowes
2007-06-13 09:51:49 +10:00
be40877668
Modified from sics/tcl/gumxml.tcl to select only nodes with attribute control=true
Douglas Clowes
2007-06-08 14:03:27 +10:00
ea52ccfcae
Use BAD_VALUE #define
Douglas Clowes
2007-06-05 13:29:16 +10:00
c8d13fef1d
Commissioning of monochromator stage
Douglas Clowes
2007-06-05 11:56:59 +10:00
7d28dd3cd4
Initial working version
Douglas Clowes
2007-06-01 16:55:34 +10:00
fa5e2711e8
Gross changes for commissioning.
Douglas Clowes
2007-06-01 16:54:25 +10:00
fe63096315
Change Flight Tube to use REQx/RSPx instead of FTUBE/APDONE variables. Now workks for RSD Sample raise dual motor as well.
Douglas Clowes
2007-06-01 16:53:25 +10:00
d75f423f43
Change Flight Tube to use REQx/RSPx instead of APDONE variables.
Douglas Clowes
2007-06-01 16:52:06 +10:00
d785f48aa7
Change Flight Tube to use REQx/RSPx instead of FTUBE/APDONE variables. Now workks for RSD Sample raise dual motor as well. Move DMC_Notify and reset state machine on reconnect.
Douglas Clowes
2007-06-01 16:50:24 +10:00
6e919f84ff
Fix typos (spelling)
Douglas Clowes
2007-06-01 16:03:20 +10:00
f98d8a876c
Fix typo "|n" instead of "\n"
Douglas Clowes
2007-06-01 16:02:34 +10:00
98e8fb742f
no message
Dan Bartlett
2007-05-31 16:33:10 +10:00
8e52e84ac2
hmake for type array used wrong argument for array length
Douglas Clowes
2007-05-30 11:02:02 +10:00
55eb873873
replaced by AsyncQueue
Douglas Clowes
2007-05-25 16:46:58 +10:00
c691f95a8f
Spelling
Douglas Clowes
2007-05-25 16:42:18 +10:00
1b4bafbeb4
fix some spelling and sync with changes to interface.h for RemoveCallback3
Douglas Clowes
2007-05-25 16:36:47 +10:00
9438dc0973
Add some logging, comments, report unhandled events in the state machine. Limit the state and trace commands to motors with finite state machines.
Douglas Clowes
2007-05-25 16:19:37 +10:00
6ed6e5e6cb
Make motor uninterest work by using RemoveCallback3 and a custom function to check that the pCon is the correct one. Remove any prior interest for this motor and pCon before installing the new one. Limits the interest callback message count to one.
Douglas Clowes
2007-05-25 16:17:44 +10:00
efe6f72b43
Add RemoveCallback3 to match callback function and supply user function to determine if this callback should be deleted. Allows checking inside the userdata structure instead of just the address - needed for motor uninterest.
Douglas Clowes
2007-05-25 16:15:15 +10:00
2d36c99ac8
fix some spelling
Douglas Clowes
2007-05-25 16:12:57 +10:00
f70233d55d
implement some TODOs, add malloc checks and logging
Douglas Clowes
2007-05-25 16:12:10 +10:00
64918f0a45
Two-theta angles can be negative.
Ferdi Franceschini
2007-05-24 15:31:08 +10:00
ae647f85fa
TaskSignal sets the calling task status to WAITING to prevent recursion through TaskYield.
Ferdi Franceschini
2007-05-24 15:29:48 +10:00
06264a4b4b
fix slack code that was probably never used anyway
Douglas Clowes
2007-05-24 15:04:33 +10:00
785fe7bb96
Memory cleanup
Douglas Clowes
2007-05-24 14:49:02 +10:00
8678bcb102
Add -d option for debugging - to suppress daemonisation for profiler and debugger
Douglas Clowes
2007-05-23 08:55:21 +10:00
09a64afee3
fix memory leak
Douglas Clowes
2007-05-23 08:53:41 +10:00
Mark Lesha