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

1544 Commits

Author SHA1 Message Date
Ferdi Franceschini
d48b771ac3 Updated mom motor stepsperX and cntsperX for Pelican. 2013-08-15 14:56:28 +10:00
Ferdi Franceschini
643017d486 Source channel gains from das1-pelican and set MESYTEC thresholds. 2013-08-15 14:19:05 +10:00
Ferdi Franceschini
ca1e34856a Speed up histmem config when SICS starts up. 
Clock scale, frame freq and source should be set in the instrument specific
hmm_configuration.tcl file, not in hmm_configuration_common_1.tcl.
 2013-08-15 13:56:50 +10:00
Ferdi Franceschini
4434d97239 Don't load the broken batmotor controller on Platypus. 2013-08-15 08:09:55 +10:00
Ferdi Franceschini
b842421f12 Use NVS40 velocity selector on quokka 2013-08-15 08:09:15 +10:00
Ferdi Franceschini
335eda0a55 Allow wavelengths below 4.6125 Angstroms for velocity selector on quokka 2013-08-15 08:08:36 +10:00
Ferdi Franceschini
d038891bc1 Get new det_home value 2013-08-15 08:08:08 +10:00
Ferdi Franceschini
dd0ee77a26 Get voltage settings as measured by Mark Lesha on 30/7/13 for SN003 2013-08-15 08:07:39 +10:00
Ferdi Franceschini
36caadd3af Do not make an instance of the oxford labview driver when initialising SICS. 2013-08-15 08:07:07 +10:00
Ferdi Franceschini
fef7d4382e Allow selecting external or bath sensor when using a Julabo on Quokka 2013-08-15 08:05:49 +10:00
Ferdi Franceschini
cafbd02b68 Make sure that the command status transitions to IDLE if it was set to BUSY 2013-08-15 08:04:15 +10:00
Ferdi Franceschini
564b7c9bd5 Use the selected sensor (external or bath) to report temperature from a Julabo 2013-08-15 08:03:34 +10:00
Ferdi Franceschini
5acb398b42 Provide add_oxmag command to instantiate an oxford magnet driver. 2013-08-15 07:59:02 +10:00
Ferdi Franceschini
9b6a7f38e7 Get creep_precision and other updated parameters from ics2-taipan. 2013-08-12 11:32:22 +10:00
Ferdi Franceschini
0de5ee41e2 SICS-656 Make a multivariable runscan command. 
SICS-649 Return to initial position after a scan for Platypus
 2013-08-09 05:30:58 +10:00
Ferdi Franceschini
eb1c84b60b SICS-651 Reset command feedback status when SICS initialises. 2013-08-09 05:30:58 +10:00
Ferdi Franceschini
27f09f5a0a SICS-655 Update tasmots when driving axes. 
SICS-512 Experimental anticollider for m2, s2 and a2
 2013-08-09 05:30:57 +10:00
Ferdi Franceschini
05f17515cf SICS-645: Setting mtype attribute to stop scan from checking thread0 2013-08-09 05:30:57 +10:00
Ferdi Franceschini
f315d8bbf1 SICS-635: runscan on platypus takes too long to start. 2013-08-09 05:30:56 +10:00
Ferdi Franceschini
dc0f9b56a9 SICS-640: Don't broadcast autosave message. 
Also allow 'autosave status' to check if autosave is enabled.
 2013-08-09 05:30:56 +10:00
Ferdi Franceschini
2c36a8f466 SICS-644: Set precision to 50ns on Pelican fermi chopper phase motors. 2013-08-09 05:30:54 +10:00
Ferdi Franceschini
38d915cc6a SICS-646: Restore histogram command to hdb tree. 
Instruments which don't have a histogram should add
"set no_histmem true"
to the top of their instrument config file before the commands_common
file is sourced.
 2013-08-09 05:30:54 +10:00
Ferdi Franceschini
35b1758715 Scientist requested changing default speed of att motor on Quokka. 2013-08-09 05:30:53 +10:00
Douglas Clowes
6672e17982 Parse arguments for filename, add params to plot/axis titles, add grids 2013-08-08 12:46:18 +10:00
Douglas Clowes
de6410f089 Add motor tracking plotting in python 2013-08-08 11:20:19 +10:00
Douglas Clowes
40c0bf7d9e Remove LS370 logging to stdout 2013-07-15 13:01:35 +10:00
Ferdi Franceschini
28b7acbeff Added magnet arm (marm) motor to provide feedback during wedge movements. 2013-07-08 11:42:25 +10:00
Ferdi Franceschini
1486481a4c Revert scan config changes made for Dingo. They broke the bmonscan and hmscan objects. 2013-07-08 11:42:25 +10:00
Douglas Clowes
c70c2d5213 Push FILEMAP.TXT down to the newserver directory and reduce duplication 2013-07-05 15:23:53 +10:00
Douglas Clowes
d73cf4278d Add Kiethley serial port configuration from Echidna 2013-07-05 14:27:35 +10:00
Douglas Clowes
6a672d3a8b Don't put TEST_SICS at the top directory and clean any *.pyc files 2013-07-04 15:42:40 +10:00
Douglas Clowes
73536234fe Add a new sct driver for the Watlow RM, based on the Watlow PM driver 2013-07-04 15:39:24 +10:00
Douglas Clowes
6287e0ba7f Add the name and link count to the fake motors 2013-07-01 13:10:46 +10:00
Douglas Clowes
a0bf852024 Move displayscreen to the general utility directory "instrument/util" 2013-07-01 12:20:11 +10:00
Douglas Clowes
cbc1c940a1 Skip mc5 socket for taipan mc6 test addresses 2013-06-27 16:43:07 +10:00
Douglas Clowes
fbf6112cea Update to show motor position on display screen 2013-06-27 16:36:56 +10:00
Douglas Clowes
99f18f8798 Add a display screen for motor position to taipan fake motors 2013-06-27 16:36:38 +10:00
Douglas Clowes
7d35ca4cf9 Allow 'aqadapter' as the IP and the AsyncQueue name as the port for Lakeshores 2013-06-27 16:36:06 +10:00
Douglas Clowes
3a06651ae3 Add link count and handle screen resize in fake Lakeshores 2013-06-27 16:35:50 +10:00
Douglas Clowes
1c6a2abdcc Handle the non-AbsoluteEncoder motor 2013-06-27 16:08:46 +10:00
Douglas Clowes
66f67c1c0d Lakeshore 340 only has one HTR 2013-06-26 10:01:42 +10:00
Douglas Clowes
0c179166de Iterative improvement of fake Lakeshores 2013-06-26 10:01:41 +10:00
Ferdi Franceschini
e26a1fc972 Merge branch 'merge-replace' of ics2-dev.nbi.ansto.gov.au:workspace/GIT/sicsdev_git into merge-replace 2013-06-24 14:56:47 +10:00
Douglas Clowes
2b1e34202d implement fake lakeshore 336, 340 and 370 in Python with curses display 2013-06-21 14:27:37 +10:00
Ferdi Franceschini
ce1f4cae19 SICS-587 Setup hostport dictionary based configuration for Lyrebird. 2013-06-21 14:07:32 +10:00
Douglas Clowes
3dce7feb8e Andrew Kerrigan's sct driver for the Pfeiffer pressure gauge and Oxford Mercury 2013-06-21 13:39:13 +10:00
Douglas Clowes
95d8a565e3 Andrew Kerrigan's script context driver for the Pfeiffer 261 pressure gauge 2013-06-21 13:37:31 +10:00
Ferdi Franceschini
543f099682 Merge branch 'merge-replace' of /home/ferdi/workspace/GIT/sicsdev_git into merge-replace 2013-06-21 11:25:32 +10:00
Ferdi Franceschini
2601135c25 SICS-587 Setup hostport dictionary based configuration for Kowari. 2013-06-21 11:23:41 +10:00
Ferdi Franceschini
685a9b1373 SICS-587 Setup hostport dictionary based configuration for Echidna. 2013-06-21 11:13:42 +10:00