From 81343c4e5e73705eb41e0c2aee1ba588fc354f32 Mon Sep 17 00:00:00 2001
From: Ferdi Franceschini <ffr@ansto.gov.au>
Date: Sat, 3 Mar 2007 09:19:52 +1100
Subject: [PATCH] Added user group, detector angular coverage, vertical axis
 and polar angle (currently filled with zeros because I recently broke it)

r1577 | ffr | 2007-03-03 09:19:52 +1100 (Sat, 03 Mar 2007) | 2 lines
---
 .../instrument/hipd/wombat_configuration.tcl  | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/site_ansto/instrument/hipd/wombat_configuration.tcl b/site_ansto/instrument/hipd/wombat_configuration.tcl
index bef31eb4..2394d253 100644
--- a/site_ansto/instrument/hipd/wombat_configuration.tcl
+++ b/site_ansto/instrument/hipd/wombat_configuration.tcl
@@ -1,11 +1,11 @@
-# $Revision: 1.8 $
-# $Date: 2007-02-22 22:20:25 $
+# $Revision: 1.9 $
+# $Date: 2007-03-02 22:19:52 $
 # Author: Ferdi Franceschini (ffr@ansto.gov.au)
 # Last revision by: $Author: ffr $
 
 # Required by server_config.tcl 
 VarMake Instrument Text Internal 
-Instrument Wombat 
+Instrument wombat 
 Instrument lock
 
 #START SERVER CONFIGURATION SECTION
@@ -16,8 +16,6 @@ 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
@@ -26,25 +24,36 @@ fileeval $cfPath(motors)/motor_configuration.tcl
 source $cfPath(hipadaba)/hipadaba_configuration.tcl
 source gumxml.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 700
+detector_radius_mm 700.0
 VarMake detector_angle_deg Float User
-detector_angle_deg 120
+detector_angle_deg 120.0
 VarMake deg_per_rad Float Internal
 deg_per_rad 57.29577951308232
 deg_per_rad lock
 VarMake detector_angle_rad Float User
 detector_angle_rad [expr [SplitReply [detector_angle_deg]]/[SplitReply [deg_per_rad]] ]
 VarMake detector_active_height_mm Float User
-detector_active_height_mm 200
+detector_active_height_mm 200.0
+
+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 2000
+detector_zero_xpixel 127
 VarMake detector_zero_ypixel Float User
 detector_zero_ypixel 255.5
+
+fileeval extraconfig.tcl