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

1383 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Douglas Clowes
cd2dafceb3 Syringe Pump Driver 
for New Era Pump Systems Inc NE-1000 syringe pumps
r3224 | dcl | 2011-06-24 13:01:08 +1000 (Fri, 24 Jun 2011) | 3 lines
 2012-11-15 17:15:02 +11:00
Douglas Clowes
992e32bc10 Driver for the Hamilton Modular Valve Positioner (MVP) 
r3223 | dcl | 2011-06-22 17:09:21 +1000 (Wed, 22 Jun 2011) | 1 line
 2012-11-15 17:14:58 +11:00
Douglas Clowes
6a157ede79 Add "hamilton" protocol same as oxford with echo suppression 
r3222 | dcl | 2011-06-20 11:54:20 +1000 (Mon, 20 Jun 2011) | 1 line
 2012-11-15 17:14:53 +11:00
Ferdi Franceschini
6c654d7c5d Added config for 10 sample changer. 
r3221 | ffr | 2011-06-20 11:27:09 +1000 (Mon, 20 Jun 2011) | 1 line
 2012-11-15 17:14:49 +11:00
Ferdi Franceschini
d5d9bdeb30 If srce or att are off position by more than the "precision" set in the driver then SICS will report the selected aperture as being UNKNOWN. 
So we increase the precision to 0.1 degrees to prevent this.
r3220 | ffr | 2011-06-20 11:25:46 +1000 (Mon, 20 Jun 2011) | 2 lines
 2012-11-15 17:14:45 +11:00
Ferdi Franceschini
355c204598 Parameterise the wavelength/speed conversion functions so that you can choose velocity selector. 
r3219 | ffr | 2011-06-20 10:03:50 +1000 (Mon, 20 Jun 2011) | 1 line
 2012-11-15 17:14:40 +11:00
Ferdi Franceschini
7a92bfb4dd Trigger acquisition when within tolerance of the next step for the required settletime. 
Also made generic so you can create a temperature control for example instead of a speed based control.
r3218 | ffr | 2011-06-20 10:02:04 +1000 (Mon, 20 Jun 2011) | 2 lines
 2012-11-15 17:14:36 +11:00
Ferdi Franceschini
d1bc6cda97 Load RVA driver. 
r3217 | ffr | 2011-06-20 09:58:33 +1000 (Mon, 20 Jun 2011) | 1 line
 2012-11-15 17:14:32 +11:00
Ferdi Franceschini
f66a91d6d6 Remove accidental commit 
r3214 | ffr | 2011-06-20 09:45:22 +1000 (Mon, 20 Jun 2011) | 1 line
 2012-11-15 17:14:19 +11:00
Ferdi Franceschini
9c93861ae7 Autosave 
r3213 | ffr | 2011-06-20 09:41:41 +1000 (Mon, 20 Jun 2011) | 1 line
 2012-11-15 17:14:14 +11:00
Jing Chen
ea79b86986 modify motor group of s2 and m2 
r3212 | jgn | 2011-06-09 14:08:38 +1000 (Thu, 09 Jun 2011) | 1 line
 2012-11-15 17:14:10 +11:00
Jing Chen
5a9a5baeed r3211 | jgn | 2011-06-08 09:39:20 +1000 (Wed, 08 Jun 2011) | 1 line 2012-11-15 17:14:06 +11:00
Jing Chen
ee2ab3867d update motor configution parameters 
r3210 | jgn | 2011-06-08 09:11:18 +1000 (Wed, 08 Jun 2011) | 1 line
 2012-11-15 17:14:01 +11:00
Ferdi Franceschini
c1b90c4f7d Added rva_datafile name and added rva to /sample group 
r3151 | ffr | 2011-05-20 12:02:45 +1000 (Fri, 20 May 2011) | 1 line
 2012-11-15 17:13:57 +11:00
Douglas Clowes
afa42563a0 Implement a reset capability 
r3150 | dcl | 2011-05-20 10:26:59 +1000 (Fri, 20 May 2011) | 1 line
 2012-11-15 17:13:53 +11:00
Douglas Clowes
df6f44a2ac Change limits and tolerance 
r3149 | dcl | 2011-05-20 10:25:05 +1000 (Fri, 20 May 2011) | 1 line
 2012-11-15 17:13:49 +11:00
Douglas Clowes
f0ac8f82d9 Implement driveable and end of drive condition 
r3148 | dcl | 2011-05-20 10:21:08 +1000 (Fri, 20 May 2011) | 1 line
 2012-11-15 17:13:44 +11:00
Ferdi Franceschini
8b995f6d71 Use physical units for speeds and accelerations. 
r3147 | ffr | 2011-05-20 10:12:34 +1000 (Fri, 20 May 2011) | 1 line
 2012-11-15 17:13:40 +11:00
Douglas Clowes
e65cc662c6 Add read of tower down switch 
Must be down to run test
r3146 | dcl | 2011-05-19 12:47:06 +1000 (Thu, 19 May 2011) | 3 lines
 2012-11-15 17:13:36 +11:00
Ferdi Franceschini
a2a4a3cd39 quokka sct_velsel.tcl 
Renamed LambdaResFWHM_percent to wavelength_spread and added wavelength_spread_nominal which will be the wavelength_spread calculated from speed and tilt angle.
Lambda -> wavelength_nominal, added wavelength for analysis code.
r3145 | ffr | 2011-05-19 08:49:08 +1000 (Thu, 19 May 2011) | 3 lines
 2012-11-15 17:13:31 +11:00
Ferdi Franceschini
3660b95ee4 quokka parameters.tcl 
Moved Attfactor, Transmission, BeamCenterX, and BeamCenterZ back to the parameters group.
r3144 | ffr | 2011-05-19 08:48:16 +1000 (Thu, 19 May 2011) | 2 lines
 2012-11-15 17:13:27 +11:00
Ferdi Franceschini
3d0d0a9647 Added Rapid Visco-Analyser 
r3143 | ffr | 2011-05-19 08:46:31 +1000 (Thu, 19 May 2011) | 1 line
 2012-11-15 17:13:23 +11:00
Ferdi Franceschini
41a4f28517 platypus sct_batmotor.tcl 
Check for motor on when changing state to idle.
r3142 | ffr | 2011-05-19 08:45:25 +1000 (Thu, 19 May 2011) | 2 lines
 2012-11-15 17:13:18 +11:00
Ferdi Franceschini
2e0729532a platypus sct_chopper.tcl 
New scriptcontext chopper driver.
r3141 | ffr | 2011-05-19 08:44:53 +1000 (Thu, 19 May 2011) | 2 lines
 2012-11-15 17:13:14 +11:00
Ferdi Franceschini
dea8c2c1bb platypus chopper.tcl 
Configures the new chopper driver.
r3140 | ffr | 2011-05-19 08:44:20 +1000 (Thu, 19 May 2011) | 2 lines
 2012-11-15 17:13:10 +11:00
Ferdi Franceschini
8ddb808119 Don't load Bruker driver by default. This should really go in the extraconfig file. 
r3139 | ffr | 2011-05-19 08:43:49 +1000 (Thu, 19 May 2011) | 1 line
 2012-11-15 17:13:05 +11:00
Ferdi Franceschini
b43ea76fc4 hmm_configuration_common_1.tcl 
Added daq_dirname to data files for Platypus.
r3138 | ffr | 2011-05-19 08:41:58 +1000 (Thu, 19 May 2011) | 2 lines
 2012-11-15 17:13:01 +11:00
Ferdi Franceschini
ef4763e68f common_instrument_dictionary.tcl 
Removed "reduce" group, the parameters in this group will be moved to the NXparameters group.
r3137 | ffr | 2011-05-19 08:39:48 +1000 (Thu, 19 May 2011) | 2 lines
 2012-11-15 17:12:57 +11:00
Ferdi Franceschini
579fd8ebd0 sct_oxford_itc.tcl 
Revert changes to drving state.
r3136 | ffr | 2011-05-19 08:39:00 +1000 (Thu, 19 May 2011) | 2 lines
 2012-11-15 17:12:52 +11:00
Ferdi Franceschini
12b524cfbb sct_bruker_BEC1.tcl 
Arndt's latest updates, this is sct_bruker_BEC1_20100625.tcl
r3135 | ffr | 2011-05-19 08:38:09 +1000 (Thu, 19 May 2011) | 2 lines
 2012-11-15 17:12:48 +11:00
Ferdi Franceschini
8514dace59 motor_dmc2280.c 
When a motor stops and power saving is enabled (ie motor left on) the driver should check for faults and then transition to the idle state.
r3134 | ffr | 2011-05-19 08:37:16 +1000 (Thu, 19 May 2011) | 2 lines
 2012-11-15 17:12:44 +11:00
Jing Chen
3c9db46bd7 update 
r3132 | jgn | 2011-05-12 15:13:47 +1000 (Thu, 12 May 2011) | 1 line
 2012-11-15 17:12:39 +11:00
Jing Chen
d1aea5ae48 update accelation values 
r3131 | jgn | 2011-05-12 13:52:54 +1000 (Thu, 12 May 2011) | 1 line
 2012-11-15 17:12:35 +11:00
Douglas Clowes
c62f3dd24b Adjust ramp rate to 1/45 instead of 1/32 and calculate ramp anyway 
r3130 | dcl | 2011-05-11 10:11:50 +1000 (Wed, 11 May 2011) | 1 line
 2012-11-15 17:12:31 +11:00
Douglas Clowes
4303047433 Lift limit on profile size and partial implementation of drive command 
r3129 | dcl | 2011-05-10 16:13:07 +1000 (Tue, 10 May 2011) | 1 line
 2012-11-15 17:12:27 +11:00
Jing Chen
5d564ac666 update Pelican 
r3128 | jgn | 2011-05-06 16:06:57 +1000 (Fri, 06 May 2011) | 1 line
 2012-11-15 17:12:22 +11:00
Jing Chen
a57343e828 update Pelican 
r3127 | jgn | 2011-05-06 16:00:36 +1000 (Fri, 06 May 2011) | 1 line
 2012-11-15 17:12:18 +11:00
Douglas Clowes
b543716643 Allow ASCII CSV profile input 
In the format
<type>,<time>,<value>,<ramp>
r3126 | dcl | 2011-05-06 12:34:08 +1000 (Fri, 06 May 2011) | 4 lines
 2012-11-15 17:12:14 +11:00
Douglas Clowes
3be707a269 Add load_status, final_time and idle_temp as properties of profile 
r3125 | dcl | 2011-05-04 16:33:42 +1000 (Wed, 04 May 2011) | 1 line
 2012-11-15 17:12:09 +11:00
Jing Chen
d275ce5509 r3124 | jgn | 2011-05-03 11:25:15 +1000 (Tue, 03 May 2011) | 1 line 2012-11-15 17:12:05 +11:00
Jing Chen
25a2e6d839 update motor grouping for Lyrebird 
r3123 | jgn | 2011-05-02 12:26:12 +1000 (Mon, 02 May 2011) | 1 line
 2012-11-15 17:12:01 +11:00
Ferdi Franceschini
33e6611b14 Reverted 
r3122 | ffr | 2011-04-29 10:53:41 +1000 (Fri, 29 Apr 2011) | 1 line
 2012-11-15 17:11:56 +11:00
Jing Chen
0105298d79 update motor class for Taipan/Lyrebird 
r3121 | jgn | 2011-04-29 10:45:37 +1000 (Fri, 29 Apr 2011) | 1 line
 2012-11-15 17:11:52 +11:00
Ferdi Franceschini
4de3107771 SICS-365 Moved Transmission and AttFactor to the reduce group 
r3120 | ffr | 2011-04-29 08:51:32 +1000 (Fri, 29 Apr 2011) | 1 line
 2012-11-15 17:11:48 +11:00
Ferdi Franceschini
9620ce4ae5 Added NXdisk_chopper class to the instrument path and refactored the reduce group (SICS-365) 
r3119 | ffr | 2011-04-29 08:45:02 +1000 (Fri, 29 Apr 2011) | 1 line
 2012-11-15 17:11:43 +11:00
Ferdi Franceschini
b7187a2d0a Added histogram memory start and stop times for RVA data on Quokka 
r3118 | ffr | 2011-04-29 08:12:39 +1000 (Fri, 29 Apr 2011) | 1 line
 2012-11-15 17:11:39 +11:00
Jing Chen
30d9edb0dd update group for motors 
r3117 | jgn | 2011-04-28 10:39:23 +1000 (Thu, 28 Apr 2011) | 1 line
 2012-11-15 17:11:35 +11:00
Ferdi Franceschini
c7929ccc4e The "inTolerance" proc now updates the "timecheck" and "timecheck2" values when the setpoint command has been sent and transitions the "writestatus" to "ws_monitor". This ensures that the timeout for the settletime is reset when a new setpoint has been sent. 
r3116 | ffr | 2011-04-27 15:38:29 +1000 (Wed, 27 Apr 2011) | 1 line
 2012-11-15 17:11:31 +11:00
Ferdi Franceschini
db80d30cc2 Revert code so that the "driving" status is set by the tcl setpoint procedure. 
The "inTolerance" script only resets the "driving" flag after the setpoint has been sent, ie after "writestatus" transitions to the sent state.
The "checktol" script now compares the sensor reading against the setpoint "target" value instead of the setpoint reading from the lakeshore, this should allow the drive command to work properly if ramping has been enabled on the lakeshore
r3115 | ffr | 2011-04-27 11:11:00 +1000 (Wed, 27 Apr 2011) | 3 lines
 2012-11-15 17:11:26 +11:00
Jing Chen
e73eed8807 add Pelican 
r3114 | jgn | 2011-04-20 12:48:38 +1000 (Wed, 20 Apr 2011) | 1 line
 2012-11-15 17:11:22 +11:00