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

Merged release 2.0 patch-set 1 (RELEASE-2_0P1 )

Browse Source 
r2624 | ffr | 2008-06-12 09:05:36 +1000 (Thu, 12 Jun 2008) | 2 lines
This commit is contained in:
Ferdi Franceschini
2008-06-12 09:05:36 +10:00
committed by Douglas Clowes
parent 528d125efe
commit 3a40ea5693
12 changed files with 79 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
site_ansto/instrument/config/counter/counter_common_1.tcl
View File

@@ -1,2 +1,10 @@
bm SetExponent 0 bm SetExponent 0
sicslist setatt bm privilege internal sicslist setatt bm privilege internal
::utility::macro::getset float monitor_counts {} {
return "monitor_counts = [SplitReply [bm getcounts]]"
}
sicslist setatt monitor_counts klass monitor
sicslist setatt monitor_counts long_name data
sicslist setatt monitor_counts mutable true

11
site_ansto/instrument/config/nexus/nxscripts_common_1.tcl
View File

@@ -41,7 +41,7 @@ namespace eval nexus {
variable filetype_spec { variable filetype_spec {
BEAM_MONITOR { BEAM_MONITOR {
link {axis 1 data_run_number} link {axis 1 data_run_number}
link {data_set ::monitor::count_fb_counts} link {data_set monitor_counts}
save_policy {include @all exclude {hmm hmm_xy hmm_xt hmm_yt hmm_x hmm_y hmm_t}} save_policy {include @all exclude {hmm hmm_xy hmm_xt hmm_yt hmm_x hmm_y hmm_t}}
} }
HISTOGRAM_XYT { HISTOGRAM_XYT {
@@ -855,7 +855,12 @@ proc ::nexus::macro::getset_save {sobj nxalias data_type args} {
if {[lindex $args 0] == "point"} { if {[lindex $args 0] == "point"} {
set index [lindex $args 1] set index [lindex $args 1]
nxscript_data clear nxscript_data clear
nxscript_data putfloat 0 [getVal [$sobj] ] set val [getVal [$sobj] ]
switch $data_type {
int {nxscript_data putint 0 $val}
float {nxscript_data putfloat 0 $val}
default {error "ERROR: [info level -1]->::nexus::sicsvariable::save, unknown type $data_type"}
}
nxscript putslab $nxalias [list $index] [list 1] nxscript_data nxscript putslab $nxalias [list $index] [list 1] nxscript_data
} else { } else {
nxscript putfloat $nxalias [SplitReply [$sobj]] nxscript putfloat $nxalias [SplitReply [$sobj]]
@@ -1030,7 +1035,7 @@ foreach expt $::nexus::exports {
set tmpstr [string map {"$" ""} {$Name: not supported by cvs2svn $}] set tmpstr [string map {"$" ""} {$Name: not supported by cvs2svn $}]
set nx_content_release_tag [lindex $tmpstr [expr [llength $tmpstr] - 1]] set nx_content_release_tag [lindex $tmpstr [expr [llength $tmpstr] - 1]]
set tmpstr [string map {"$" ""} {$Revision: 1.36 $}] set tmpstr [string map {"$" ""} {$Revision: 1.37 $}]
set nx_content_revision_num [lindex $tmpstr [expr [llength $tmpstr] - 1]] set nx_content_revision_num [lindex $tmpstr [expr [llength $tmpstr] - 1]]
#namespace eval data { #namespace eval data {

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

@@ -18,7 +18,7 @@ proc ::histogram_memory::init_OAT_TABLE {} {
# x bin range 0, 3871 # x bin range 0, 3871
# y bin range 0, 511 # y bin range 0, 511
FAT_TABLE -set MULTI_HOST_HISTO_STITCH_OVERLAP 32 FAT_TABLE -set MULTI_HOST_HISTO_STITCH_OVERLAP 32
OAT_TABLE -set X { 991.5 990.5 } NXC 992 Y { 511.5 510.5 } NYC 512 T { 0 2000 } NTC 1 OAT_TABLE -set X { 991.5 990.5 } NXC 992 Y { 511.5 510.5 } NYC 512 T { 0 20000 } NTC 1
} message ] { } message ] {
if {$::errorCode=="NONE"} {return $message} if {$::errorCode=="NONE"} {return $message}
return -code error $message return -code error $message
@@ -98,9 +98,9 @@ proc ::histogram_memory::initialize {} {
::histogram_memory::_initialize ::histogram_memory::_initialize
::histogram_memory::two_theta -boundaries ::histogram_memory::two_theta -boundaries
detector_active_height_mm 200 detector_active_height_mm 203.2
detector_active_width_mm 500 detector_active_width_mm 1524
detector_radius_mm 700.0 detector_radius_mm 728.0
# hmm configure FAT_SIMULATED_EVENT_Y0 $y_bb0 # hmm configure FAT_SIMULATED_EVENT_Y0 $y_bb0
# hmm configure FAT_SIMULATED_EVENT_Y1 $ybbmax # hmm configure FAT_SIMULATED_EVENT_Y1 $ybbmax

13
site_ansto/instrument/hrpd/config/hmm/hmm_configuration.tcl
View File

@@ -13,7 +13,15 @@ proc ::histogram_memory::init_OAT_TABLE {} {
OAT_TABLE Y -setdata BMIN -0.5 OAT_TABLE Y -setdata BMIN -0.5
OAT_TABLE Y -setdata BMAX 511.5 OAT_TABLE Y -setdata BMAX 511.5
OAT_TABLE -set X { 127.5 126.5 } NXC 128 Y { -0.5 0.5 } NYC 512 T { 0 2000 } NTC 1 OAT_TABLE -set X { 127.5 126.5 } NXC 128 Y { -0.5 3.5 } NYC 128 T { 0 20000 } NTC 1
} message ] {
if {$::errorCode=="NONE"} {return $message}
return -code error $message
}
}
proc ::histogram_memory::init_SAT_TABLE {} {
if [ catch {
SAT_TABLE -set APPLY ENABLE MIDPOINT 480 DIRECTION X SWAP ENABLE WRAP ENABLE
} message ] { } message ] {
if {$::errorCode=="NONE"} {return $message} if {$::errorCode=="NONE"} {return $message}
return -code error $message return -code error $message
@@ -43,7 +51,7 @@ proc ::histogram_memory::initialize {} {
::histogram_memory::two_theta -boundaries ::histogram_memory::two_theta -boundaries
detector_active_height_mm 335 detector_active_height_mm 335
detector_active_width_mm 500 detector_active_width_mm 3463.4
detector_radius_mm 1250.0 detector_radius_mm 1250.0
# hmm configure FAT_SIMULATED_EVENT_Y0 $y_bb0 # hmm configure FAT_SIMULATED_EVENT_Y0 $y_bb0
@@ -51,6 +59,7 @@ proc ::histogram_memory::initialize {} {
# hmm configure FAT_SIMULATED_EVENT_X0 $x_bb0 # hmm configure FAT_SIMULATED_EVENT_X0 $x_bb0
# hmm configure FAT_SIMULATED_EVENT_X1 $xbbmax # hmm configure FAT_SIMULATED_EVENT_X1 $xbbmax
::histogram_memory::init_OAT_TABLE ::histogram_memory::init_OAT_TABLE
::histogram_memory::init_SAT_TABLE
::histogram_memory::upload_config Filler_defaults ::histogram_memory::upload_config Filler_defaults
::nexus::data alias ::histogram_memory::vertical_axis ::histogram_memory::y_pixel_offset ::nexus::data alias ::histogram_memory::vertical_axis ::histogram_memory::y_pixel_offset

6
site_ansto/instrument/reflectometer/config/hmm/hmm_configuration.tcl
View File

@@ -12,7 +12,7 @@ proc ::histogram_memory::init_OAT_TABLE {} {
OAT_TABLE Y -setdata BMIN -110.5 OAT_TABLE Y -setdata BMIN -110.5
OAT_TABLE Y -setdata BMAX 110.5 OAT_TABLE Y -setdata BMAX 110.5
OAT_TABLE -set X { -210.5 -209.5 } NXC 421 Y { -110.5 -109.5 } NYC 221 T { 0 2000 } NTC 1 OAT_TABLE -set X { -210.5 -209.5 } NXC 421 Y { -110.5 -109.5 } NYC 221 T { 0 20000 } NTC 1
} message ] { } message ] {
if {$::errorCode=="NONE"} {return $message} if {$::errorCode=="NONE"} {return $message}
return -code error $message return -code error $message
@@ -34,8 +34,8 @@ proc ::histogram_memory::initialize {} {
FAT_TABLE -init FAT_TABLE -init
::histogram_memory::_initialize ::histogram_memory::_initialize
detector_active_height_mm 257.5 detector_active_height_mm 230
detector_active_width_mm 500 detector_active_width_mm 480
# hmm configure FAT_SIMULATED_EVENT_Y0 $y_bb0 # hmm configure FAT_SIMULATED_EVENT_Y0 $y_bb0
# hmm configure FAT_SIMULATED_EVENT_Y1 $ybbmax # hmm configure FAT_SIMULATED_EVENT_Y1 $ybbmax

9
site_ansto/instrument/reflectometer/config/motors/motor_configuration.tcl
View File

@@ -1,7 +1,7 @@
# $Revision: 1.28 $ # $Revision: 1.29 $
# $Date: 2008-05-30 07:38:22 $ # $Date: 2008-06-11 23:05:36 $
# Author: Ferdi Franceschini (ffr@ansto.gov.au) # Author: Ferdi Franceschini (ffr@ansto.gov.au)
# Last revision by: $Author: dcl $ # Last revision by: $Author: ffr $
# START MOTOR CONFIGURATION # START MOTOR CONFIGURATION
@@ -39,8 +39,7 @@ set m1ro_home 134658
set bat_home 8308518 set bat_home 8308518
set st3vt_home 8742250 set st3vt_home 8742250
set st4vt_home 8806900 set st4vt_home 8806900
#set sth_home 23511400 replaced with 23541737 on 2008-05-30 for loan tilt stage set sth_home 23511400
set sth_home 23541737
#set sphi_home 7548440 - victim of the NaN #set sphi_home 7548440 - victim of the NaN
set sphi_home 7450470 set sphi_home 7450470
set sx_home 8574000 set sx_home 8574000

7
site_ansto/instrument/reflectometer/platypus_configuration.tcl
View File

@@ -1,5 +1,5 @@
# $Revision: 1.15 $ # $Revision: 1.16 $
# $Date: 2008-05-30 00:26:56 $ # $Date: 2008-06-11 23:05:36 $
# Author: Ferdi Franceschini (ffr@ansto.gov.au) # Author: Ferdi Franceschini (ffr@ansto.gov.au)
# Last revision by: $Author: ffr $ # Last revision by: $Author: ffr $
@@ -39,6 +39,9 @@ source gumxml.tcl
# AN ERROR IF THERE IS NO ../log/status.tcl FILE. # AN ERROR IF THERE IS NO ../log/status.tcl FILE.
restore restore
::utility::mkVar ::anticollider::protect_detector text manager protect_detector false detector true false
::anticollider::protect_detector "true"
::histogram_memory::initialize ::histogram_memory::initialize
MakeStateMon hmscan MakeStateMon hmscan

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

@@ -12,7 +12,7 @@ proc ::histogram_memory::init_OAT_TABLE {} {
OAT_TABLE Y -setdata BMIN -210.5 OAT_TABLE Y -setdata BMIN -210.5
OAT_TABLE Y -setdata BMAX 210.5 OAT_TABLE Y -setdata BMAX 210.5
OAT_TABLE -set X { -210.5 -209.5 } NXC 421 Y { -210.5 -209.5 } NYC 421 T { 0 2000 } NTC 1 OAT_TABLE -set X { -210.5 -209.5 } NXC 421 Y { -210.5 -209.5 } NYC 421 T { 0 20000 } NTC 1
} }
proc ::histogram_memory::pre_count {} {} proc ::histogram_memory::pre_count {} {}
@@ -29,6 +29,10 @@ proc ::histogram_memory::initialize {} {
SAT_TABLE -init SAT_TABLE -init
OAT_TABLE -init OAT_TABLE -init
FAT_TABLE -init FAT_TABLE -init
detector_active_height_mm 280
detector_active_width_mm 280
::histogram_memory::_initialize ::histogram_memory::_initialize
# hmm configure FAT_SIMULATED_EVENT_Y0 $y_bb0 # hmm configure FAT_SIMULATED_EVENT_Y0 $y_bb0

6
site_ansto/instrument/sans/config/hmm/hmm_configuration.tcl
View File

@@ -13,7 +13,7 @@ proc ::histogram_memory::init_OAT_TABLE {} {
OAT_TABLE Y -setdata BMIN -0.5 OAT_TABLE Y -setdata BMIN -0.5
OAT_TABLE Y -setdata BMAX 127.5 OAT_TABLE Y -setdata BMAX 127.5
OAT_TABLE -set X { 127.5 126.5 } NXC 128 Y { -0.5 0.5 } NYC 127 T { 0 2000 } NTC 1 OAT_TABLE -set X { 127.5 126.5 } NXC 128 Y { -0.5 0.5 } NYC 127 T { 0 20000 } NTC 1
} message ] { } message ] {
if {$::errorCode=="NONE"} {return $message} if {$::errorCode=="NONE"} {return $message}
return -code error $message return -code error $message
@@ -35,8 +35,8 @@ proc ::histogram_memory::initialize {} {
FAT_TABLE -init FAT_TABLE -init
::histogram_memory::_initialize ::histogram_memory::_initialize
detector_active_height_mm 257.5 detector_active_height_mm 980
detector_active_width_mm 500 detector_active_width_mm 980
# hmm configure FAT_SIMULATED_EVENT_Y0 $y_bb0 # hmm configure FAT_SIMULATED_EVENT_Y0 $y_bb0
# hmm configure FAT_SIMULATED_EVENT_Y1 $ybbmax # hmm configure FAT_SIMULATED_EVENT_Y1 $ybbmax

15
site_ansto/instrument/sans/quokka_configuration.tcl
View File

@@ -1,5 +1,5 @@
# $Revision: 1.7 $ # $Revision: 1.8 $
# $Date: 2008-05-30 00:26:56 $ # $Date: 2008-06-11 23:05:36 $
# Author: Ferdi Franceschini (ffr@ansto.gov.au) # Author: Ferdi Franceschini (ffr@ansto.gov.au)
# Last revision by: $Author: ffr $ # Last revision by: $Author: ffr $
@@ -33,6 +33,17 @@ fileeval $cfPath(anticollider)/anticollider.tcl
source gumxml.tcl source gumxml.tcl
########
# Parameters set above the restore command will be clobbered by
# the values in the status.tcl file
# BIG WARNING: DON'T PUT 'restore' IN A CATCH BLOCK BECAUSE IT RETURNS
# AN ERROR IF THERE IS NO ../log/status.tcl FILE.
restore
::utility::mkVar ::anticollider::protect_detector text manager protect_detector false detector true false
::anticollider::protect_detector "true"
######## ########
# Parameters set above the restore command will be clobbered by # Parameters set above the restore command will be clobbered by
# the values in the status.tcl file # the values in the status.tcl file

16
site_ansto/instrument/server_config.tcl
View File

@@ -1,7 +1,7 @@
# SICS common configuration # SICS common configuration
# $Revision: 1.33 $ # $Revision: 1.34 $
# $Date: 2008-05-30 00:26:54 $ # $Date: 2008-06-11 23:05:36 $
# Author: Ferdi Franceschini (ffr@ansto.gov.au) # Author: Ferdi Franceschini (ffr@ansto.gov.au)
# Last revision by $Author: ffr $ # Last revision by $Author: ffr $
@@ -131,7 +131,7 @@ sics_release [lindex $tmpstr [expr [llength $tmpstr] - 1]]
sics_release lock sics_release lock
::utility::mkVar sics_revision_num Text internal ::utility::mkVar sics_revision_num Text internal
set tmpstr [string map {"$" ""} {$Revision: 1.33 $}] set tmpstr [string map {"$" ""} {$Revision: 1.34 $}]
sics_revision_num [lindex $tmpstr [expr [llength $tmpstr] - 1]] sics_revision_num [lindex $tmpstr [expr [llength $tmpstr] - 1]]
sics_revision_num lock sics_revision_num lock
@@ -178,10 +178,18 @@ proc server_set_sobj_attributes {} {
set sim_mode [SplitReply [opal_simulation]] set sim_mode [SplitReply [opal_simulation]]
if {$sim_mode == "true"} { if {$sim_mode == "true"} {
proc opal {args} { proc opal {args} {
clientput "REACTOR POWER = 20 (woohoooooo!!!)" return "CALIBRATED.CALIBRATED REACTOR POWER 0290_04:ARPCS_CNTRL.RO0005 = 20 (08-06-04 11:42:39)"
} }
publish opal user publish opal user
} else { } else {
MakeAsyncQueue lss_chan LSS 137.157.204.67 31250 MakeAsyncQueue lss_chan LSS 137.157.204.67 31250
MakeLSSMonitor opal lss_chan 0 MakeLSSMonitor opal lss_chan 0
} }
::utility::macro::getset float reactor_power {} {
return "reactor_power = [lindex [opal calibrated] 5]"
}
sicslist setatt reactor_power klass source
sicslist setatt reactor_power long_name power
sicslist setatt reactor_power mutable true
sicslist setatt reactor_power units "MW"

6
site_ansto/instrument/util/utility.tcl
View File

@@ -1,7 +1,7 @@
# Some useful functions for SICS configuration. # Some useful functions for SICS configuration.
# $Revision: 1.11 $ # $Revision: 1.12 $
# $Date: 2008-05-30 00:26:57 $ # $Date: 2008-06-11 23:05:36 $
# Author: Ferdi Franceschini (ffr@ansto.gov.au) # Author: Ferdi Franceschini (ffr@ansto.gov.au)
# Last revision by $Author: ffr $ # Last revision by $Author: ffr $
@@ -407,7 +407,7 @@ proc echo {args} {
# @param obj, name of a SICS or Tcl object # @param obj, name of a SICS or Tcl object
# @return 1 if obj exists otherwise 0 # @return 1 if obj exists otherwise 0
proc ::utility::obj_exists {obj} { proc ::utility::obj_exists {obj} {
if { [sicslist match $obj ] != "" || [info exists $obj] } { if { [string trim [sicslist match $obj ]] != "" || [info exists $obj] } {
return 1 return 1
} else { } else {
return 0 return 0