linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,712 Commits 1 Branch 0 Tags
d41e77cc796eb7632ef2a5518ed5aa99a1398085
Commit Graph

103 Commits

Author SHA1 Message Date
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
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
a9ead2ee30 Add speed acceleration and descriptive information sourced from Dan's spreadsheet. 2014-02-06 07:53:33 +11:00
Ferdi Franceschini
b257413fd0 Added chopper id command 2014-02-03 23:28:56 +11:00
Ferdi Franceschini
2fc161713a Configure OAT_TABLE for Bilby. TODO Set correct tube spacing 2014-02-03 23:15:52 +11:00
Ferdi Franceschini
baa28e41d4 Added PLC config 2014-02-03 23:14:37 +11:00
Ferdi Franceschini
a0c9b78f30 Describes CSV files. 2014-02-02 22:17:52 +11:00
Ferdi Franceschini
1a6f5df36b The D10 apertures are actually at posit 1 not 5. 2014-02-02 17:48:22 +11:00
Ferdi Franceschini
53f14de642 Set default speed, accel, decel to conservative values for ap and col motors. 2014-02-02 17:45:58 +11:00
Ferdi Franceschini
658dab2ac9 Separate the max speed, accel, decel, parameters so we can set recommended values. 
We should also put the "home" parameters in userdef_attlist if their actual positions
differ from the default of zero.
 2014-02-02 17:43:38 +11:00
Ferdi Franceschini
3522f409db Had to generated a new sicsmot_attlist.csv because the spreadsheet was updated. 
This should be done each time there's an update.
 2014-01-31 14:01:53 +11:00
Ferdi Franceschini
04906c8ca5 The aperture arm must be up to allow driving the guide. 
Low encoder values = aperture arm up.
 2014-01-31 14:00:23 +11:00
Ferdi Franceschini
1678c5a73e New version of the Bilby_motion_control_commissioning_checklist.xls spreadsheet. 
Generated new motor configuration.
 2014-01-31 09:20:19 +11:00
Ferdi Franceschini
7be4438b59 Generate anticollider rules for the collimation system on Bilby. 2014-01-31 09:15:09 +11:00
Ferdi Franceschini
901c6603fb Generate virtual motors for the collimation system. 2014-01-31 09:15:08 +11:00
Ferdi Franceschini
4a134cf2d0 genmotconf.tcl now sorts the posit_n parameters by value. 
Sort is ascending if cntsperx is positive, descending if negative.
Improve error and report logs generated by genmotconf.tcl
It is not an error if a missing attributed can be initialised with a
default value by genmotconf.tcl.
Replace the COLLIMATOR_POSITIONS.csv with Bilby_motion_control_commissioning_checklist.csv
Generate new "generated_motor_configuration.tcl" file.
 2014-01-31 09:15:07 +11:00
Ferdi Franceschini
4dacb502ec Initial Bilby motor configuration. Just collimation system for now. 
sicsmot_attlist.csv was generated by first running
../../../util/genmotconf.tcl Bilby_Motion_control_axes.csv COLLIMATOR_POSITIONS_D.csv hdb_info.csv
in the Bilby motor config directory and renaming the missing_attlist.csv to
sicsmot_attlist.csv.
NOTE
generated_motor_configuration.tcl was then made by running genmotconf again
with Bilby_Motion_control_axes.csv COLLIMATOR_POSITIONS_D.csv sicsmot_attlist.csv hdb_info.csv
 2014-01-15 16:31:15 +11:00