Commit Graph

16 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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