Added new hdb/nexus support.
r2126 | ffr | 2007-08-16 16:46:12 +1000 (Thu, 16 Aug 2007) | 2 lines
This commit is contained in:
committed by
Douglas Clowes
parent
091dc0d2d2
commit
5c9b53efbc
@@ -1,14 +1,5 @@
|
||||
cfPath=config/motors
|
||||
|
||||
all: script_val
|
||||
all:
|
||||
make -C config
|
||||
|
||||
|
||||
script_val: SVmotors
|
||||
|
||||
|
||||
SVmotors: $(cfPath)/motor_configuration.tcl
|
||||
../mksim_config.tcl -f $(cfPath)/motor_configuration.tcl > script_validator/$(cfPath)/motor_configuration.tcl
|
||||
|
||||
clean:
|
||||
make -C config clean
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
# $Revision: 1.16 $
|
||||
# $Date: 2007-05-08 05:01:16 $
|
||||
# $Revision: 1.17 $
|
||||
# $Date: 2007-08-16 06:46:12 $
|
||||
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
|
||||
# Last revision by: $Author: ffr $
|
||||
|
||||
# Required by server_config.tcl
|
||||
VarMake Instrument Text Internal
|
||||
VarMake Instrument Text Internal
|
||||
Instrument wombat
|
||||
Instrument lock
|
||||
|
||||
@@ -12,6 +12,9 @@ Instrument lock
|
||||
source util/dmc2280/dmc2280_util.tcl
|
||||
source sics_ports.tcl
|
||||
source server_config.tcl
|
||||
VarMake deg_per_rad Float Internal
|
||||
deg_per_rad 57.29577951308232
|
||||
deg_per_rad lock
|
||||
#END SERVER CONFIGURATION SECTION
|
||||
|
||||
########################################
|
||||
@@ -31,29 +34,20 @@ fileeval $cfPath(nexus)/nxscripts.tcl
|
||||
fileeval $cfPath(scan)/scan.tcl
|
||||
source $cfPath(hipadaba)/hipadaba_configuration.tcl
|
||||
source gumxml.tcl
|
||||
|
||||
#::histogram_memory::setmode pulser
|
||||
#::histogram_memory::setmode calibration
|
||||
::histogram_memory::setmode normal
|
||||
::histogram_memory::hmm_initialize
|
||||
::histogram_memory::hmm_setup transparent 7000000 3 stitch_nyc stitch_nxc oat_ntc_eff
|
||||
hmm_start 0
|
||||
::histogram_memory::setmode normal
|
||||
::histogram_memory::initialize
|
||||
|
||||
MakeStateMon hmscan
|
||||
|
||||
VarMake detector_layout Text Mugger
|
||||
detector_layout cylinder
|
||||
|
||||
VarMake detector_radius_mm Int User
|
||||
detector_radius_mm 700.0
|
||||
VarMake detector_angle_deg Float User
|
||||
detector_angle_deg 120.0
|
||||
VarMake deg_per_rad Float Internal
|
||||
deg_per_rad 57.29577951308232
|
||||
deg_per_rad lock
|
||||
VarMake detector_angle_rad Float User
|
||||
detector_angle_rad [expr [SplitReply [detector_angle_deg]]/[SplitReply [deg_per_rad]] ]
|
||||
VarMake detector_active_height_mm Float User
|
||||
detector_active_height_mm 200.0
|
||||
|
||||
VarMake crystal_type Text User
|
||||
VarMake crystal_wavelength_A Float User
|
||||
@@ -85,4 +79,7 @@ detector_type lock
|
||||
detector_description 8 curved multiwire segments
|
||||
detector_description lock
|
||||
|
||||
fileeval extraconfig.tcl
|
||||
MakeStateMon hmscan
|
||||
server_set_sobj_attributes
|
||||
buildHDB instrument_dictionary
|
||||
fileeval extraconfig.tcl
|
||||
|
||||
@@ -1,14 +1,5 @@
|
||||
cfPath=config/motors
|
||||
|
||||
all: script_val
|
||||
all:
|
||||
make -C config
|
||||
|
||||
|
||||
script_val: SVmotors
|
||||
|
||||
|
||||
SVmotors: $(cfPath)/motor_configuration.tcl
|
||||
../mksim_config.tcl -f $(cfPath)/motor_configuration.tcl > script_validator/$(cfPath)/motor_configuration.tcl
|
||||
|
||||
clean:
|
||||
make -C config clean
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# $Revision: 1.23 $
|
||||
# $Date: 2007-05-08 05:01:16 $
|
||||
# $Revision: 1.24 $
|
||||
# $Date: 2007-08-16 06:46:12 $
|
||||
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
|
||||
# Last revision by: $Author: ffr $
|
||||
|
||||
@@ -12,6 +12,9 @@ Instrument lock
|
||||
source util/dmc2280/dmc2280_util.tcl
|
||||
source sics_ports.tcl
|
||||
source server_config.tcl
|
||||
VarMake deg_per_rad Float Internal
|
||||
deg_per_rad 57.29577951308232
|
||||
deg_per_rad lock
|
||||
#END SERVER CONFIGURATION SECTION
|
||||
|
||||
########################################
|
||||
@@ -19,7 +22,7 @@ source server_config.tcl
|
||||
|
||||
fileeval $cfPath(motors)/motor_configuration.tcl
|
||||
|
||||
########
|
||||
########
|
||||
# Parameters set above the restore command will be clobbered by
|
||||
# the values in the status.tcl file
|
||||
restore
|
||||
@@ -35,26 +38,16 @@ source gumxml.tcl
|
||||
#::histogram_memory::setmode pulser
|
||||
#::histogram_memory::setmode calibration
|
||||
::histogram_memory::setmode normal
|
||||
::histogram_memory::hmm_initialize
|
||||
::histogram_memory::hmm_setup transparent 0 3 oat_nyc_eff oat_nxc_eff oat_ntc_eff
|
||||
hmm_start 0
|
||||
::histogram_memory::initialize
|
||||
|
||||
MakeStateMon hmscan
|
||||
|
||||
VarMake detector_layout Text Mugger
|
||||
detector_layout cylinder
|
||||
|
||||
VarMake detector_radius_mm Int User
|
||||
detector_radius_mm 1250
|
||||
VarMake detector_angle_deg Float User
|
||||
detector_angle_deg 158.75
|
||||
VarMake deg_per_rad Float Internal
|
||||
deg_per_rad 57.29577951308232
|
||||
deg_per_rad lock
|
||||
VarMake detector_angle_rad Float User
|
||||
detector_angle_rad [expr [SplitReply [detector_angle_deg]]/[SplitReply [deg_per_rad]] ]
|
||||
VarMake detector_active_height_mm Float User
|
||||
detector_active_height_mm 335
|
||||
|
||||
VarMake crystal_type Text User
|
||||
VarMake crystal_wavelength_A Float User
|
||||
@@ -86,5 +79,7 @@ detector_type lock
|
||||
detector_description 128 He-3 proportional counter detector tubes (GE Energy Reuter Stokes Inc. item=RS-P4-0814-217)
|
||||
detector_description lock
|
||||
|
||||
MakeStateMon hmscan
|
||||
server_set_sobj_attributes
|
||||
buildHDB instrument_dictionary
|
||||
fileeval extraconfig.tcl
|
||||
|
||||
|
||||
Reference in New Issue
Block a user