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

site_ansto/instrument/rsd/config/INSTCFCOMMON.TXT

@@ -4,6 +4,7 @@ config/plc/plc_common_1.tcl
 config/counter/counter_common_1.tcl
 config/environment/temperature/sct_lakeshore_3xx.tcl
 config/environment/temperature/sct_eurotherm_2000.tcl
+config/environment/sct_protek_common.tcl
 config/hipadaba/hipadaba_configuration_common.tcl
 config/hipadaba/common_instrument_dictionary.tcl
 config/hipadaba/instdict_specification.tcl

site_ansto/instrument/rsd/config/hmm/hmm_configuration.tcl

@@ -89,8 +89,8 @@ proc ::histogram_memory::isc_initialize {} {
     ::histogram_memory::init_OAT_TABLE
     ::histogram_memory::upload_config Filler_defaults
 
-    ::nexus::data alias ::histogram_memory::vertical_axis ::histogram_memory::y_pixel_offset
-    ::nexus::data alias ::histogram_memory::horizontal_axis ::histogram_memory::x_pixel_offset
+    set ::histogram_memory::histmem_axes(HOR) /instrument/detector/x_pixel_offset
+    set ::histogram_memory::histmem_axes(VER) /instrument/detector/y_pixel_offset
   } message ] {
     if {$::errorCode=="NONE"} {return $message}
     return -code error $message

site_ansto/instrument/rsd/config/motors/motor_configuration.tcl

@@ -597,8 +597,8 @@ Motor psho $motor_driver_type [params \
   cntsPerX 8192]
 psho speed 4  
 psho Backlash_offset -0.3
-psho part slits.primary
-psho long_name psho
+psho part slits
+psho long_name primary_psho
 setHomeandRange -motor psho  -home 0 -lowrange 0 -uprange 30 
 
 # Primary Slit, position 0-150mm (Y-axis)
@@ -617,8 +617,8 @@ Motor psp $motor_driver_type [params \
   cntsPerX -8192]
 psp speed 4  
 psp Backlash_offset -0.3
-psp part slits.primary
-psp long_name psp
+psp part slits
+psp long_name primary_psp
 setHomeandRange -motor psp -home 0 -lowrange 0 -uprange 150
 
 # Primary Slit, width, 0-30mm
@@ -637,8 +637,8 @@ Motor psw $motor_driver_type [params \
   cntsPerX -8192]
 psw speed 4  
 psw Backlash_offset 0.3  
-psw part slits.primary
-psw long_name psw
+psw part slits
+psw long_name primary_psw
 setHomeandRange -motor psw -home 0 -lowrange 0 -uprange 30 
 
 #--------------------------------------------------------
@@ -660,8 +660,8 @@ Motor ssho $motor_driver_type [params \
   cntsPerX 8192]
 ssho speed 4  
 ssho Backlash_offset -0.3  
-ssho part slits.secondary
-ssho long_name ssho
+ssho part slits
+ssho long_name secondary_ssho
 setHomeandRange -motor ssho  -home 0 -lowrange 0 -uprange 30 
 
 # Secondary Slit, position
@@ -680,8 +680,8 @@ Motor ssp $motor_driver_type [params \
   cntsPerX -8192]
 ssp speed 4  
 ssp Backlash_offset -0.3  
-ssp part slits.secondary
-ssp long_name ssp
+ssp part slits
+ssp long_name secondary_ssp
 setHomeandRange -motor ssp  -home 0 -lowrange 0 -uprange 150
 
 # Primary Slit, height, 0-30mm
@@ -698,8 +698,8 @@ setHomeandRange -motor ssp  -home 0 -lowrange 0 -uprange 150
 #  absenc 1\
 #  absenchome 542093\
 #  cntsPerX 8192]
-#psh part slits.primary
-#psh long_name psh
+#psh part slits
+#psh long_name primary_psh
 #setHomeandRange -motor psh  -home 0 -lowrange 0 -uprange 30 
 
 ## Secondary Slit, height
@@ -716,8 +716,8 @@ setHomeandRange -motor ssp  -home 0 -lowrange 0 -uprange 150
 #  absenc 1\
 #  absenchome 500000\
 #  cntsPerX 8192]
-#ssh part slits.secondary
-#ssh long_name ssh
+#ssh part slits
+#ssh long_name secondary_ssh
 #setHomeandRange -motor ssh  -home 0 -lowrange 0 -uprange 30 
 
 #--------------------------------------------------------

site_ansto/instrument/rsd/config/motors/secondary_slit_configuration.tcl

@@ -16,6 +16,6 @@ Motor ssw $motor_driver_type [params \
   cntsPerX -8192]
 ssw speed 4  
 ssw Backlash_offset 0.3  
-ssw part slits.secondary
-ssw long_name ssw
+ssw part slits
+ssw long_name secondary_ssw
 setHomeandRange -motor ssw  -home 0 -lowrange 0 -uprange 30

site_ansto/instrument/rsd/kowari_configuration.tcl

@@ -24,6 +24,7 @@ fileeval $cfPath(plc)/plc.tcl
 fileeval $cfPath(counter)/counter.tcl
 fileeval $cfPath(environment)/temperature/sct_lakeshore_3xx.tcl
 fileeval $cfPath(environment)/temperature/sct_eurotherm_2000.tcl
+fileeval $cfPath(environment)/sct_protek_common.tcl
 fileeval $cfPath(hmm)/hmm_configuration.tcl
 fileeval $cfPath(nexus)/nxscripts.tcl
 fileeval $cfPath(scan)/scan.tcl