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

3189 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ferdi Franceschini
c036a05035 Fix type and units on kookaburra parameters. 2014-02-20 10:56:29 +11:00
Ferdi Franceschini
df49a9d5b6 Merge branch 'RELEASE-3_0' of ics2-dev.nbi.ansto.gov.au:workspace/GIT/sicsdev_git into RELEASE-3_0 2014-02-20 07:53:00 +11:00
Ferdi Franceschini
fcbdfd51d1 Added parameters requested by Christine. 2014-02-20 07:52:46 +11:00
Ferdi Franceschini
d187f888fb Override common antohm_linked.xml with config from ics1-kookaburra. 
The OAT_TABLE command doesn't support <IX> tables.
 2014-02-20 07:52:02 +11:00
Ferdi Franceschini
aedc3f9168 Update from ics1-kookaburra 2014-02-20 07:46:01 +11:00
Douglas Clowes
867b783ab9 Rename bilby rough_20 to rough_100 2014-02-19 17:20:16 +11:00
Douglas Clowes
4bfa758667 Fix some compiler warnings and mixed space/tab indentation 2014-02-19 14:37:13 +11:00
Douglas Clowes
54e217af78 Bilby Script Context drivers for galil-attached devices 2014-02-19 14:33:19 +11:00
Douglas Clowes
0ea068cc31 Generate code to report errors in script context hook code 2014-02-19 12:06:22 +11:00
Douglas Clowes
2c25c64db3 Enable GNU GCC type checking of format arguments for our functions 2014-02-18 11:30:16 +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
0a3805fa5a Load instrument specific rules if defined in the anticollider.tcl 2014-02-14 15:04:05 +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
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. 2014-02-10 16:37:07 +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
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.
 2014-02-07 14:30:01 +11:00
Douglas Clowes
99b5b92565 Add base/span properties and a gas factor calculation 2014-02-07 11:52:54 +11:00
Douglas Clowes
7f99daaf05 Implement driver, group and variable attributes/properties 2014-02-07 11:52:54 +11:00
Douglas Clowes
115965fbae Make the driveable interface tailorable and suppress unused code block 2014-02-07 11:52:54 +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
Ferdi Franceschini
3e8184b6a3 Add speed acceleration and descriptive information sourced from Dan's spreadsheet. 2014-02-06 07:18:15 +11:00
Ferdi Franceschini
dba900c124 Bilby has eight motion controllers. 2014-02-05 15:51:22 +11:00
Ferdi Franceschini
2246c58837 Allow up to eight fake Galil controllers when testing. 2014-02-05 15:51:01 +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
c3f5087ea4 Added PLC_HOSTPORT dictionary. TODO set IP PORT 2014-02-03 23:14:20 +11:00
Douglas Clowes
f14b2c0a82 Script Context driver generator files for Hiden XCS and Isotech Power Supply 2014-02-03 11:05:04 +11:00
Douglas Clowes
964d218a20 Start of sct generator description file for Julabo LH45 2014-02-03 11:05:03 +11:00
Douglas Clowes
a2120c79e8 Make args optional and fix some issues 2014-02-03 11:05:03 +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
64b7de358c We don't need to lookup socket numbers for the Galil controllers in the services file. 2014-02-02 17:35:14 +11:00
Ferdi Franceschini
4f65f5281f Don't insert date in generated motor configuration file. 2014-02-02 17:31:56 +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
8f2a1adec4 Make genmotconf a bit quieter. 
But it would be good to generate labels for the posit_n values.
 2014-01-31 13:52:22 +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
64870e7bc8 Refactor anticollision script so that we can add more scripts to the anticollision module. 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
f6ae3c62f7 SICS-719: Acknowledge errors when in protocol 2 or 3 2014-01-31 09:15:06 +11:00
Douglas Clowes
c2c7128245 Put the generated driver where we got the input 2014-01-30 17:22:09 +11:00