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

Merged changes made in-situ

Browse Source 
r2768 | ffr | 2009-03-31 17:25:20 +1100 (Tue, 31 Mar 2009) | 2 lines
This commit is contained in:
Ferdi Franceschini
2009-03-31 17:25:20 +11:00
committed by Douglas Clowes
parent d2f57e4615
commit 8e5b7842e3
17 changed files with 471 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
site_ansto/instrument/hipd/config/anticollider/acscript.txt
View File

@@ -10,7 +10,7 @@
# forbid {0 10} for sphi whenall {schi in {10 15} sx {10 11} }
for stth forbid {20 30} when mtth in {44 45}
for stth forbid {20 30} when mtth in {40 44.5}
for stth forbid {-120 -100} when mtth in {99 100}
for mtth forbid {90 100} when stth in {-120 -119}
for mtth forbid {45 55} when stth in {29 30}
for mtth forbid {40 44.5} when stth in {29 30}

2
site_ansto/instrument/hipd/config/hmm/anstohm_full_standard.xml
View File

@@ -55,7 +55,7 @@
READ_DATA_ORDER_FLIP_Y="ENABLE"
VIEW_TYPE="TOTAL_HISTOGRAM_XY"
VIEW_COLOUR_TABLE="RAIN"
VIEW_SCALING_TYPE="LOG"
VIEW_SCALING_TYPE="LINEAR"
VIEW_LOG_SCALING_RANGE="2"
VIEW_ROOT_SCALING_RANGE="2"
VIEW_ROI_XMIN="-1"

95
site_ansto/instrument/hipd/config/hmm/hmm_rapid.tcl Normal file
View File

@@ -0,0 +1,95 @@
# Test script for multi period acquisition and saving.
set nos_periods 1
proc histmem_period_single { } {
# Because bugs may not yet have been corrected in hmm_configuration_common_1.tcl,
# apply the default settings before attempting del/clear.
global nos_periods
set nos_periods 1
FAT_TABLE -set NOS_PERIODS 1
FAT_TABLE -del NOS_PERIODS
BAT_TABLE -set PERIOD_INDICES { 0 } NO_BAT_ENTRIES 1 NO_BAT_PERIODS 1 NO_REPEAT_ENTRY 0 NO_REPEAT_TABLE 0 NO_EXECUTE_TABLE 0
BAT_TABLE -clear
}
Publish histmem_period_single User
proc histmem_period_sequence { Np Nf } {
# Note - sequence needs to be at least 2 periods.
global nos_periods
set nos_periods $Np
FAT_TABLE -set NOS_PERIODS $Np
BAT_TABLE -set PERIOD_INDICES { 0 1 } NO_BAT_ENTRIES $Np NO_BAT_PERIODS $Np NO_REPEAT_ENTRY $Nf NO_REPEAT_TABLE 1 NO_EXECUTE_TABLE 1
}
Publish histmem_period_sequence User
proc histmem_save_period_sequence { } {
global nos_periods
newfile HISTOGRAM_XYT
for { set i 0 } { $i < $nos_periods } { incr i } {
hmm configure read_data_period_number $i
save $i
}
}
Publish histmem_save_period_sequence User
proc histmem_period_strobo {Freq Bins} {
global nos_bins
set nos_bins $Bins
set bintime [expr int(1000000./($Freq*$Bins))]
histmem fsrce EXTERNAL
set oatstr "OAT_TABLE -set T {0 $bintime} NTC $Bins"
# OAT_TABLE -set T { 0 $bintime } NTC $Bins
eval $oatstr
histmem loadconf
}
Publish histmem_period_strobo User
proc histmem_strobo_off {} {
histmem fsrce INTERNAL
OAT_TABLE -set T { 0 200000 } NTC 1
histmem loadconf
}
Publish histmem_strobo_off User
proc histmem_acquire_period_sequence { Np Nf } {
newfile HISTOGRAM_XYT
histmem stop
histmem_period_sequence $Np $Nf
histmem loadconf
histmem start
set dlytime [ expr int( 1000 * $Nf / 50. ) ]
# clientput "Waiting for" $dlytime "ms..."
after $dlytime
# clientput "tc1 reading is: " [tc1 get]
global nos_periods
for { set i 0 } { $i < $nos_periods } { incr i } {
# after $dlytime
# set current_period -1
# while { $current_period < $i } {
# update
# after 500
# # hmm count
# # hmm init 2
# clientput [hmm configure current_period]
# set current_period [lindex [split [hmm configure current_period] " "] 2]
# clientput "i = " $i " and the current period is " $current_period
# }
hmm configure read_data_period_number $i
save [expr $i]
}
clientput "Acquisition completed."
}
Publish histmem_acquire_period_sequence User

74
site_ansto/instrument/hipd/config/hmm/hmm_temp.tcl Normal file
View File

@@ -0,0 +1,74 @@
# Test script for multi period acquisition and saving.
set nos_periods 1
proc histmem_period_single { } {
# Because bugs may not yet have been corrected in hmm_configuration_common_1.tcl,
# apply the default settings before attempting del/clear.
global nos_periods
set nos_periods 1
FAT_TABLE -set NOS_PERIODS 1
FAT_TABLE -del NOS_PERIODS
BAT_TABLE -set PERIOD_INDICES { 0 } NO_BAT_ENTRIES 1 NO_BAT_PERIODS 1 NO_REPEAT_ENTRY 0 NO_REPEAT_TABLE 0 NO_EXECUTE_TABLE 0
BAT_TABLE -clear
}
Publish histmem_period_single User
proc histmem_period_sequence { Np Nf } {
# Note - sequence needs to be at least 2 periods.
global nos_periods
set nos_periods $Np
FAT_TABLE -set NOS_PERIODS $Np
BAT_TABLE -set PERIOD_INDICES { 0 1 } NO_BAT_ENTRIES $Np NO_BAT_PERIODS $Np NO_REPEAT_ENTRY $Nf NO_REPEAT_TABLE 1 NO_EXECUTE_TABLE 1
}
Publish histmem_period_sequence User
proc histmem_save_period_sequence { } {
global nos_periods
newfile HISTOGRAM_XYT
for { set i 0 } { $i < $nos_periods } { incr i } {
hmm configure read_data_period_number $i
save $i
}
}
Publish histmem_save_period_sequence User
proc histmem_acquire_period_sequence { Np Nf } {
newfile HISTOGRAM_XYT
histmem stop
histmem_period_sequence $Np $Nf
histmem loadconf
histmem start
set dlytime [ expr int( 1000 * $Nf / 50. ) ]
# clientput "Waiting for" $dlytime "ms..."
# after $dlytime
# clientput "tc1 reading is: " [tc1 get]
global nos_periods
for { set i 0 } { $i < $nos_periods } { incr i } {
after $dlytime
# set current_period -1
# while { $current_period < $i } {
# update
# after 500
# # hmm count
# # hmm init 2
# clientput [hmm configure current_period]
# set current_period [lindex [split [hmm configure current_period] " "] 2]
# clientput "i = " $i " and the current period is " $current_period
# }
hmm configure read_data_period_number $i
save [expr $i + 1]
}
clientput "Acquisition completed."
}
Publish histmem_acquire_period_sequence User

24
site_ansto/instrument/hipd/config/motors/motor_configuration.tcl
View File

@@ -99,8 +99,8 @@ set slit2HGroup second/horizontal
# hnotify messages to a reasonable level
set move_count 10
#fileeval $cfPath(motors)/tilt_configuration.tcl
fileeval $cfPath(motors)/euler_configuration.tcl
fileeval $cfPath(motors)/tilt_configuration.tcl
#fileeval $cfPath(motors)/euler_configuration.tcl
############################
# Motor Controller 1
# Motor Controller 1
@@ -221,7 +221,7 @@ Motor mom $motor_driver_type [params \
axis E\
units degrees\
hardlowerlim -5\
hardupperlim 95\
hardupperlim 99\
maxSpeed 1\
maxAccel 1\
maxDecel 1\
@@ -288,7 +288,7 @@ Motor som $motor_driver_type [params \
absEnc 1\
absEncHome $som_Home\
cntsPerX 4096]
setHomeandRange -motor som -home 0 -lowrange 80 -uprange 60
setHomeandRange -motor som -home 0 -lowrange 80 -uprange 105
som speed 1
som precision 0.01
som part sample
@@ -324,9 +324,9 @@ Motor oct $motor_driver_type [params \
units degrees\
hardlowerlim -2\
hardupperlim 2\
maxSpeed 0.5\
maxAccel 0.1\
maxDecel 0.1\
maxSpeed 1.0\
maxAccel 1.0\
maxDecel 1.0\
stepsPerX 56762\
absEnc 1\
absEncHome $oct_Home\
@@ -470,6 +470,12 @@ ss1d long_name bottom
############################
#
# Slit 2, right
#set ss2flg true to use second slit
set ss2flg false
if {$ss2flg} {
# Slit 2, right
Motor ss2r $motor_driver_type [params \
asyncqueue mc4\
@@ -545,6 +551,7 @@ ss2d home 0
ss2d movecount $move_count
ss2d part slits.second
ss2d long_name bottom
}
proc mthGet {} { return [expr [SplitReply [mtth]]/2.0]}
proc mthSet {val} { return "mtth=[SplitReply [mtth]]"}
@@ -570,9 +577,10 @@ sicslist setatt sth long_name half_azimuthal_angle
make_gap_motors ss1vg gap ss1vo offset ss1u ss1d mm $slit1VGroup
make_gap_motors ss1hg gap ss1ho offset ss1r ss1l mm $slit1HGroup
if {$ss2flg} {
make_gap_motors ss2vg gap ss2vo offset ss2u ss2d mm $slit2VGroup
make_gap_motors ss2hg gap ss2ho offset ss2r ss2l mm $slit2HGroup
}
proc motor_set_sobj_attributes {} {
}