Remove superfluous trailing white space from TCL files
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
|
||||
|
||||
source $cfPath(anticollider)/anticollider_common.tcl
|
||||
source $cfPath(anticollider)/anticollider_common.tcl
|
||||
::anticollider::loadscript acscript.txt
|
||||
|
||||
@@ -5,7 +5,7 @@ namespace eval counter {
|
||||
variable isc_numchannels
|
||||
variable isc_monitor_address
|
||||
variable isc_portlist
|
||||
variable isc_beam_monitor_list
|
||||
variable isc_beam_monitor_list
|
||||
proc set_sobj_attributes {} {
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
set hpaths [list experiment detector detector/monitor detector/histmem ]
|
||||
set hpaths [list experiment detector detector/monitor detector/histmem ]
|
||||
|
||||
# Maps devices (eg motors) to hipadaba paths.
|
||||
# obj name path
|
||||
|
||||
@@ -5,7 +5,7 @@ set sim_mode [SplitReply [hmm_simulation]]
|
||||
sicslist setatt sample_to_detector_distance units mm
|
||||
|
||||
proc ::histogram_memory::init_OAT_TABLE {} {
|
||||
# We don't need a MAX_CHAN parameter for time because the time channel
|
||||
# We don't need a MAX_CHAN parameter for time because the time channel
|
||||
# is scaled by calling the ::histogram_memory::clock_scale function
|
||||
OAT_TABLE X -setdata MAX_CHAN 421
|
||||
OAT_TABLE Y -setdata MAX_CHAN 421
|
||||
@@ -20,7 +20,7 @@ proc ::histogram_memory::init_OAT_TABLE {} {
|
||||
hmm configure fat_frame_frequency $freq
|
||||
hmm configure fat_frame_source EXTERNAL
|
||||
|
||||
OAT_TABLE -set X { -210.5 -209.5 } NXC 421 Y { -210.5 -209.5 } NYC 421 T { 0 20000 } 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 {} {}
|
||||
@@ -33,7 +33,7 @@ proc ::histogram_memory::is_select_read_type {type} {
|
||||
# Instrument specific X and Y dimension names
|
||||
variable INST_NXC
|
||||
variable INST_NYC
|
||||
|
||||
|
||||
if [catch {
|
||||
$HMOBJ configure read_data_period_number 0
|
||||
|
||||
@@ -50,7 +50,7 @@ proc ::histogram_memory::is_select_read_type {type} {
|
||||
$HMOBJ configure dim0 [SplitReply [$HMOBJ configure $INST_NXC]]
|
||||
$HMOBJ configure dim1 [SplitReply [$HMOBJ configure $INST_NYC]]
|
||||
$HMOBJ configure READ_DATA_UNCAL_CAL CALIBRATED
|
||||
$HMOBJ configure READ_DATA_TYPE TOTAL_HISTOGRAM_XY
|
||||
$HMOBJ configure READ_DATA_TYPE TOTAL_HISTOGRAM_XY
|
||||
set hmm_ext "_total_xy"
|
||||
}
|
||||
default {
|
||||
|
||||
@@ -11,13 +11,13 @@ set ephi_Home 26573867
|
||||
set echi_Home 24224404
|
||||
|
||||
set eom_stepsPerX [expr -25000.0]
|
||||
set eom_cntsPerX [expr 8192.0]
|
||||
set eom_cntsPerX [expr 8192.0]
|
||||
|
||||
set ephi_stepsPerX [expr 25000.0/2.0]
|
||||
set ephi_cntsPerX [expr 8192.0/2.0]
|
||||
set ephi_cntsPerX [expr 8192.0/2.0]
|
||||
|
||||
set echi_stepsPerX [expr -25000.0/1.0]
|
||||
set echi_cntsPerX [expr 8192.0/1.0]
|
||||
set echi_cntsPerX [expr 8192.0/1.0]
|
||||
|
||||
Motor eom $motor_driver_type [params \
|
||||
asyncqueue mc4\
|
||||
|
||||
@@ -382,7 +382,7 @@ Motor sx $motor_driver_type [params \
|
||||
absEnc 1\
|
||||
absEncHome $sx_Home\
|
||||
cntsPerX [expr -8192.0/$sx_pitch]]
|
||||
setHomeandRange -motor sx -home 0 -lowrange 250 -uprange 250
|
||||
setHomeandRange -motor sx -home 0 -lowrange 250 -uprange 250
|
||||
sx speed 1.0
|
||||
sx accel 1.0
|
||||
sx decel 1.0
|
||||
@@ -403,7 +403,7 @@ sx creep_offset 0.5
|
||||
# to 4.999444939 after improved statistics
|
||||
# to 4.99930 after some headscratching
|
||||
# to 4.999610818
|
||||
# best accuracies so far with 4.999444939
|
||||
# best accuracies so far with 4.999444939
|
||||
# set pitch to 4.9995324 (...24 added by ok for no good reason :-)
|
||||
#
|
||||
# change hw limits temporarily from -250...250 to -215...285, 4.1.2007
|
||||
@@ -422,7 +422,7 @@ Motor sy $motor_driver_type [params \
|
||||
absEnc 1\
|
||||
absEncHome $sy_Home\
|
||||
cntsPerX [expr -8192.0/$sy_pitch]]
|
||||
setHomeandRange -motor sy -home 0 -lowrange 250 -uprange 250
|
||||
setHomeandRange -motor sy -home 0 -lowrange 250 -uprange 250
|
||||
sy speed 1.0
|
||||
sy accel 1.0
|
||||
sy decel 1.0
|
||||
@@ -563,11 +563,11 @@ Motor psho $motor_driver_type [params \
|
||||
absenc 1\
|
||||
absenchome $psho_home\
|
||||
cntsPerX 8192]
|
||||
psho speed 4
|
||||
psho speed 4
|
||||
psho Backlash_offset -0.3
|
||||
psho part slits
|
||||
psho long_name primary_psho
|
||||
setHomeandRange -motor psho -home 0 -lowrange 0 -uprange 30
|
||||
setHomeandRange -motor psho -home 0 -lowrange 0 -uprange 30
|
||||
|
||||
# Primary Slit, position 0-150mm (Y-axis)
|
||||
Motor psp $motor_driver_type [params \
|
||||
@@ -583,7 +583,7 @@ Motor psp $motor_driver_type [params \
|
||||
absenc 1\
|
||||
absenchome $psp_home\
|
||||
cntsPerX -8192]
|
||||
psp speed 4
|
||||
psp speed 4
|
||||
psp Backlash_offset -0.3
|
||||
psp part slits
|
||||
psp long_name primary_psp
|
||||
@@ -603,11 +603,11 @@ Motor psw $motor_driver_type [params \
|
||||
absenc 1\
|
||||
absenchome $psw_home\
|
||||
cntsPerX -8192]
|
||||
psw speed 4
|
||||
psw Backlash_offset 0.3
|
||||
psw speed 4
|
||||
psw Backlash_offset 0.3
|
||||
psw part slits
|
||||
psw long_name primary_psw
|
||||
setHomeandRange -motor psw -home 0 -lowrange 0 -uprange 30
|
||||
setHomeandRange -motor psw -home 0 -lowrange 0 -uprange 30
|
||||
|
||||
#--------------------------------------------------------
|
||||
|
||||
@@ -626,11 +626,11 @@ Motor ssho $motor_driver_type [params \
|
||||
absenc 1\
|
||||
absenchome $ssho_home\
|
||||
cntsPerX 8192]
|
||||
ssho speed 4
|
||||
ssho Backlash_offset -0.3
|
||||
ssho speed 4
|
||||
ssho Backlash_offset -0.3
|
||||
ssho part slits
|
||||
ssho long_name secondary_ssho
|
||||
setHomeandRange -motor ssho -home 0 -lowrange 0 -uprange 30
|
||||
setHomeandRange -motor ssho -home 0 -lowrange 0 -uprange 30
|
||||
|
||||
# Secondary Slit, position
|
||||
Motor ssp $motor_driver_type [params \
|
||||
@@ -646,8 +646,8 @@ Motor ssp $motor_driver_type [params \
|
||||
absenc 1\
|
||||
absenchome $ssp_home\
|
||||
cntsPerX -8192]
|
||||
ssp speed 4
|
||||
ssp Backlash_offset -0.3
|
||||
ssp speed 4
|
||||
ssp Backlash_offset -0.3
|
||||
ssp part slits
|
||||
ssp long_name secondary_ssp
|
||||
setHomeandRange -motor ssp -home 0 -lowrange 0 -uprange 220
|
||||
@@ -668,7 +668,7 @@ setHomeandRange -motor ssp -home 0 -lowrange 0 -uprange 220
|
||||
# cntsPerX 8192]
|
||||
#psh part slits
|
||||
#psh long_name primary_psh
|
||||
#setHomeandRange -motor psh -home 0 -lowrange 0 -uprange 30
|
||||
#setHomeandRange -motor psh -home 0 -lowrange 0 -uprange 30
|
||||
|
||||
## Secondary Slit, height
|
||||
#Motor ssh $motor_driver_type [params \
|
||||
@@ -686,7 +686,7 @@ setHomeandRange -motor ssp -home 0 -lowrange 0 -uprange 220
|
||||
# cntsPerX 8192]
|
||||
#ssh part slits
|
||||
#ssh long_name secondary_ssh
|
||||
#setHomeandRange -motor ssh -home 0 -lowrange 0 -uprange 30
|
||||
#setHomeandRange -motor ssh -home 0 -lowrange 0 -uprange 30
|
||||
|
||||
#--------------------------------------------------------
|
||||
|
||||
|
||||
@@ -14,8 +14,8 @@ Motor ssw $motor_driver_type [params \
|
||||
absenc 1\
|
||||
absenchome $ssw_home\
|
||||
cntsPerX -8192]
|
||||
ssw speed 4
|
||||
ssw Backlash_offset 0.3
|
||||
ssw speed 4
|
||||
ssw Backlash_offset 0.3
|
||||
ssw part slits
|
||||
ssw long_name secondary_ssw
|
||||
setHomeandRange -motor ssw -home 0 -lowrange 0 -uprange 30
|
||||
|
||||
@@ -12,23 +12,23 @@ set echi_Home 26192788
|
||||
|
||||
|
||||
set eom_stepsPerX [expr -25000.0]
|
||||
set eom_cntsPerX [expr 8192.0]
|
||||
set eom_cntsPerX [expr 8192.0]
|
||||
|
||||
set ephi_stepsPerX [expr -25000.0]
|
||||
set ephi_cntsPerX [expr 8192.0]
|
||||
|
||||
set echi_stepsPerX [expr -25000.0]
|
||||
set echi_cntsPerX [expr 8192.0]
|
||||
set echi_cntsPerX [expr 8192.0]
|
||||
|
||||
|
||||
#set eom_stepsPerX [expr -25000.0]
|
||||
#set eom_cntsPerX [expr 8192.0]
|
||||
#set eom_cntsPerX [expr 8192.0]
|
||||
|
||||
#set ephi_stepsPerX [expr 12500.0]
|
||||
#set ephi_cntsPerX [expr 4096.0]
|
||||
|
||||
|
||||
#set echi_stepsPerX [expr 25000.0]
|
||||
#set echi_cntsPerX [expr -8192.0]
|
||||
#set echi_cntsPerX [expr -8192.0]
|
||||
|
||||
|
||||
Motor eom $motor_driver_type [params \
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
set sim_mode [SplitReply [plc_simulation]]
|
||||
if {$sim_mode == "false"} {
|
||||
if {$sim_mode == "false"} {
|
||||
MakeAsyncQueue plc_chan SafetyPLC 137.157.211.21 31001
|
||||
MakeSafetyPLC plc plc_chan 0
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user