linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged 2.4 branch

Browse Source 
r2828 | ffr | 2009-11-25 09:56:49 +1100 (Wed, 25 Nov 2009) | 2 lines
This commit is contained in:
Ferdi Franceschini
2009-11-25 09:56:49 +11:00
committed by Douglas Clowes
parent c58ee9fbcb
commit 2ec6505ef8
71 changed files with 2237 additions and 1528 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
site_ansto/instrument/rsd/config/INSTCFCOMMON.TXT
View File

@@ -2,13 +2,16 @@ config/source/source_common.tcl
config/anticollider/anticollider_common.tcl
config/plc/plc_common_1.tcl
config/counter/counter_common_1.tcl
config/environment/temperature/sct_lakeshore_3xx.tcl
config/hipadaba/hipadaba_configuration_common.tcl
config/hipadaba/common_instrument_dictionary.tcl
config/hipadaba/instdict_specification.tcl
config/hmm/hmm_configuration_common_1.tcl
config/hmm/hmm_object.tcl
config/hmm/anstohm_linked.xml
config/scan/scan_common_1.hdd
config/scan/scan_common_1.tcl
config/nexus/nxscripts_common_1.tcl
config/commands/commands_common.tcl
config/motors/sct_positmotor_common.tcl
config/motors/sct_jogmotor_common.tcl

73
site_ansto/instrument/rsd/config/hmm/hmm_configuration.tcl
View File

@@ -1,6 +1,8 @@
source $cfPath(hmm)/hmm_configuration_common_1.tcl
set sim_mode [SplitReply [hmm_simulation]]
::utility::mkVar sample_to_detector_distance float manager sample_to_detector_distance true detector true true
sicslist setatt sample_to_detector_distance units mm
proc ::histogram_memory::init_OAT_TABLE {} {
# We don't need a MAX_CHAN parameter for time because the time channel
@@ -18,39 +20,54 @@ proc ::histogram_memory::init_OAT_TABLE {} {
proc ::histogram_memory::pre_count {} {}
proc ::histogram_memory::post_count {} {}
proc ::histogram_memory::mk_hmm_corrected {} {
if {$::sim_mode == "true"} {
MakeHM hmm_xy_corrected SIM
MakeHM hmm_x_corrected SIM
} else {
MakeHM hmm_xy_corrected anstohttp
MakeHM hmm_x_corrected anstohttp
##
# @brief Adds Kowari specific hmm data types
proc ::histogram_memory::is_select_read_type {type} {
variable HMOBJ
# Instrument specific X and Y dimension names
variable INST_NXC
variable INST_NYC
if [catch {
$HMOBJ configure read_data_period_number 0
switch [string toupper $type] {
"TOTAL_HISTOGRAM_X_CORRECTED" {
$HMOBJ configure rank 1
$HMOBJ configure dim0 [SplitReply [$HMOBJ configure $INST_NXC]]
$HMOBJ configure READ_DATA_UNCAL_CAL CALIBRATED
$HMOBJ configure READ_DATA_TYPE TOTAL_HISTOGRAM_X
set hmm_ext "_total_x"
}
"TOTAL_HISTOGRAM_XY_CORRECTED" {
$HMOBJ configure rank 2
$HMOBJ configure dim0 [SplitReply [$HMOBJ configure $INST_NXC]]
$HMOBJ configure dim1 [SplitReply [$HMOBJ configure $INST_NYC]]
$HMOBJ configure READ_DATA_UNCAL_CAL CALIBRATED
$HMOBJ configure READ_DATA_TYPE TOTAL_HISTOGRAM_XY
set hmm_ext "_total_xy"
}
default {
$HMOBJ configure READ_DATA_UNCAL_CAL UNCALIBRATED
set hmm_ext "notfound"
}
}
hmm_xy_corrected configure rank 2
hmm_xy_corrected configure READ_DATA_UNCAL_CAL CALIBRATED
hmm_xy_corrected configure READ_DATA_TYPE TOTAL_HISTOGRAM_XY
hmm_xy_corrected configure dim0 421
hmm_xy_corrected configure dim1 421
hmm_xy_corrected configure init 0
hmm_xy_corrected init
hmm_x_corrected configure rank 1
hmm_x_corrected configure READ_DATA_UNCAL_CAL CALIBRATED
hmm_x_corrected configure READ_DATA_TYPE TOTAL_HISTOGRAM_X
hmm_x_corrected configure dim0 421
hmm_x_corrected configure init 0
hmm_x_corrected init
} msg ] {
return -code error "([info level 0]) $msg"
}
return $hmm_ext
}
proc ::histogram_memory::isc_initialize {} {
# Instrument specific X and Y dimension names
variable INST_NXC "oat_nxc_eff"
variable INST_NYC "oat_nyc_eff"
if [ catch {
::histogram_memory::init_hmm_objs
::histogram_memory::mk_hmm_corrected
if {$::sim_mode == "true"} {
hmm configure oat_ntc_eff 1
hmm configure oat_nyc_eff 421
hmm configure oat_nxc_eff 421
hmm configure $INST_NYC 421
hmm configure $INST_NXC 421
}
BAT_TABLE -init
CAT_TABLE -init
@@ -58,8 +75,10 @@ proc ::histogram_memory::isc_initialize {} {
OAT_TABLE -init
FAT_TABLE -init
detector_active_height_mm 300
detector_active_width_mm 300
detector_active_height_mm 280
detector_active_height_mm lock
detector_active_width_mm 280
detector_active_width_mm lock
::histogram_memory::ic_initialize

5
site_ansto/instrument/rsd/kowari_configuration.tcl
View File

@@ -1,5 +1,5 @@
# $Revision: 1.16 $
# $Date: 2008-10-27 04:55:46 $
# $Revision: 1.17 $
# $Date: 2009-11-24 22:56:48 $
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
# Last revision by: $Author: ffr $
@@ -25,6 +25,7 @@ source $cfPath(hipadaba)/hipadaba_configuration.tcl
fileeval $cfPath(motors)/positmotor_configuration.tcl
fileeval $cfPath(plc)/plc.tcl
fileeval $cfPath(counter)/counter.tcl
fileeval $cfPath(environment)/temperature/sct_lakeshore_3xx.tcl
fileeval $cfPath(hmm)/hmm_configuration.tcl
fileeval $cfPath(nexus)/nxscripts.tcl
fileeval $cfPath(scan)/scan.tcl

8
site_ansto/instrument/rsd/script_validator/sics_ports.tcl
View File

@@ -1,4 +1,4 @@
set quieckport quieck-val-kowari
set serverport server-val-kowari
set interruptport interrupt-val-kowari
set telnetport telnet-val-kowari
set quieckport sics-quieck-val-kowari
set serverport sics-server-val-kowari
set interruptport sics-interrupt-val-kowari
set telnetport sics-telnet-val-kowari

8
site_ansto/instrument/rsd/script_validator_ports.tcl
View File

@@ -1,4 +1,4 @@
set quieckport quieck-val-kowari
set serverport server-val-kowari
set interruptport interrupt-val-kowari
set telnetport telnet-val-kowari
set quieckport sics-quieck-val-kowari
set serverport sics-server-val-kowari
set interruptport sics-interrupt-val-kowari
set telnetport sics-telnet-val-kowari

8
site_ansto/instrument/rsd/sics_ports.tcl
View File

@@ -1,4 +1,4 @@
set quieckport quieck-kowari
set serverport server-kowari
set interruptport interrupt-kowari
set telnetport telnet-kowari
set quieckport sics-quieck-kowari
set serverport sics-server-kowari
set interruptport sics-interrupt-kowari
set telnetport sics-telnet-kowari