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

3348 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Douglas Clowes
172e69f9e3 Make gen_sct python program executable 2014-01-30 17:15:11 +11:00
Douglas Clowes
fcb1a6086d Ignore the parser output artifact files from gen_sct.py 2014-01-30 17:10:53 +11:00
Douglas Clowes
aebcd90f9b Python program to generate script context driver from a definition file 2014-01-30 13:17:55 +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
Ferdi Franceschini
883ebcd5d7 Some descriptive info for Bilby motors. 2014-01-15 16:31:15 +11:00
Ferdi Franceschini
882d8306bf Bilby motor configuration data extracted from Excel spreadsheets. 
The spreadsheets were provided by the electrical team and currently only define the translation tables and aperture selectors for the collimation system.
 2014-01-15 16:31:14 +11:00
Ferdi Franceschini
2481abb8af Scripts which generate a motor configuration file from CSV data files. 2014-01-15 16:31:14 +11:00
Ferdi Franceschini
e984619d77 Initial bilby configuration. 2014-01-15 16:31:14 +11:00
Ferdi Franceschini
b1f09c3dd3 Fixed error message typo. We don't want to miss errors when searching logs. 2014-01-15 16:31:13 +11:00
Ferdi Franceschini
68a746d46a SICS-710: Make the watlow_rm driveable block until a drive has finished. 
Also clear the geterror property to make sure that the driver recovers from Modbus error messages.
 2014-01-15 16:31:13 +11:00
Ferdi Franceschini
e27aea0169 SICS-709: Refresh the count status whenever the current counts are fetched (eg before saving data). 
This was broken as a side effect of SICS-664 (ie removing the unnecessary hmcontrol object).
 2014-01-15 16:31:13 +11:00
Ferdi Franceschini
03c00623ee Allow two LS336 and two LS340 temperature controllers to be selected. 2013-12-20 09:09:03 +11:00
Ferdi Franceschini
5d40914ee0 Fix typo to stop the scan command from checking thread0 on tclmot motors. 2013-12-20 09:09:02 +11:00
Ferdi Franceschini
fc02a71882 Make display window optional for SIM_GALIL.py 2013-12-20 09:09:01 +11:00
Ferdi Franceschini
d2ac198251 Updates from ics1-wombat 2013-12-20 09:09:00 +11:00
Ferdi Franceschini
6ce3f8bd45 SICS-706 Create sics_config.ini for SICS upgrade on Wombat. 2013-12-20 09:08:59 +11:00
Ferdi Franceschini
37879b9144 The ID and TYPE were the wrong way around when calling add_oxford_mercury. 2013-12-20 09:08:58 +11:00
Ferdi Franceschini
216e2b3529 SICS-697 Make named links in data group for LS336 and Oxford Mercury. 
SICS-705 Fixed log file name bug in Mercury controller.
 2013-12-20 09:08:57 +11:00
Ferdi Franceschini
d60710a3e1 Updated configuration from ics1-kookaburra. 2013-12-20 09:08:57 +11:00
Ferdi Franceschini
315d51541e Updated scan configuration from ics1-kookaburra. 2013-12-20 09:08:56 +11:00
Ferdi Franceschini
48edc7322a Updated motor configuration from ics1-kookaburra. 2013-12-20 09:08:56 +11:00
Ferdi Franceschini
2d96d3de69 Updated histmem configuration from ics1-kookaburra. 2013-12-20 09:08:56 +11:00
Ferdi Franceschini
0bf0af0847 Updated detector voltage range and OAT_TABLE configuration from ics1-platypus 2013-12-20 09:08:55 +11:00
Ferdi Franceschini
2cf513c4bb FIX: Create driver interface for each syringe pump on Platypus 2013-12-20 09:08:55 +11:00
Ferdi Franceschini
52f28117ef Updated from ics2-quokka 2013-12-20 09:08:54 +11:00
Ferdi Franceschini
852bc7462b Updated from ics2-pelican 2013-12-20 09:08:54 +11:00
Ferdi Franceschini
4643a1fd04 SICS-700 Enable region of interest configuration parameters for histogram memory 2013-12-20 09:08:53 +11:00
Ferdi Franceschini
472ca4f9d9 Updated from ics2-pelican. 2013-12-20 09:08:53 +11:00
Ferdi Franceschini
7b814089ff SICS-705 Fix mercury log file creation bug. 2013-12-20 09:08:52 +11:00
Ferdi Franceschini
99955b01da SICS-698 Make Bruker magnet driver setpoint driveable. 2013-12-20 09:08:51 +11:00
Ferdi Franceschini
5b4d044835 Make SIM_RFGen.tcl executable. 2013-12-20 09:08:51 +11:00
Ferdi Franceschini
093479f808 SICS-697 Make named links to data group using new typed naming system. 2013-12-20 09:08:49 +11:00
Ferdi Franceschini
6692a1a2bb SICS-699 Provide a hipadaba "control" group for special hdb nodes like environment setpoints and sensor readings 2013-12-20 09:08:48 +11:00
Ferdi Franceschini
58e35efba3 SICS-695 Save a named link for scan variables and other objects if required. 
If a SICS object has a "linkname" attribute then that name will be used when
making links in the data file.
 2013-12-20 09:08:47 +11:00
Ferdi Franceschini
5df895cc76 SICS-694 Save data with named links on hdb nodes decorated with named links. 
Note the use of the Tcl 8.5 {*} expand feature to expand a list into
separate arguments when calling a function.
 2013-12-20 09:08:47 +11:00
Ferdi Franceschini
e9399b6990 SICS-687 Add 'nxscript makenamedlink' command. 2013-12-20 09:08:46 +11:00
Ferdi Franceschini
650d1c0127 SICS-693 newfile BEAM_MONITOR fails. 
Make sure that the "axes" hdb property defaults to "run_number" for the BEAM_MONITOR filetype.
 2013-12-20 09:08:46 +11:00
Ferdi Franceschini
83670b3d04 SICS-690 SICS fails to initialise the hmm object on Kookaburra. 2013-12-20 09:08:45 +11:00
Douglas Clowes
57475b623e initialize match to zero on connect 2013-12-17 16:53:28 +11:00
Douglas Clowes
0266abbd94 Change the temperature factor from 10.0 to 20.0 
This refelcts the firmware update to the RVA ROM removing the factor
of 2.0 for the temperature reading and setting
 2013-12-16 13:36:35 +11:00
Nick Hauser
b2660cd135 Merge branch 'RELEASE-3_0' of ics2-dev.nbi.ansto.gov.au:/opt/sicsdev_git into RELEASE-3_0 2013-11-13 16:33:34 +11:00