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/hipd/config/INSTCFCOMMON.TXT
View File

@@ -3,10 +3,12 @@ config/anticollider/anticollider_common.tcl
config/plc/plc_common_1.tcl
config/counter/counter_common_1.tcl
config/environment/temperature/lakeshore340_common.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/hmm_cylindrical_detector_configuration.tcl
config/hmm/anstohm_linked.xml
config/scan/scan_common_1.hdd
@@ -14,3 +16,4 @@ 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

14
site_ansto/instrument/hipd/config/hmm/hmm_configuration.tcl
View File

@@ -96,13 +96,16 @@ proc ::histogram_memory::detector_posn_degrees {} {
proc ::histogram_memory::pre_count {} {}
proc ::histogram_memory::post_count {} {}
proc ::histogram_memory::isc_initialize {} {
# Instrument specific X and Y dimension names
variable INST_NXC "stitch_nxc"
variable INST_NYC "stitch_nyc"
if [ catch {
::histogram_memory::init_hmm_objs
if {$::sim_mode == "true"} {
hmm configure oat_ntc_eff 1
hmm configure stitch_nyc 512
hmm configure stitch_nxc [expr 480*8 - 1]
hmm configure $INST_NYC 512
hmm configure $INST_NXC [expr 480*8 - 1]
}
BAT_TABLE -init
CAT_TABLE -init
@@ -110,17 +113,20 @@ proc ::histogram_memory::isc_initialize {} {
OAT_TABLE -init
FAT_TABLE -init MULTI_HOST_HISTO_STITCH_OVERLAP MULTI_HOST_HISTO_JOIN_STITCH_ORDER
::histogram_memory::ic_initialize
::histogram_memory::two_theta -boundaries
::histogram_memory::set_graphtype "two_theta" "boundaries"
detector_active_height_mm 203.2
detector_active_height_mm lock
detector_active_width_mm 1524
detector_active_width_mm lock
detector_radius_mm 728.0
detector_radius_mm lock
::histogram_memory::init_OAT_TABLE res "std_968x128"
::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::two_theta
::nexus::data alias ::histogram_memory::horizontal_axis ::histogram_memory::x_pixel_angular_offset
} message ] {
if {$::errorCode=="NONE"} {return $message}
return -code error $message