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

1508 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Douglas Clowes
fbeb721abd rename 3xx to 336/340 
r3015 | dcl | 2010-08-06 15:08:32 +1000 (Fri, 06 Aug 2010) | 1 line
 2012-11-15 17:05:44 +11:00
Douglas Clowes
86b9e56b6e remove .obj in psi for clean 
r3014 | dcl | 2010-08-06 15:05:33 +1000 (Fri, 06 Aug 2010) | 1 line
 2012-11-15 17:05:39 +11:00
Ferdi Franceschini
6c6ba7de86 sct_oxford_ips.tcl 
Set the "setpoint" type to drivable for GumTree and clear the "geterror" property when we get a new reading.

r2981 | ffr | 2010-07-19 17:38:02 +1000 (Mon, 19 Jul 2010) | 3 lines
 2012-11-15 17:05:31 +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
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
9ec08cbf85 correct some bitwise operators and permit debugger breakpoints 
r2966 | dcl | 2010-07-01 12:38:34 +1000 (Thu, 01 Jul 2010) | 2 lines
 2012-11-15 17:04:26 +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
aaac832181 add oxford protocol 
r2961 | dcl | 2010-06-25 15:10:25 +1000 (Fri, 25 Jun 2010) | 2 lines
 2012-11-15 17:04:03 +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
Jing Chen
687ed01c01 add delay factor after sending a S command and before sending a L command 
r2947 | jgn | 2010-06-01 15:10:12 +1000 (Tue, 01 Jun 2010) | 2 lines
 2012-11-15 17:03:53 +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
7c90c9d440 SICS-400 Fix reconnect when a device is restarted. 
r2930 | ffr | 2010-05-22 13:26:30 +1000 (Sat, 22 May 2010) | 2 lines
 2012-11-15 17:03:07 +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
Jing Chen
b9a550fd8d return to txNormalState when setting GetReplyFailed 
r2928 | jgn | 2010-05-19 12:12:51 +1000 (Wed, 19 May 2010) | 2 lines
 2012-11-15 17:02:57 +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
9cb2ba5ed8 Added a tolerance parameter for the current because the current on the RF generator fluctuates a bit. 
r2926 | ffr | 2010-05-18 20:07:16 +1000 (Tue, 18 May 2010) | 2 lines
 2012-11-15 17:02:48 +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
bc3471bb98 If the S (set) command fails it should be reported as an error. 
r2920 | ffr | 2010-05-12 17:35:17 +1000 (Wed, 12 May 2010) | 2 lines
 2012-11-15 17:02:20 +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
Jing Chen
3b8b81a19b add response when sending a S command 
r2918 | jgn | 2010-05-12 12:15:24 +1000 (Wed, 12 May 2010) | 2 lines
 2012-11-15 17:02:11 +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
Ferdi Franceschini
47fd7c781f Added some dev notes. 
r2916 | ffr | 2010-05-10 15:16:09 +1000 (Mon, 10 May 2010) | 2 lines
 2012-11-15 17:02:02 +11:00
Ferdi Franceschini
e4e2447475 Replaced by sct_rfamp.c 
r2915 | ffr | 2010-05-10 15:12:21 +1000 (Mon, 10 May 2010) | 2 lines
 2012-11-15 17:01:57 +11:00