Commit Graph

999 Commits

Author SHA1 Message Date
Jing Chen
a5d0ed919d configurationi init
r3261 | jgn | 2011-11-18 14:12:45 +1100 (Fri, 18 Nov 2011) | 1 line
2012-11-15 17:16:56 +11:00
Jing Chen
e11fa134b5 configurationi init
r3260 | jgn | 2011-11-18 14:12:02 +1100 (Fri, 18 Nov 2011) | 1 line
2012-11-15 17:16:52 +11:00
Douglas Clowes
a172bed449 Add ";*IDN?" in SetValue and setPoint functions (after commands that don't elicit a response) to force a response that avoids the timeout and reconnect sequence that gives problems on the LS336
r3259 | dcl | 2011-10-18 16:13:01 +1100 (Tue, 18 Oct 2011) | 1 line
2012-11-15 17:16:47 +11:00
Jing Chen
638c160310 r3257 | jgn | 2011-10-17 16:31:36 +1100 (Mon, 17 Oct 2011) | 1 line 2012-11-15 17:16:38 +11:00
Jing Chen
ebc62a676a recent changes at Pelican Lyrebird
r3256 | jgn | 2011-10-17 15:37:22 +1100 (Mon, 17 Oct 2011) | 1 line
2012-11-15 17:16:34 +11:00
Jing Chen
3b6dc490ab recent changes at Pelican Lyrebird
r3255 | jgn | 2011-10-17 15:37:09 +1100 (Mon, 17 Oct 2011) | 1 line
2012-11-15 17:16:30 +11:00
Jing Chen
dd10a410e7 recent changes at Pelican Lyrebird
r3254 | jgn | 2011-10-17 15:36:55 +1100 (Mon, 17 Oct 2011) | 1 line
2012-11-15 17:16:25 +11:00
Jing Chen
86cd8dee4e recent changes at Pelican Lyrebird
r3253 | jgn | 2011-10-17 15:36:16 +1100 (Mon, 17 Oct 2011) | 1 line
2012-11-15 17:16:21 +11:00
Ferdi Franceschini
d416695b4b Merged in-situ changes from Echidna
r3252 | ffr | 2011-09-23 14:21:09 +1000 (Fri, 23 Sep 2011) | 2 lines
2012-11-15 17:16:17 +11:00
Ferdi Franceschini
d778dd2bfe sicshipacaba.c
SICS-418 Make sure hnotify sends messages as hdbevents when using the
JSON protocl

site_ansto/instrument/config/hmm/hmm_object.tcl
Initialise the hmm object to make sure the read type is set.

nxscripts_common_1.tcl
Set the read type when saving the hmm data.

server_config.tcl
Fix the autosave command so that you can enable/disable autosave while
the histogram memory is running.

protocol.c
Reduce noise in log files when using the JSON protocol.  Don't log
messages generated during macro execution (ie within a TCL proc).

motor.c:MotorStatus
Abort the current operation, the scan command and batch files when a
motor object returns a hardware fault status value.

motor_dmc2280.c
set driver status to HWFault when the driver is in the error state.

r3251 | ffr | 2011-09-23 08:49:00 +1000 (Fri, 23 Sep 2011) | 25 lines
2012-11-15 17:16:12 +11:00
Douglas Clowes
c765c33f6d Make instance data properties of a params node instead of namespace global variables
This is to allow multiple instance of the same device type without clashing of persistent data
r3248 | dcl | 2011-08-22 11:30:20 +1000 (Mon, 22 Aug 2011) | 3 lines
2012-11-15 17:16:07 +11:00
Ferdi Franceschini
89bfef55b0 This is a simple LS336 simulation. It just implements the commands which
the sct_lakeshore_336.tcl driver uses.  You can set the temperature and
the sensor readings have a random one degree fluctuation.

r3238 | ffr | 2011-08-12 08:46:21 +1000 (Fri, 12 Aug 2011) | 4 lines
2012-11-15 17:16:03 +11:00
Ferdi Franceschini
5e50f2cb43 Removed the dependency on some global variables so that you can drive
two lakeshore controllers.  Most of the remaining globals are harmless
or unused but they should be removed.

r3237 | ffr | 2011-08-12 08:41:56 +1000 (Fri, 12 Aug 2011) | 4 lines
2012-11-15 17:15:59 +11:00
Ferdi Franceschini
a8203ffa6e Copied changes which were made in-situ.
r3236 | ffr | 2011-08-02 14:20:46 +1000 (Tue, 02 Aug 2011) | 2 lines
2012-11-15 17:15:54 +11:00
Ferdi Franceschini
169aa5ed2f Display/Value and setpoint should be numeric to save arrays of readings.
We can't save arrays of text.

r3235 | ffr | 2011-07-25 17:06:35 +1000 (Mon, 25 Jul 2011) | 3 lines
2012-11-15 17:15:50 +11:00
Ferdi Franceschini
0b90dfc0dc Remove files accidentally added in rev 3071
D    site_ansto/hardsup/oldsct_modbusprot.c
D    site_ansto/hardsup/libhlib.a
D    site_ansto/instrument/deploySICS.sh.new
D    site_ansto/instrument/reflectometer/config/beamline/old_polanal.tcl
D    site_ansto/instrument/reflectometer/config/beamline/old_sct_RFGen.tcl
D    .cproject
D    cscope.out
D    tags
D    psi/hardsup/libhlib.a
D    psi/tecs/libtecsl.a

r3234 | ffr | 2011-07-24 13:13:46 +1000 (Sun, 24 Jul 2011) | 13 lines
2012-11-15 17:15:46 +11:00
Jing Chen
3c82aacfa1 modify config file
r3233 | jgn | 2011-07-22 15:35:14 +1000 (Fri, 22 Jul 2011) | 1 line
2012-11-15 17:15:41 +11:00
Douglas Clowes
d33a957d01 differentiate rdValue and rdData and add experimental treewalk
r3232 | dcl | 2011-07-20 14:45:17 +1000 (Wed, 20 Jul 2011) | 1 line
2012-11-15 17:15:37 +11:00
Douglas Clowes
cffc765197 Add ;*IDN? after writes to get a response
r3231 | dcl | 2011-07-06 10:00:25 +1000 (Wed, 06 Jul 2011) | 1 line
2012-11-15 17:15:32 +11:00
Douglas Clowes
a76803c242 Keithley 2700 DMM
r3230 | dcl | 2011-07-05 16:23:52 +1000 (Tue, 05 Jul 2011) | 1 line
2012-11-15 17:15:28 +11:00
Ferdi Franceschini
3404e4670c Set chnspeed as actual speed instead of the requested speed.
r3229 | ffr | 2011-06-26 12:19:01 +1000 (Sun, 26 Jun 2011) | 1 line
2012-11-15 17:15:24 +11:00
Ferdi Franceschini
6b1c629a43 Guard against misinterpreting readings that have a leading zero as octal.
Set the current to the target value when we're within one step rather than within tolerance to avoid undershooting the target.
Do not try and get the state when initialising the driver because it will fail to create the driver properly if the RF generator is unavailable on SICS startup.  The current is zero when the RF gen is power cycled so it is safe to set the current reading and target current as zero in initialisation so we just set the operating frequency and everything else is left at zero.
r3228 | ffr | 2011-06-26 12:18:27 +1000 (Sun, 26 Jun 2011) | 3 lines
2012-11-15 17:15:19 +11:00
Ferdi Franceschini
edc7639d65 Set operation current for polariser and analyser
r3227 | ffr | 2011-06-26 12:17:28 +1000 (Sun, 26 Jun 2011) | 1 line
2012-11-15 17:15:15 +11:00
Douglas Clowes
5b94e43689 log catch messages
r3225 | dcl | 2011-06-24 13:02:38 +1000 (Fri, 24 Jun 2011) | 1 line
2012-11-15 17:15:06 +11:00
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
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