Commit Graph

200 Commits

Author SHA1 Message Date
Ferdi Franceschini
1edad9fa2f SICS-586: Set sicspoll interval to one second on max_binrate and total_maprate hdb nodes. 2013-04-19 07:55:09 +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
16e744be12 Moved MakeDrive to instrument specific configuration.
This lets us make run and drive wrappers for the fermi motors on pelican
by renaming the SICS run and drive.
2013-04-09 14:15:55 +10:00
Ferdi Franceschini
e7a478489e Copied in-situ modifications from ics1-quokka. 2013-02-20 18:19:44 +11:00
Jing Chen
1d8b0f0b47 r3708 | jgn | 2012-08-27 09:13:37 +1000 (Mon, 27 Aug 2012) | 1 line 2012-11-15 17:36:59 +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
291892e6d7 use same folder name magnetic
r3645 | jgn | 2012-07-16 09:44:48 +1000 (Mon, 16 Jul 2012) | 1 line
2012-11-15 17:33:17 +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
8556583237 add oxford_labview.tcl
r3320 | jgn | 2012-01-03 11:22:35 +1100 (Tue, 03 Jan 2012) | 1 line
2012-11-15 17:21:17 +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
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
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
Douglas Clowes
190a1bb7f4 add Oxford IPS
r3016 | dcl | 2010-08-06 15:09:40 +1000 (Fri, 06 Aug 2010) | 1 line
2012-11-15 17:05:48 +11:00
Jing Chen
0cdd7119e1 add Goniometer
r2980 | jgn | 2010-07-19 14:43:13 +1000 (Mon, 19 Jul 2010) | 2 lines
2012-11-15 17:05:26 +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
Ferdi Franceschini
39d25dcf95 sct_flipper.tcl
If the current, frequency or voltage readings are invalid then set the corresponding parameter in SICS to -1

r2970 | ffr | 2010-07-01 23:48:47 +1000 (Thu, 01 Jul 2010) | 3 lines
2012-11-15 17:04:44 +11:00
Ferdi Franceschini
bbc133dab9 Quokka environment.tcl
Don't make the temperature getset-macro or select the control sensor for the script validator instance of SICS. (fixed in-situ)
Use new ls340 and ls336 controllers.

script_context_util.tcl
Modified hinitprops so that it can take sub-paths

nxscripts_common_1.tcl
Added ::nexus::OnFirstsave ::nexus:OnLastSave to register commands which will be executed on the first and last save of a data file.

sct_julabo_lh45.tcl
Added start_temperature and end_temperature parameters to record the initial and final temperature readings in the data files.
Also only set the setpoint if the Julabo is in remote mode.

sct_positmotor_common.tcl
Report 99999 if a posit motor table is out of range.

quokka guide_configuration.tcl
Updated aperture size for p1, p1lp, p1lens in the guide configuration table.

r2969 | ffr | 2010-07-01 22:09:09 +1000 (Thu, 01 Jul 2010) | 20 lines
2012-11-15 17:04:40 +11:00
Ferdi Franceschini
d94cf7b011 sct_oxford_ips.tcl
Fixed properties so the controller gets linked into /sample

INSTCFCOMMON.TXT quokka_configuration.tcl
Added ips120 controller to quokka

r2968 | ffr | 2010-07-01 21:03:54 +1000 (Thu, 01 Jul 2010) | 6 lines
2012-11-15 17:04:35 +11:00
Ferdi Franceschini
e8a0c8222f Could you please update the extraconfig.tcl so that we can drive samy more quickly? Currently it’s set at 1 mm/sec. Can we increase this to something a little faster, say, 5 mm/sec? (from Elliot 2010-06-01).
r2944 | ffr | 2010-06-01 11:26:58 +1000 (Tue, 01 Jun 2010) | 2 lines
2012-11-15 17:03:49 +11:00
Ferdi Franceschini
a3d0a90616 Fixed L2 and DetPosYOffset regression
r2943 | ffr | 2010-05-31 12:01:51 +1000 (Mon, 31 May 2010) | 2 lines
2012-11-15 17:03:44 +11:00
Ferdi Franceschini
01dcc14d5a quokka environment.tcl
Added a /sample/temperature node which links to the sensor reading for the ls340 on the 11T magnet

sct_julabo_lh45.tcl
Fixed regression which stopped tc1 interface from being linked into sample group.

r2942 | ffr | 2010-05-28 16:32:28 +1000 (Fri, 28 May 2010) | 6 lines
2012-11-15 17:03:39 +11:00
Ferdi Franceschini
9926044c35 Switch off spin flipper if voltage exceeds 34V in voltage control mode
r2939 | ffr | 2010-05-26 13:32:42 +1000 (Wed, 26 May 2010) | 2 lines
2012-11-15 17:03:30 +11:00
Ferdi Franceschini
a0923650d9 sct_flipper.tcl
Fixed simulated driver mode.

ascon.c
Added host and port to ascon error messages.

r2937 | ffr | 2010-05-24 14:24:04 +1000 (Mon, 24 May 2010) | 6 lines
2012-11-15 17:03:25 +11:00
Ferdi Franceschini
b1bfbb08b5 SICS-309 nxscript_common_1.tcl
The savetree function now checks to see if an hdb node has a "permlink" property set when making data links
SICS-309 quokka parameters.tcl, sct_velsel.tcl

r2933 | ffr | 2010-05-23 15:12:59 +1000 (Sun, 23 May 2010) | 4 lines
2012-11-15 17:03:21 +11:00
Ferdi Franceschini
88eefb0064 quokka config/environment/environment.tcl
Move the select_environment_controller function from quokka_configuration.tcl to here.

SICS-402 Implement Quokka spin flipper control

server_config.tcl
Added rfgen_simulation variable

r2932 | ffr | 2010-05-22 17:01:09 +1000 (Sat, 22 May 2010) | 8 lines
2012-11-15 17:03:16 +11:00
Ferdi Franceschini
b8811330f1 script_context_util.tcl
hinitprops can now be called with a list of parameters.
SICS-403 hinitprops will now check for "argtype" and "values" attributes on script context objects to create drop down lists valid arguments for GumTree

sct_positmotor_common.tcl
SICS-403 Now sets "argtype" and a list of "values" properties so GumTree can create drop-down lists of arguments.

quokka positmotor_configuration.tcl
SICS-401 diameter and sampleNum selectors report communications errors

sct_rfamp.c
The controller state should be set before calling AsconError.

r2931 | ffr | 2010-05-22 13:56:13 +1000 (Sat, 22 May 2010) | 13 lines
2012-11-15 17:03:11 +11:00
Ferdi Franceschini
8011cec140 Make IP addresses explicit when configuring the old lakeshore 340 drivers.
r2910 | ffr | 2010-05-07 14:32:51 +1000 (Fri, 07 May 2010) | 2 lines
2012-11-15 17:01:39 +11:00
Ferdi Franceschini
7a456163b5 Fixed SICS-392 RF Generator command truncation.
Code cleanup

r2906 | ffr | 2010-05-05 15:33:00 +1000 (Wed, 05 May 2010) | 3 lines
2012-11-15 17:01:25 +11:00
Ferdi Franceschini
e6e3c3be52 Merged in-situ modifications for Release 2.5 candidate 5
r2895 | ffr | 2010-04-29 16:02:15 +1000 (Thu, 29 Apr 2010) | 2 lines
2012-11-15 17:00:43 +11:00