Merge branch 'Echidna' into temp
Conflicts: sics/site_ansto/instrument/config/environment/sct_knauer_pump.tcl sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl sics/site_ansto/instrument/config/environment/temperature/sct_west_6100.tcl sics/site_ansto/instrument/hrpd/echidna_configuration.tcl
This commit is contained in:
@@ -24,7 +24,8 @@ set my_Home 8389613
|
||||
#set mx_Home 7580366
|
||||
set mx_Home 8392083
|
||||
#set mom_Home 13442930
|
||||
set mom_Home 8218065
|
||||
#set mom_Home 8218065
|
||||
set mom_Home 8295887
|
||||
set mtth_Home 11534660
|
||||
set pcx_Home 6330515
|
||||
set pcr_Home 21650101
|
||||
|
||||
Reference in New Issue
Block a user