Ferdi Franceschini
c1b5b558f0
Make all sct drivers.
2014-07-15 10:56:27 +10:00
Douglas Clowes
202004766a
Check for existence of config dict fields before using them in generated drivers
2014-06-30 12:49:22 +10:00
Ferdi Franceschini
e971cd8b64
New sicsconfig.ini file configuration editor.
...
Updated wombat sics_config.ini and gen_sct.py
Generated new tcl files from sct templates and
modified some old sct_*.tcl drivers.
TODO
sct_keithley_2700.tcl
magneticField/sct_oxford_labview.tcl
magneticField/sct_bruker_BEC1.tcl
temperature/sct_watlow_st4.tcl
temperature/sct_oxford_mercury.tcl
temperature/sct_mercury_pres.tcl
temperature/sct_julabo_lh45.tcl
temperature/sct_lakeshore_340.tcl
temperature/sct_julabo_lh45_gen.tcl
temperature/sct_watlow_rm.tcl
temperature/sct_eurotherm_2000.tcl
temperature/sct_lakeshore_336.tcl
temperature/sct_watlow_pm.tcl
temperature/sct_oxford_itc.tcl
temperature/sct_lakeshore_370.tcl
temperature/west400.tcl
2014-06-30 09:08:19 +10:00
Douglas Clowes
fe3489b61f
SICS-754 Use "clientput" instead of "puts stdout" in generated drivers
2014-06-26 13:48:44 +10:00
Ferdi Franceschini
0b293e5399
Use the new make_vmot command to make a virtual motor has the same klass as the real motor it is chained to.
2014-06-23 10:29:18 +10:00
Ferdi Franceschini
713452aac6
Added sap ten position virtual motor for sample aperture.
2014-06-18 16:52:20 +10:00
Ferdi Franceschini
0711340da7
The biggest aperture has been setup as the zero position on the sample aperture.
...
The changes have been sent to Dan for inclusion in the Bilby motion control spreadsheet.
2014-06-18 16:01:19 +10:00
Ferdi Franceschini
e32e46b84e
Added sap eleven position virtual motor to select apertures via sapmot.
2014-06-17 22:31:39 +10:00
Ferdi Franceschini
3bffbf720f
Added sapmot sample aperture motor from new Bilby motion control spreadsheet.
2014-06-17 22:31:38 +10:00
Douglas Clowes
171342c97e
Make driver nodes mutable and regen
2014-06-17 15:45:03 +10:00
Ferdi Franceschini
79cedd58dc
Fix return value for simulated t0_chopper_id.
...
Also save value as an array, this is useful when testing the code.
2014-06-17 12:30:54 +10:00
Ferdi Franceschini
e0edfb8d0a
Implement the Ltof_<det> time of flight length calculations and the nguide selection command.
2014-06-17 12:30:53 +10:00
Ferdi Franceschini
2996889ea5
The timing chopper isn't necessarily the same as the master chopper.
2014-06-17 12:30:52 +10:00
Ferdi Franceschini
c00c317b69
Changed aperture rule to allow driving apertures up past 5 degrees.
...
This was done to facilitate implementation of the nguide guide selection command.
Also fixed miscount of collimator sections.
2014-06-17 12:30:52 +10:00
Ferdi Franceschini
e817fc9ed7
New aperture encoders and beamstops 4 and 5 added to Bilby.
2014-06-17 12:30:51 +10:00
Ferdi Franceschini
f9a8b2b005
Save the tank position as an array just to be consistent with the other motion axes.
2014-06-17 12:27:28 +10:00
Ferdi Franceschini
40afb4a829
Set klass attribute on vessel_y variable.
2014-06-17 07:23:00 +10:00
Douglas Clowes
1010003d6c
Regenerate templated drivers to get changes to logging and simulation tests
2014-06-16 10:37:10 +10:00
Ferdi Franceschini
58f23cc91d
Motor configuration updates from Bilby motion control spreadsheets.
2014-06-13 09:04:53 +10:00
Ferdi Franceschini
5df6300255
Updated detector carriage minimum separation after correcting curtaindet configuration.
...
NOTE: The stepsperx and cntsperx were changed in the Bilby motion control spreadsheet after SICS was deployed.
2014-06-10 19:57:54 +10:00
Ferdi Franceschini
df7ad295ed
Enabled detector carriage anticollider rule.
2014-06-10 19:27:18 +10:00
Ferdi Franceschini
70e9ce99e4
Updated motor configuration from Bilby_motion_control_SICS.xls, 10-06-2014T16:45
2014-06-10 19:26:58 +10:00
Ferdi Franceschini
1baf4faa90
Add tank position and set vessel_y SICS variable for Ltof calculation.
2014-06-10 19:24:57 +10:00
Douglas Clowes
49361e3430
Pull back configurations changes from Bilby
2014-06-04 15:17:35 +10:00
Douglas Clowes
a1572f3152
Add astrium chopper field 'master' to driver
2014-05-30 17:18:29 +10:00
Douglas Clowes
bd0c0b5556
Bilby Astrium Chopper Driver and Fake Chopper
2014-05-29 12:36:54 +10:00
Douglas Clowes
92d3acb5d5
Remove superfluous trailing white space from TCL files
2014-05-16 17:23:58 +10:00
Douglas Clowes
81ed966092
Regen sct drivers with async and logging changes
2014-05-16 15:39:58 +10:00
Ferdi Franceschini
668cbcc3ed
Update Bilby motor configuration. Adds tank and sample stage.
...
Also changed some names as requested by Anna.
2014-05-16 13:56:51 +10:00
Ferdi Franceschini
0ae4d40470
Deploy all environment drivers to all instruments.
2014-05-16 13:56:51 +10:00
Douglas Clowes
ad50eaca6a
Regenerate all of the generated driver code
2014-04-17 13:45:35 +10:00
Douglas Clowes
d08f5b6541
Update generated driver code
2014-04-14 10:34:43 +10:00
Ferdi Franceschini
50ea059237
Updated Bilby motor configuration. Adds beamstop 3
...
From Bilby commissioning xsl dated 2014-02-20
2014-03-25 12:27:29 +11:00
Ferdi Franceschini
bea943ddf2
Add new reactor status object to instruments.
2014-03-25 09:23:57 +11:00
Douglas Clowes
9f8eabd3ec
Implicit setting type to part/drivable if not set explicitly
2014-03-18 15:02:39 +11:00
Douglas Clowes
94e2e06f22
Wrap generated driver code in 'catch' and handle_exception blocks
2014-03-18 12:42:56 +11:00
Douglas Clowes
ad06ef1711
Remove 'create_node' from driver generator and '*.sct' files
...
It wasn't in working condition nor was it being used in any drivers
2014-03-18 09:29:30 +11:00
Ferdi Franceschini
9d33923bf2
Move the attenuator posit motor to the instrument group with the att motor.
2014-02-21 16:53:30 +11:00
Ferdi Franceschini
a81d120c94
Bilby only has one beam monitor
2014-02-21 12:51:50 +11:00
Ferdi Franceschini
da781de657
The anticollider proximity_script should not raise an error if no proximity_rules have been defined.
2014-02-20 16:44:13 +11:00
Douglas Clowes
3d8fd84f70
Move stuff up from collimator to instrument and add virtual motors for slits and attentuator
2014-02-20 14:58:29 +11:00
Douglas Clowes
867b783ab9
Rename bilby rough_20 to rough_100
2014-02-19 17:20:16 +11:00
Douglas Clowes
54e217af78
Bilby Script Context drivers for galil-attached devices
2014-02-19 14:33:19 +11:00
Ferdi Franceschini
f7b7c27415
Added asynch queue to send commands to the chopper selector.
2014-02-17 14:45:28 +11:00
Ferdi Franceschini
bacf578fdc
Implemented ::anticollider::proximity_script to be used with detector carriages.
2014-02-17 14:45:00 +11:00
Ferdi Franceschini
4748f9ba58
Correction for ap8 fwd and rev limit switch encoder values
2014-02-10 16:37:58 +11:00
Ferdi Franceschini
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.
2014-02-07 14:32:24 +11:00
Ferdi Franceschini
888e3575b8
Added some group and units info for detector motors and SDH box.
2014-02-06 08:18:14 +11:00
Ferdi Franceschini
3b62ab1127
Fixed hostname for bilby motor tests
2014-02-06 07:54:00 +11:00
Ferdi Franceschini
a9ead2ee30
Add speed acceleration and descriptive information sourced from Dan's spreadsheet.
2014-02-06 07:53:33 +11:00
