diff --git a/site_ansto/instrument/hrpd/echidna_configuration.tcl b/site_ansto/instrument/hrpd/echidna_configuration.tcl index f6fa4df4..5f897e26 100644 --- a/site_ansto/instrument/hrpd/echidna_configuration.tcl +++ b/site_ansto/instrument/hrpd/echidna_configuration.tcl @@ -1,11 +1,11 @@ -# $Revision: 1.16 $ -# $Date: 2007-02-22 05:10:20 $ +# $Revision: 1.17 $ +# $Date: 2007-03-02 21:50:28 $ # Author: Ferdi Franceschini (ffr@ansto.gov.au) # Last revision by: $Author: ffr $ # Required by server_config.tcl VarMake Instrument Text Internal -Instrument Echidna +Instrument echidna Instrument lock #START SERVER CONFIGURATION SECTION @@ -16,8 +16,7 @@ source server_config.tcl ######################################## # INSTRUMENT SPECIFIC CONFIGURATION -VarMake sics_bm_distance Float User -VarMake sics_mono_crystal Text User + fileeval $cfPath(motors)/motor_configuration.tcl @@ -25,12 +24,11 @@ fileeval $cfPath(motors)/motor_configuration.tcl source $cfPath(hipadaba)/hipadaba_configuration.tcl source gumxml.tcl -#source counter.tcl +fileeval $cfPath(counter)/counter.tcl fileeval $cfPath(hmm)/hmm_configuration.tcl fileeval $cfPath(nexus)/nxscripts.tcl fileeval $cfPath(scan)/scan.tcl MakeStateMon hmscan -fileeval extraconfig.tcl VarMake detector_radius_mm Int User detector_radius_mm 1250 @@ -44,7 +42,18 @@ detector_angle_rad [expr [SplitReply [detector_angle_deg]]/[SplitReply [deg_per_ VarMake detector_active_height_mm Float User detector_active_height_mm 335 +VarMake detector_xpixel_zero_offset Float User +detector_xpixel_zero_offset 0.0 +VarMake detector_ypixel_zero_offset Float User +detector_ypixel_zero_offset 0.0 +VarMake crystal_type Text User +VarMake crystal_wavelength_A Float User + +VarMake bmon_distance Float User + VarMake detector_zero_xpixel Float User detector_zero_xpixel 127 VarMake detector_zero_ypixel Float User detector_zero_ypixel 255.5 + +fileeval extraconfig.tcl