Commit Graph

858 Commits

Author SHA1 Message Date
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
6a3f6889e0 New lakeshore drivers separated out from the 3xx driver.
r2974 | ffr | 2010-07-02 14:04:58 +1000 (Fri, 02 Jul 2010) | 2 lines
2012-11-15 17:05:03 +11:00
Ferdi Franceschini
d185647cbb Removed obsolete lakeshore configurations.
r2973 | ffr | 2010-07-02 14:03:08 +1000 (Fri, 02 Jul 2010) | 2 lines
2012-11-15 17:04:58 +11:00
Ferdi Franceschini
77932a4d15 Set the setpoint in the setpoint node.
r2972 | ffr | 2010-07-02 12:12:31 +1000 (Fri, 02 Jul 2010) | 2 lines
2012-11-15 17:04:54 +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
Douglas Clowes
eebe078118 implement HALT and improve recovery
r2967 | dcl | 2010-07-01 12:39:42 +1000 (Thu, 01 Jul 2010) | 2 lines
2012-11-15 17:04:30 +11:00
Douglas Clowes
9ba11580ad update Oxford ITC and IPS
r2965 | dcl | 2010-06-25 15:19:17 +1000 (Fri, 25 Jun 2010) | 2 lines
2012-11-15 17:04:21 +11:00
Douglas Clowes
4afb1a765c Oxford Intelligent Power Supply IPS120-10
r2964 | dcl | 2010-06-25 15:16:28 +1000 (Fri, 25 Jun 2010) | 2 lines
2012-11-15 17:04:17 +11:00
Douglas Clowes
0fbb07f31a rename sct_oxford_500.tcl to sct_oxford_itc.tcl
r2963 | dcl | 2010-06-25 15:14:46 +1000 (Fri, 25 Jun 2010) | 2 lines
2012-11-15 17:04:12 +11:00
Douglas Clowes
7dc623d47f code tidy and bug fixes
r2962 | dcl | 2010-06-25 15:11:25 +1000 (Fri, 25 Jun 2010) | 2 lines
2012-11-15 17:04:07 +11:00
Douglas Clowes
cebd4d5600 code cleanup
r2960 | dcl | 2010-06-25 15:06:37 +1000 (Fri, 25 Jun 2010) | 2 lines
2012-11-15 17:03:58 +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
3d5d94c1dd sct_rfamp.c
SICS-405 Protocol handler always reports "SET" failed. Implemented workaround so that it always succeeds until we have a proper fix.

server_config.tcl
Set opal_simulation=true until we implement the new LSS feedback

r2940 | ffr | 2010-05-28 11:36:25 +1000 (Fri, 28 May 2010) | 6 lines
2012-11-15 17:03:35 +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
381839b134 Fixed port number
r2929 | ffr | 2010-05-20 10:51:15 +1000 (Thu, 20 May 2010) | 2 lines
2012-11-15 17:03:02 +11:00
Ferdi Franceschini
5811f125a9 Added a realist test mode to simulate fluctuating current as in the real RF generator
r2927 | ffr | 2010-05-18 20:16:53 +1000 (Tue, 18 May 2010) | 2 lines
2012-11-15 17:02:53 +11:00
Ferdi Franceschini
eb7e4877cc You can now specify multiple parameters when annotating script context object paths
r2925 | ffr | 2010-05-18 15:11:27 +1000 (Tue, 18 May 2010) | 2 lines
2012-11-15 17:02:43 +11:00
Ferdi Franceschini
8b1e84eac6 Report zero for reactor power and temperatures when using dummy reactor info.
r2924 | ffr | 2010-05-18 15:10:20 +1000 (Tue, 18 May 2010) | 2 lines
2012-11-15 17:02:39 +11:00
Ferdi Franceschini
80cc542086 Code cleanup
r2923 | ffr | 2010-05-18 15:08:58 +1000 (Tue, 18 May 2010) | 2 lines
2012-11-15 17:02:34 +11:00
Ferdi Franceschini
08de4efc37 Set TESTMODE to normal and reset port number
r2922 | ffr | 2010-05-14 12:36:39 +1000 (Fri, 14 May 2010) | 2 lines
2012-11-15 17:02:29 +11:00
Ferdi Franceschini
fbec2505c5 Fixed switch reply string and added test option to ignore updates.
r2921 | ffr | 2010-05-14 12:31:24 +1000 (Fri, 14 May 2010) | 2 lines
2012-11-15 17:02:25 +11:00
Ferdi Franceschini
b0fd7636b4 SICS-396 link total_counts in data group for hdf files.
Make simulated hmm driver more like the real driver.

r2919 | ffr | 2010-05-12 14:05:11 +1000 (Wed, 12 May 2010) | 3 lines
2012-11-15 17:02:16 +11:00
Ferdi Franceschini
d2cf223047 RF Generator simulator for the sct_rfamp.c protocol handler.
r2917 | ffr | 2010-05-10 15:52:24 +1000 (Mon, 10 May 2010) | 2 lines
2012-11-15 17:02:06 +11:00
Douglas Clowes
3a8591d43e Quartzdyne Q-Link Pressure and Temperature Sensor
r2914 | dcl | 2010-05-10 10:05:41 +1000 (Mon, 10 May 2010) | 2 lines
2012-11-15 17:01:53 +11:00
Douglas Clowes
6993b4de6b Oxford ITC502 and ITC503 Temperature Controllers
r2913 | dcl | 2010-05-10 10:02:42 +1000 (Mon, 10 May 2010) | 2 lines
2012-11-15 17:01:48 +11:00
Ferdi Franceschini
6470d0e65e The release number has been relocated
r2911 | ffr | 2010-05-07 15:40:58 +1000 (Fri, 07 May 2010) | 2 lines
2012-11-15 17:01:44 +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
1c4d6f398a Added path info to the script context "Not read yet" error messages
Also added extra info to sct_positmotor table lookup error message.

r2908 | ffr | 2010-05-05 18:07:15 +1000 (Wed, 05 May 2010) | 3 lines
2012-11-15 17:01:34 +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
0ce2db7bac Fixed startup bug where the driver complains of \ instead of spaces after braces.
r2904 | ffr | 2010-04-30 18:53:17 +1000 (Fri, 30 Apr 2010) | 2 lines
2012-11-15 17:01:21 +11:00
Ferdi Franceschini
1ceb1c7a7e Test setting tag name
r2903 | ffr | 2010-04-30 16:13:17 +1000 (Fri, 30 Apr 2010) | 2 lines
2012-11-15 17:01:16 +11:00
Ferdi Franceschini
182576f305 Test setting tag name
r2902 | ffr | 2010-04-30 16:04:30 +1000 (Fri, 30 Apr 2010) | 2 lines
2012-11-15 17:01:11 +11:00
Ferdi Franceschini
890b4d43ac Test setting tag name
r2901 | ffr | 2010-04-30 16:03:38 +1000 (Fri, 30 Apr 2010) | 2 lines
2012-11-15 17:01:07 +11:00
Ferdi Franceschini
7a653da727 Fix keyword typo again.
r2900 | ffr | 2010-04-30 15:44:54 +1000 (Fri, 30 Apr 2010) | 2 lines
2012-11-15 17:01:02 +11:00
Ferdi Franceschini
fb55aa4a6b Fix typo in release info keywords
r2898 | ffr | 2010-04-30 15:41:54 +1000 (Fri, 30 Apr 2010) | 2 lines
2012-11-15 17:00:58 +11:00
Ferdi Franceschini
e55126cd8c Set long_name attribute on positmotors because they're required by the hdb builder.
r2897 | ffr | 2010-04-30 14:50:41 +1000 (Fri, 30 Apr 2010) | 2 lines
2012-11-15 17:00:53 +11:00
Ferdi Franceschini
c3ed712321 New commands added by Andrew Studer to SICS Release 2.4
r2896 | ffr | 2010-04-30 14:14:59 +1000 (Fri, 30 Apr 2010) | 2 lines
2012-11-15 17:00:48 +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
Douglas Clowes
8fbe8b29d0 Adding script context MODBUS protocol and Eurotherm 2000 series driver
r2886 | dcl | 2010-04-16 09:45:27 +1000 (Fri, 16 Apr 2010) | 2 lines
2012-11-15 17:00:19 +11:00