Add TasMot motors to hipadaba tree and NeXus data files.
nxscripts_common_1.tcl Set the savecmd and sdsinfo attributes for the TasMot motors in ::nexus::set_sobj_attributes instdict_specification.tcl Add tasmot to the sobj_sicstype_list hipadaba_configuration_common.tcl Add tasmot to the motor switch statement of ::hdb::sobjadd util/utility.tcl Add TasMot to ::utility::set_motor_attributes r3367 | ffr | 2012-02-13 20:59:50 +1100 (Mon, 13 Feb 2012) | 15 lines
This commit is contained in:
committed by
Douglas Clowes
parent
3ceb24c5c6
commit
a24420bf69
@@ -688,7 +688,7 @@ proc ::hdb::sobjadd {hpath sobj args} {
|
|||||||
sicslist setatt $sobj id $sobj
|
sicslist setatt $sobj id $sobj
|
||||||
}
|
}
|
||||||
switch $sobjatt(type) {
|
switch $sobjatt(type) {
|
||||||
motor - configurablevirtualmotor {
|
motor - configurablevirtualmotor - tasmot {
|
||||||
if {[info exists sobjatt(group)]} {
|
if {[info exists sobjatt(group)]} {
|
||||||
set hpath [add_hpath $hpath $sobjatt(group)]
|
set hpath [add_hpath $hpath $sobjatt(group)]
|
||||||
if {[catch {hsetprop $hpath type part} err]} {clientput $err error}
|
if {[catch {hsetprop $hpath type part} err]} {clientput $err error}
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ set boolean {true false}
|
|||||||
|
|
||||||
# SICS OBJECTS MUST PROVIDE THE FOLLOWING INFORMATION
|
# SICS OBJECTS MUST PROVIDE THE FOLLOWING INFORMATION
|
||||||
set sobj_klass_list {@none aperture attenuator collimator command crystal data detector disk_chopper entry environment experiment graphics instrument slits monitor monochromator parameter plc reduce sample scan sensor source user}
|
set sobj_klass_list {@none aperture attenuator collimator command crystal data detector disk_chopper entry environment experiment graphics instrument slits monitor monochromator parameter plc reduce sample scan sensor source user}
|
||||||
set sobj_sicstype_list {chopperadapter environment_controller sicsvariable macro motor configurablevirtualmotor singlecounter histmem nxscript sicsdata scanobject sct_object}
|
set sobj_sicstype_list {chopperadapter environment_controller sicsvariable macro motor configurablevirtualmotor tasmot singlecounter histmem nxscript sicsdata scanobject sct_object}
|
||||||
# Different kinds of things are added to the hdb in different ways.
|
# Different kinds of things are added to the hdb in different ways.
|
||||||
# command: This is something a client can run with hset /a/b/c start, it may have parameters and feedback.
|
# command: This is something a client can run with hset /a/b/c start, it may have parameters and feedback.
|
||||||
# Parameters and feedback should be made available in 'ilists' named after the command.
|
# Parameters and feedback should be made available in 'ilists' named after the command.
|
||||||
|
|||||||
@@ -783,6 +783,10 @@ proc ::nexus::gen_nxdict {nexusdic} {
|
|||||||
sicslist setatt $sobj savecmd ::nexus::motor::save
|
sicslist setatt $sobj savecmd ::nexus::motor::save
|
||||||
sicslist setatt $sobj sdsinfo ::nexus::motor::sdsinfo
|
sicslist setatt $sobj sdsinfo ::nexus::motor::sdsinfo
|
||||||
}
|
}
|
||||||
|
foreach sobj [sicslist type TasMot] {
|
||||||
|
sicslist setatt $sobj savecmd ::nexus::motor::save
|
||||||
|
sicslist setatt $sobj sdsinfo ::nexus::motor::sdsinfo
|
||||||
|
}
|
||||||
foreach sobj [sicslist type histmem] {
|
foreach sobj [sicslist type histmem] {
|
||||||
sicslist setatt $sobj savecmd ::nexus::histmem::save
|
sicslist setatt $sobj savecmd ::nexus::histmem::save
|
||||||
sicslist setatt $sobj sdsinfo ::nexus::histmem::sdsinfo
|
sicslist setatt $sobj sdsinfo ::nexus::histmem::sdsinfo
|
||||||
|
|||||||
@@ -484,6 +484,17 @@ proc ::utility::set_motor_attributes {} {
|
|||||||
sicslist setatt $m nxalias $m
|
sicslist setatt $m nxalias $m
|
||||||
sicslist setatt $m mutable true
|
sicslist setatt $m mutable true
|
||||||
}
|
}
|
||||||
|
foreach m [sicslist type TasMot] {
|
||||||
|
sicslist setatt $m klass sample
|
||||||
|
sicslist setatt $m long_name $m
|
||||||
|
sicslist setatt $m kind hobj
|
||||||
|
sicslist setatt $m data true
|
||||||
|
sicslist setatt $m control true
|
||||||
|
sicslist setatt $m nxsave true
|
||||||
|
sicslist setatt $m privilege user
|
||||||
|
sicslist setatt $m nxalias $m
|
||||||
|
sicslist setatt $m mutable true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
proc ::utility::set_chopper_attributes {} {
|
proc ::utility::set_chopper_attributes {} {
|
||||||
foreach ch [lrange [sicslist type chopperadapter] 1 end] {
|
foreach ch [lrange [sicslist type chopperadapter] 1 end] {
|
||||||
|
|||||||
Reference in New Issue
Block a user