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

138 Commits

Author SHA1 Message Date
Ferdi Franceschini
be653c91fe Make instrument specific Oxford configs consistent for Quokka and Taipan. 2014-05-01 09:18:55 +10:00
Ferdi Franceschini
bea943ddf2 Add new reactor status object to instruments. 2014-03-25 09:23:57 +11:00
Ferdi Franceschini
52f28117ef Updated from ics2-quokka 2013-12-20 09:08:54 +11:00
Ferdi Franceschini
713ae0b263 SICS-504 Quokka beamstops:Try to get within 0.05 degrees of the target without raising an error. 2013-10-28 15:33:42 +11:00
Ferdi Franceschini
b1ab4f8b1a SICS-675: Change lens configuration for Quokka 2013-10-28 15:33:41 +11:00
Ferdi Franceschini
653f113ecc Quokka performance enhancements made by Dan Bartlett 12/09/13. 2013-10-15 02:24:00 +11:00
Ferdi Franceschini
1af24fcb0a _histmem proc isn't created if the common hmm config file is loaded with the "source" command. 2013-09-10 21:44:45 +10:00
Ferdi Franceschini
5a17bca641 Make sure hmm clock_scale and freq are set or SICS won't start properly. 
If these parameters aren't set on an instrument with a histogram server
then SICS won't create the hdb tree.
 2013-08-22 07:58:20 +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
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
35b1758715 Scientist requested changing default speed of att motor on Quokka. 2013-08-09 05:30:53 +10:00
Ferdi Franceschini
a8e55caf9c Adding updates from ics1-quokka 2013-05-21 16:21:47 +10:00
Ferdi Franceschini
bf3bd5342e Use hostport_config for quokka detector addresses and ports. 2013-05-13 23:31:12 +10:00
Ferdi Franceschini
33059d6493 ID of velocity selector currently used on Quokka 
TODO This should be at the /usr/local/sics level.
 2013-05-05 23:03:17 +10:00
Ferdi Franceschini
7c2796aa4f Added MIRROTRON's ammendments to Quokka's guide configuration. 2013-05-05 23:01:26 +10:00
Ferdi Franceschini
d8b48728b4 SICS-587 (in progress) IP and PORT configurations DONE for Quokka. 
TODO Environment controllers etc.
 2013-04-24 16:54:22 +10:00
Ferdi Franceschini
98cf4d5dc4 SICS-572: Reverted fix. This was actually a job for GumTree and has been fixed by Norman. 2013-04-19 08:31:32 +10:00
Ferdi Franceschini
2dc1657d66 Reversed configuration tables for the autosample changers. 
Because the load side was changed to the opposite side.
 2013-04-09 14:38:39 +10:00
Ferdi Franceschini
e7a478489e Copied in-situ modifications from ics1-quokka. 2013-02-20 18:19:44 +11:00
Jing Chen
b2388fe47a change folder magnetic to magneticField 
r3702 | jgn | 2012-08-24 10:39:12 +1000 (Fri, 24 Aug 2012) | 1 line
 2012-11-15 17:36:31 +11:00
Jing Chen
e0e7745291 add magnetic 
r3648 | jgn | 2012-07-16 09:56:02 +1000 (Mon, 16 Jul 2012) | 1 line
 2012-11-15 17:33:31 +11:00
Jing Chen
83e8b77271 use same folder name magnetic 
r3643 | jgn | 2012-07-16 09:41:40 +1000 (Mon, 16 Jul 2012) | 1 line
 2012-11-15 17:33:07 +11:00
Ferdi Franceschini
464dbfdf64 Moved the pre_count and post_count procs from the oxford labview driver 
to here and added the lakeshore temperature readings.

r3365 | ffr | 2012-02-12 19:03:15 +1100 (Sun, 12 Feb 2012) | 3 lines
 2012-11-15 17:24:39 +11:00
Ferdi Franceschini
790fb6a062 Added HV pulser control 
r3358 | ffr | 2012-01-27 14:46:02 +1100 (Fri, 27 Jan 2012) | 2 lines
 2012-11-15 17:24:07 +11:00
Jing Chen
48992ffe70 add sct_oxford_labview.tcl 
r3321 | jgn | 2012-01-03 11:31:14 +1100 (Tue, 03 Jan 2012) | 1 line
 2012-11-15 17:21:21 +11:00
Jing Chen
efa7d8841e ad folder ./config/environment/magneticField 
r3319 | jgn | 2012-01-03 11:17:36 +1100 (Tue, 03 Jan 2012) | 1 line
 2012-11-15 17:21:12 +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
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
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
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
7371a561d9 Make sure spin flipper code in rfamp.c is initialised 
Fixed drive bugs in lakeshore drivers.
r3071 | ffr | 2011-02-25 18:27:31 +1100 (Fri, 25 Feb 2011) | 2 lines
 2012-11-15 17:08:46 +11:00
Ferdi Franceschini
ea087769dc Reorganise archive structure 
r3065 | ffr | 2011-02-22 00:44:51 +1100 (Tue, 22 Feb 2011) | 1 line
 2012-11-15 17:08:18 +11:00
Ferdi Franceschini
48f8c75ac4 Rheometer controlled data acquisition via protek multimeter driver. 
r3064 | ffr | 2011-02-22 00:33:12 +1100 (Tue, 22 Feb 2011) | 1 line
 2012-11-15 17:08:14 +11:00
Ferdi Franceschini
8d066dec11 hmm_configuration_common_1.tcl 
The post_count callback should be called when the count ends.

quokka_configuration.tcl
Added lakeshore 336, qlink, and rheometer configurations.

quokka sct_flipper.tcl
Report "-1" for fields which return corrupt or invalid readings.

quokka environment.tcl
Implement histogram memory pre_count and post_count callbacks to record temperature before and after an acquisition.

quokka motor_configuration.tcl
Set correct max speed for detector motor, ie it is now 53mm/s instead of 40

wombat_configuration.tcl
Added lakeshore 336 driver and julabo and qlink.
r3034 | ffr | 2010-12-03 11:07:49 +1100 (Fri, 03 Dec 2010) | 17 lines
 2012-11-15 17:06:53 +11:00
Ferdi Franceschini
e7e857b70e Added rheometer and qlink. 
r3033 | ffr | 2010-12-02 14:05:44 +1100 (Thu, 02 Dec 2010) | 1 line
 2012-11-15 17:06:49 +11:00
Jing Chen
acb291e2e0 add spin_goniometer.tcl 
r2979 | jgn | 2010-07-19 14:23:12 +1000 (Mon, 19 Jul 2010) | 2 lines
 2012-11-15 17:05:22 +11:00
Jing Chen
4d9997bede add /goniometer/sct_goniometer.tcl 
r2978 | jgn | 2010-07-19 14:22:38 +1000 (Mon, 19 Jul 2010) | 2 lines
 2012-11-15 17:05:17 +11:00
Ferdi Franceschini
33ba0ed3fd Remove obsolete commands and set sample/temperature paramter 
r2976 | ffr | 2010-07-02 14:49:51 +1000 (Fri, 02 Jul 2010) | 2 lines
 2012-11-15 17:05:13 +11:00
Ferdi Franceschini
b30b783fde Added new lakeshore drivers 
r2975 | ffr | 2010-07-02 14:37:24 +1000 (Fri, 02 Jul 2010) | 2 lines
 2012-11-15 17:05:08 +11:00
Ferdi Franceschini
2e64619bd0 Add ips120 power supply control to 11T Magnet configuration. 
r2971 | ffr | 2010-07-02 07:37:08 +1000 (Fri, 02 Jul 2010) | 2 lines
 2012-11-15 17:04:49 +11:00