1692e0d4d4
Sanitize error text to reduce TCL errors
Douglas Clowes
2014-04-04 11:54:21 +11:00
f9bff7f4f2
Remove duplicate init and move sics dependency out of nwatch
Douglas Clowes
2014-04-03 12:11:53 +11:00
719fd7dc5a
Make valgrind header inclusion conditional
Douglas Clowes
2014-04-03 12:09:24 +11:00
79be4c9422
Include outcode and continuation marker, move testlog test command up.
Douglas Clowes
2014-04-03 11:59:26 +11:00
bab07abab8
Revised macro log suppression
Douglas Clowes
2014-04-01 16:18:11 +11:00
f2c5f515c4
Add radio buttons to ini files (radio = radio_group_name)
Douglas Clowes
2014-03-28 10:57:13 +11:00
9e6d04c693
Get reactor status from portal.nbi because neutron.ansto now requires SSL.
Ferdi Franceschini
2014-03-26 10:34:45 +11:00
a7f3b54a2f
Copied changes made on ics1-kowari.
Ferdi Franceschini
2014-03-26 09:05:54 +11:00
fbf1f7bbf9
Add some extra controllers to kowari just in case they're needed in the future.
Ferdi Franceschini
2014-03-26 08:23:00 +11:00
50ea059237
Updated Bilby motor configuration. Adds beamstop 3 From Bilby commissioning xsl dated 2014-02-20
Ferdi Franceschini
2014-03-25 12:27:29 +11:00
bea943ddf2
Add new reactor status object to instruments.
Ferdi Franceschini
2014-03-25 09:23:57 +11:00
a3e975457b
Allow new reactor status SCT_OBJECT to be added as a Nexus NXsource group.
Ferdi Franceschini
2014-03-24 22:23:50 +11:00
aaa07895c6
Added new reactor status driver.
Ferdi Franceschini
2014-03-24 22:22:14 +11:00
f5da28a8a0
runscan breaks on Taipan. Calling bm status here causes a recursive loop. The "bm status" calls were added in SICS-705
Ferdi Franceschini
2014-03-24 08:41:00 +11:00
a785c5ceac
Only return AsconTimeout in the aqadapter if no characters have been read. Otherwise the DevQueueTask will skip fetching the reply.
Ferdi Franceschini
2014-03-21 10:56:13 +11:00
e2f2f1bc0c
Escape illegal xml characters returned by the getgumtreexml command.
Ferdi Franceschini
2014-03-21 10:45:41 +11:00
8964750835
Implement "settle_time" in generated drivers
Douglas Clowes
2014-03-19 13:44:04 +11:00
0581b2b8e1
Allow for nested groups in gen_sct
Douglas Clowes
2014-03-19 10:58:19 +11:00
ef4d4d0235
Regenerate with nxalias and sdsinfo
Douglas Clowes
2014-03-19 09:45:33 +11:00
957ca1db19
Separate out the PID related code into pid_function blocks
Douglas Clowes
2014-03-19 09:44:16 +11:00
f257de6c34
Add implicit sdsinfo and nxalias properties.
Douglas Clowes
2014-03-19 09:42:16 +11:00
f44dc410cf
Remove spurious file close from generated drivers
Douglas Clowes
2014-03-24 10:13:19 +11:00
988cb87371
Fix typo
Douglas Clowes
2014-03-21 11:49:27 +11:00
acf9d75941
Change display of values for posit_count, motorhome, and legacy_fsm
Douglas Clowes
2014-03-19 16:59:33 +11:00
9f8eabd3ec
Implicit setting type to part/drivable if not set explicitly
Douglas Clowes
2014-03-18 15:02:39 +11:00
2db71ba537
Wrap generated driver code in 'catch' and handle_exception blocks
Douglas Clowes
2014-03-18 14:57:43 +11:00
94e2e06f22
Wrap generated driver code in 'catch' and handle_exception blocks
Douglas Clowes
2014-03-18 12:42:56 +11:00
7269776484
Remove obsolete function no longer used
Douglas Clowes
2014-03-18 10:17:29 +11:00
ad06ef1711
Remove 'create_node' from driver generator and '*.sct' files
Douglas Clowes
2014-03-18 09:29:30 +11:00
bff0473ed6
Added forgotten files to commit for compiling on Maverick
Mark Koennecke2014-03-14 09:50:31 +01:00
bc31c6cd1e
Changes to make SICS compile on OSX Maverick with clang
Mark Könnecke
2014-03-14 09:48:14 +01:00
ef236ecb1b
Refinements to motion reporting for motors
Douglas Clowes
2014-03-13 16:00:24 +11:00
0536c16843
Add motion reporting for driver run and ascillate commands
Douglas Clowes
2014-03-13 12:15:58 +11:00
5eec1a9cd5
Impliment motor "oscillate" and "status" commands and prefix "driver run"
Douglas Clowes
2014-03-11 17:10:27 +11:00
9b19ddf4e6
SICS-720 Add autofocussing on Taipan using the following energy relations, Avfocus = 115 + 2.13 * Ef Mvfocus = 102.2 + 1.78 * Ei
Ferdi Franceschini
2014-03-10 14:05:46 +11:00
879a573e05
Propagate make CC variable to SICS and hardup makes
Douglas Clowes
2014-03-07 15:27:29 +11:00
91d0dc86f5
Spelling error in output message
Douglas Clowes
2014-02-24 15:02:31 +11:00
b558f9d696
Add files to Echidna manifest and configuration to reflect changes out there
Douglas Clowes
2014-02-24 14:17:06 +11:00
9d33923bf2
Move the attenuator posit motor to the instrument group with the att motor.
Ferdi Franceschini
2014-02-21 16:53:30 +11:00
a81d120c94
Bilby only has one beam monitor
Ferdi Franceschini
2014-02-21 12:51:50 +11:00
da781de657
The anticollider proximity_script should not raise an error if no proximity_rules have been defined.
Ferdi Franceschini
2014-02-20 16:44:13 +11:00
3d8fd84f70
Move stuff up from collimator to instrument and add virtual motors for slits and attentuator
Douglas Clowes
2014-02-20 14:57:46 +11:00
c036a05035
Fix type and units on kookaburra parameters.
Ferdi Franceschini
2014-02-20 10:56:29 +11:00
df49a9d5b6
Merge branch 'RELEASE-3_0' of ics2-dev.nbi.ansto.gov.au:workspace/GIT/sicsdev_git into RELEASE-3_0
Ferdi Franceschini
2014-02-20 07:53:00 +11:00
d187f888fb
Override common antohm_linked.xml with config from ics1-kookaburra. The OAT_TABLE command doesn't support <IX> tables.
Ferdi Franceschini
2014-02-20 07:52:02 +11:00
aedc3f9168
Update from ics1-kookaburra
Ferdi Franceschini
2014-02-20 07:46:01 +11:00
867b783ab9
Rename bilby rough_20 to rough_100
Douglas Clowes
2014-02-19 17:20:16 +11:00
4bfa758667
Fix some compiler warnings and mixed space/tab indentation
Douglas Clowes
2014-02-19 14:37:13 +11:00
54e217af78
Bilby Script Context drivers for galil-attached devices
Douglas Clowes
2014-02-19 14:33:19 +11:00
0ea068cc31
Generate code to report errors in script context hook code
Douglas Clowes
2014-02-19 12:06:22 +11:00
810a3cbd94
Cleanup of the repository before pushing to gitorious
Mark Koennecke2014-02-18 16:41:37 +01:00
33e122ea9e
- Modified collective drive operations to run motors in individual tasks - Added a processnode methos to scriptcontext. processnode waits for the scriptchain of a node to finish. - Fixed a bug in sicsget - Made histmemsec dim and rank manager privilege. To allow chnage at runtime. Is required for SANS - Fixed some issues with multicountersec, mostly relating to passing things through in a sensible way. - Updated motorsec.c to work with a client based driver
koennecke
2014-02-18 13:25:32 +00:00
2c25c64db3
Enable GNU GCC type checking of format arguments for our functions
Douglas Clowes
2014-02-18 11:27:53 +11:00
f7b7c27415
Added asynch queue to send commands to the chopper selector.
Ferdi Franceschini
2014-02-17 14:45:28 +11:00
bacf578fdc
Implemented ::anticollider::proximity_script to be used with detector carriages.
Ferdi Franceschini
2014-02-17 14:45:00 +11:00
0a3805fa5a
Load instrument specific rules if defined in the anticollider.tcl
Ferdi Franceschini
2014-02-14 15:04:05 +11:00
4748f9ba58
Correction for ap8 fwd and rev limit switch encoder values
Ferdi Franceschini
2014-02-10 16:37:58 +11:00
54b383647a
Use fwd_enc_lim for SICS motor lower-limit when positive steps drive an axis in the negative direction for our standard coordinate system.
Ferdi Franceschini
2014-02-10 16:37:07 +11:00
51afda1185
The cnts_per_x for shd and vs should be negative to match our RH coord system. NOTE: The ap8 encoder values seem to be wrong in the Bilby spreadsheet. Also the det encoder values for the limits are missing in the spreadsheet.
Ferdi Franceschini
2014-02-07 14:32:24 +11:00
0c9df4d523
Use product of the signs for cnts_per_x and steps_per_x to set the fwd and rev limit values. Also use floating point in the calculations.
Ferdi Franceschini
2014-02-07 14:30:01 +11:00
99b5b92565
Add base/span properties and a gas factor calculation
Douglas Clowes
2014-02-07 11:52:04 +11:00
7f99daaf05
Implement driver, group and variable attributes/properties
Douglas Clowes
2014-02-07 11:50:53 +11:00
115965fbae
Make the driveable interface tailorable and suppress unused code block
Douglas Clowes
2014-02-04 08:59:46 +11:00
888e3575b8
Added some group and units info for detector motors and SDH box.
Ferdi Franceschini
2014-02-06 08:18:14 +11:00
3b62ab1127
Fixed hostname for bilby motor tests
Ferdi Franceschini
2014-02-06 07:54:00 +11:00
a9ead2ee30
Add speed acceleration and descriptive information sourced from Dan's spreadsheet.
Ferdi Franceschini
2014-02-06 07:53:33 +11:00
3e8184b6a3
Add speed acceleration and descriptive information sourced from Dan's spreadsheet.
Ferdi Franceschini
2014-02-06 07:18:15 +11:00