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

Updated from ics2-pelican

Browse Source
This commit is contained in:
Ferdi Franceschini
2013-11-23 19:10:51 +11:00
committed by Ferdi Franceschini
parent 4643a1fd04
commit 852bc7462b
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
site_ansto/instrument/pelican/config/hmm/hmm_configuration.tcl
View File

@@ -64,10 +64,10 @@ return {
<link_numeric_file filename="../../pelican_mesytec_gains.dat" default_filename="../HMconfig/Default//pelican_mesytec_gains.dat" /> <link_numeric_file filename="../../pelican_mesytec_gains.dat" default_filename="../HMconfig/Default//pelican_mesytec_gains.dat" />
</MESYTEC_MPSD8_CHANNEL_GAINS> </MESYTEC_MPSD8_CHANNEL_GAINS>
<MESYTEC_MPSD8_THRESHOLDS> <MESYTEC_MPSD8_THRESHOLDS>
23 23 23 20 20 20 20 20 30 30 30 30 30 30 30 30
20 20 20 20 20 20 20 20 30 30 30 30 30 30 30 30
20 20 20 20 20 20 20 20 30 30 30 30 30 30 30 30
20 20 10 10 10 10 10 10 30 20 10 10 10 10 10 10
</MESYTEC_MPSD8_THRESHOLDS> </MESYTEC_MPSD8_THRESHOLDS>
<WIX APPLY="ENABLE" MIN_RAW="0" MAX_RAW="199" TABLE_SIZE="200"> <WIX APPLY="ENABLE" MIN_RAW="0" MAX_RAW="199" TABLE_SIZE="200">
<link_numeric_file filename="../../pelican_wix.dat" default_filename="../HMconfig/Default/pelican_wix.dat" /> <link_numeric_file filename="../../pelican_wix.dat" default_filename="../HMconfig/Default/pelican_wix.dat" />
@@ -79,7 +79,7 @@ return {
<link_numeric_file filename="../../pelican_magnify.dat" default_filename="../HMconfig/Default/pelican_magnify.dat" /> <link_numeric_file filename="../../pelican_magnify.dat" default_filename="../HMconfig/Default/pelican_magnify.dat" />
</MAGNIFY> </MAGNIFY>
</CAT> </CAT>
} }
} }
proc ::histogram_memory::init_CAT_TABLE {} { proc ::histogram_memory::init_CAT_TABLE {} {
@@ -193,8 +193,8 @@ proc ::histogram_memory::isc_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::init_SAT_TABLE
::histogram_memory::init_CAT_TABLE # ::histogram_memory::init_CAT_TABLE
::histogram_memory::upload_config Filler_defaults ::histogram_memory::upload_config Filler_defaults
set ::histogram_memory::histmem_axes(HOR) /instrument/detector/x_pixel_angular_offset set ::histogram_memory::histmem_axes(HOR) /instrument/detector/x_pixel_angular_offset

7
site_ansto/instrument/pelican/config/motors/motor_configuration.tcl
View File

@@ -29,7 +29,8 @@ set sh1_Home 33414
set sv2_Home 33357369 set sv2_Home 33357369
set sh2_Home 33505668 set sh2_Home 33505668
set gom_Home 373521 set gom_Home 373521
set scor_Home 20193638 #set scor_Home 20193638
set scor_Home 21831449
# AND abs Encoder Reading with FFF to get the lowest 12 bits only # AND abs Encoder Reading with FFF to get the lowest 12 bits only
#set mra_Home 4286 #set mra_Home 4286
@@ -168,7 +169,7 @@ Motor pom $motor_driver_type [params \
axis E\ axis E\
units degrees\ units degrees\
hardlowerlim -1.5\ hardlowerlim -1.5\
hardupperlim 1.5\ hardupperlim 2.5\
maxSpeed [expr { 200000.0 / $pomStepRate }]\ maxSpeed [expr { 200000.0 / $pomStepRate }]\
maxAccel [expr { 25000.0 / $pomStepRate }]\ maxAccel [expr { 25000.0 / $pomStepRate }]\
maxDecel [expr { 25000.0 / $pomStepRate }]\ maxDecel [expr { 25000.0 / $pomStepRate }]\
@@ -403,7 +404,7 @@ scor part sample
scor long_name scor scor long_name scor
scor softlowerlim 0 scor softlowerlim 0
scor softupperlim 360 scor softupperlim 360
scor home 0 scor home 180
############################ ############################
# Motor Controller 3 # Motor Controller 3

1
site_ansto/instrument/pelican/pelican_configuration.tcl
View File

@@ -29,6 +29,7 @@ fileeval $cfPath(plc)/plc.tcl
fileeval $cfPath(counter)/counter.tcl fileeval $cfPath(counter)/counter.tcl
fileeval $cfPath(beamline)/sct_power.tcl fileeval $cfPath(beamline)/sct_power.tcl
fileeval $cfPath(environment)/temperature/sct_lakeshore_218.tcl fileeval $cfPath(environment)/temperature/sct_lakeshore_218.tcl
fileeval $cfPath(environment)/temperature/sct_lakeshore_340.tcl
fileeval $cfPath(hmm)/hmm_configuration.tcl fileeval $cfPath(hmm)/hmm_configuration.tcl
fileeval $cfPath(hmm)/sct_hv.tcl fileeval $cfPath(hmm)/sct_hv.tcl
fileeval $cfPath(nexus)/nxscripts.tcl fileeval $cfPath(nexus)/nxscripts.tcl