Commit Graph

132 Commits

Author SHA1 Message Date
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
Ferdi Franceschini
d9da95a5df sct_protek608.c
Implements a protocol handler for the protek  608 multimeters which just allows us to read the display.
It reports all elements of the display including the bar graph, it does not provide remote control of the multimeter.  The protocol handler broadcasts a warning to all clients if the auto-off function is enabled.

sct_rfamp.c
This is a protocol handler for the Mirrortron 35V 7A AC Generator (ANSFR-83B).

sinqhttpprot.c
Copied the PSI script context http protocol handler.

sct_orhvpsprot.c
Ordela high voltage power supply protocol handler now catches unknown commands.

sct_eurotherm_2000.tcl
Eurotherm controller for the kowari load frame by Douglas Clowes.

sct_lakeshore_3xx.tcl
Latest update from Arndt.  The two control loops are now independent, settletime and tolerance now work properly.

common_instrument_dictionary.tcl
Make instrument/status saveable.

sct_orhvps_common.tcl
Provides voltage ramping and implements the dhv1 command for the Ordela HVPS via the sct_orhpsprot.c protocol handler.

hmm_configuration_common_1.tcl
Adds new "histmem clockscale" subcommand to get and set the clock scale from the fat_clock_scale FAT parameter.
You can now upload the FAT FRAME_BUFFER and FRAME_DUTYCYCLE parameters to the histogram memory.
The veto commands are now "histmem veto on" and "histmem veto off".

hmm_object.tcl
The axis order for the histmem object has been restore to t,y,x

sct_positmotor_common.tcl
Code has been simplified.

nxscripts_common_1.tcl
Removed obsolete ::nexus::data function.  TOF axis now correctly report time_of_flight instead of "time".

plc_common_1.tcl
Make PLC info saveable.

scan_common_1.tcl
SICS-385 The scan command should check the final scan variable value against he soft upper and lower limits, not against the hard limits.
Make sure that the scan variable axis is saved.

platypus, kowari, quokka hmm_configuration.tcl
Use the HOR and VER entries in the new histmem_axes hash to select the horizontal and vertical axes for the histmem.

kowari motor_configuration.tcl secondary_slit_configuration.tcl
Flatten slits motor structure to match old layout in data files.

quokka commands.tcl
SICS-380 EApPosYmm -> EApPosY

quokka detector.tcl
Use new script context controller for Ordela HVPS

quokka hmm_configuration.tcl
Set detector height to 5.08*192 the same as the width

quokka motor_configuration.tcl
Code cleanup

quokka positmotor_configuration.tcl
Use new positmotor code.

quokka aperture_configuration.tcl
Added attenuation factor column to AttRotLookupTable

quokka parameters.tcl
SICS-380 Refactor nexus, remove redundant parameters.

site_ansto.c
Added the following protocols, Httpl, Protek608, aand RFAmp.

scriptcontext.c
SICS-386 SctActionHandler: set "send" string to NULL when a chain of scripts completes with state=idle.
It turns out that if none of the scripts in the "read chain" call [sct send] each time the chain is executed, then SICS will hammer the device with calls to AsconWrite(). This can be avoided if SctActionHandler sets the 'send' string to NULL before "goto finish" in the idle state. This will be safer and still let you have chains with multiple [sct send] and read scripts.

asyncprotocol.c
Fix platypus memory leak.

devser.c
SICS-387 Started adding code to pass signals on to script context drivers.

ascon.c
AsconTask(): Make sure we return to the AsconIdle state when sending a command which expect no response, also only reconnect if there is a Timeout when there has been an error.

r2888 | ffr | 2010-04-19 14:04:41 +1000 (Mon, 19 Apr 2010) | 90 lines
2012-11-15 17:00:29 +11:00
Ferdi Franceschini
4f3fb5e250 sct_julabo_lh45.tcl
Create object when in simulation mode

nxscripts_common_1.tcl
Set units attributes on script context objects data

sans aperture_configuration.tcl
Update rotary attenuator lookup table. Set parameters when motors positions are
within tolerance of the lookup table positions.

sans, parameters.tcl sct_velsel.tcl
Set units and update parameter names to be consistent

quokka_configuration.tcl
Add convenience command to load environment controllers.

server_config.tcl
Make sure that controllers are properly generated when loading them from the ext
raconfig.tcl.

r2881 | ffr | 2010-01-29 16:50:51 +1100 (Fri, 29 Jan 2010) | 20 lines
2012-11-15 17:00:10 +11:00
Ferdi Franceschini
40c57a1590 Only install lh45 when needed.
r2877 | ffr | 2010-01-22 21:02:42 +1100 (Fri, 22 Jan 2010) | 2 lines
2012-11-15 16:59:57 +11:00
Ferdi Franceschini
fbe98a41b7 Fixed stupid typo
r2876 | ffr | 2010-01-22 21:00:23 +1100 (Fri, 22 Jan 2010) | 2 lines
2012-11-15 16:59:52 +11:00
Ferdi Franceschini
3a3b6764ee SICS-377 hipadaba_configuration_common.tcl
One typo and forgetting to clear a temporary variable meant that the list of candidates for removal never shrank while pruning

reflectometer/config/motors/sct_batmotor.tcl
The beam attenuator is on axis D not A.  Also provide statemon feedback, "busy" or "idle"

sans/config/velsel/velsel.tcl
Update velocity selector parameters for NVS 43

SICS-374 sans/config/velsel/sct_velsel.tcl
Set velocity selector identifier

script_context_util.tcl
Don't override the "klass' attribute, just make sure that it matches the hdb klass property if it's defined.

event.h and statemon.c
Added statemon BUSY and IDLE events for the scbat because it when it oscillates it's busy doing something.

r2875 | ffr | 2010-01-22 20:41:36 +1100 (Fri, 22 Jan 2010) | 18 lines
2012-11-15 16:59:48 +11:00
Ferdi Franceschini
4a7bfba81e Make wavelength reporting more like the NVS software.
r2873 | ffr | 2010-01-21 09:38:59 +1100 (Thu, 21 Jan 2010) | 2 lines
2012-11-15 16:59:43 +11:00
Ferdi Franceschini
30002eb404 Eliminate the speed is to low error message when the actual speed is less than 3100 rpm, just set lamba=99999
Update message prefix for new velocity selector controller.

r2872 | ffr | 2010-01-20 15:13:24 +1100 (Wed, 20 Jan 2010) | 3 lines
2012-11-15 16:59:38 +11:00
Ferdi Franceschini
724af2d4ca hipadaba_configuration_common.tcl
Oops calling the deleted hlistplainprop function instead of the new hlistprop.

sans/config/commands/commands.tcl
Set beamstop diameter (BSdiam) when selecting a beamstop

sans optics/aperture_configuration.tcl
The entrance app is 50mm when guide config is g1 to g9 or p1 to p9

sans parameters.tcl
Added GuideConfig parameter to record the last configuration set by SICS.

r2870 | ffr | 2010-01-15 18:19:22 +1100 (Fri, 15 Jan 2010) | 12 lines
2012-11-15 16:59:29 +11:00
Ferdi Franceschini
fd6a955d6b Remove keywords to simplify merging branches.
r2859 | ffr | 2010-01-13 15:41:46 +1100 (Wed, 13 Jan 2010) | 2 lines
2012-11-15 16:59:06 +11:00
Ferdi Franceschini
343f874b70 sans/config/parameters/parameters.tcl
SICS-365 Refactored quokka nexus structure, the parameters group has been greatly simplified.

sans/config/commands/commands.tcl
If "selbs" is called by "selbsn" or "selbsxy" it now reports "startt selbsn/selbsxy" and "stop selbsn/selsxy" as well as start and stop for selbs.
The rotary attenuator and entrance aperture commands now drive the "att" and "srce" motors directly.

quokka_configuration.tcl
Removed obsolete code.

SICS-365  nxscripts_common_1.tcl, instdict_specification.tcl, common_instrument_dictionary.tcl
Don't create unnofficial nexus classes.

r2856 | ffr | 2010-01-11 16:12:40 +1100 (Mon, 11 Jan 2010) | 13 lines
2012-11-15 16:58:57 +11:00
Ferdi Franceschini
af6e10a6e1 Correcting for attenuator wheel which was re-installed at -120 degrees.
r2851 | ffr | 2009-12-15 15:38:27 +1100 (Tue, 15 Dec 2009) | 2 lines
2012-11-15 16:58:48 +11:00
Ferdi Franceschini
2af977c1ac Correct overlap positions.
r2849 | ffr | 2009-12-15 12:48:53 +1100 (Tue, 15 Dec 2009) | 2 lines
2012-11-15 16:58:43 +11:00
Ferdi Franceschini
3abd3effa2 Set detector y lower limit for Quokka
Improve precision of motor position calculation.

r2844 | ffr | 2009-12-11 12:39:12 +1100 (Fri, 11 Dec 2009) | 3 lines
2012-11-15 16:58:22 +11:00
Ferdi Franceschini
b6ed01fc13 Merge changes made in-situ.
r2842 | ffr | 2009-12-10 14:57:53 +1100 (Thu, 10 Dec 2009) | 2 lines
2012-11-15 16:58:14 +11:00
Ferdi Franceschini
c73c4c85c8 Merges from ics1-wombat
r2834 | ffr | 2009-12-09 17:07:45 +1100 (Wed, 09 Dec 2009) | 2 lines
2012-11-15 16:57:39 +11:00
Ferdi Franceschini
746f495d69 SICS-354 nxscripts_common_1.tcl
Now using a nexus dictionary variable to set the entry name in data files to prevent duplicate or wrong entry names.
Make sure that the isNewFile flag is reset on the first "save" call to prevent file number being incremented multiple times

SICS-394 sans commands.tcl
Added "selbs", "selbsn", and "selbsxz" commands to select and position a beamstop in a safe manner.

SICS-394 sans motor_configuration.tcl
Added new beamstop motor drivers.

SICS-394 sans parameters.tcl
Added BeamStop parameter to record which beamstop has been selected.

r2832 | ffr | 2009-12-03 13:04:57 +1100 (Thu, 03 Dec 2009) | 13 lines
2012-11-15 16:57:31 +11:00
Ferdi Franceschini
2ec6505ef8 Merged 2.4 branch
r2828 | ffr | 2009-11-25 09:56:49 +1100 (Wed, 25 Nov 2009) | 2 lines
2012-11-15 16:57:26 +11:00
Ferdi Franceschini
4a898637b4 Add lakeshore config for RHQ
r2769 | ffr | 2009-03-31 17:28:11 +1100 (Tue, 31 Mar 2009) | 2 lines
2012-11-15 16:57:13 +11:00