From 3d5d94c1ddbb5b04b64096350f74b36232209f6b Mon Sep 17 00:00:00 2001
From: Ferdi Franceschini <ffr@ansto.gov.au>
Date: Fri, 28 May 2010 11:36:25 +1000
Subject: [PATCH] sct_rfamp.c SICS-405 Protocol handler always reports "SET"
 failed. Implemented workaround so that it always succeeds until we have a
 proper fix.

server_config.tcl
Set opal_simulation=true until we implement the new LSS feedback

r2940 | ffr | 2010-05-28 11:36:25 +1000 (Fri, 28 May 2010) | 6 lines
---
 site_ansto/hardsup/sct_rfamp.c                                | 4 ++++
 .../config/hipadaba/common_instrument_dictionary.tcl          | 2 +-
 .../instrument/hipd/config/motors/motor_configuration.tcl     | 1 +
 site_ansto/instrument/hipd/wombat_configuration.tcl           | 3 ++-
 site_ansto/instrument/server_config.tcl                       | 2 +-
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/site_ansto/hardsup/sct_rfamp.c b/site_ansto/hardsup/sct_rfamp.c
index 37dfda64..8b454fdc 100644
--- a/site_ansto/hardsup/sct_rfamp.c
+++ b/site_ansto/hardsup/sct_rfamp.c
@@ -227,6 +227,7 @@ int RFAmpReading (Ascon *a)
             strncpy(tmpFreq, &data->rfCmd[5], 3);
             tmpSwitchs = (unsigned char)data->rfCmd[8];
 
+/* TODO SICS-405 ffr Removed check because the read values don't immediately match the set values
             if( (abs(atoi(curr) - atoi(tmpCurr)) > data->currTol)  ||
                 (atoi(freq) != atoi(tmpFreq))  ||
                 ((switches & 0x0F) != (tmpSwitchs & 0x0F)) ) {
@@ -236,6 +237,9 @@ int RFAmpReading (Ascon *a)
             } else {
               DynStringReplace(a->rdBuffer, "OK", 0); 
             }
+            */
+/* ffr Just report OK until we have a proper fix  */
+DynStringReplace(a->rdBuffer, "OK", 0); 
 
             a->state = AsconReadDone;
             data->transactInProg = txNormalRead;
diff --git a/site_ansto/instrument/config/hipadaba/common_instrument_dictionary.tcl b/site_ansto/instrument/config/hipadaba/common_instrument_dictionary.tcl
index b5de6feb..96b8439c 100644
--- a/site_ansto/instrument/config/hipadaba/common_instrument_dictionary.tcl
+++ b/site_ansto/instrument/config/hipadaba/common_instrument_dictionary.tcl
@@ -27,7 +27,7 @@ set instrument_dictionary [subst {
     property {data true control true nxsave false klass @none type graphset}
   }
   instrument {
-    sobj {@any instrument @any NXvelocity_selector @any NXaperture @any NXdetector}
+    sobj {@any instrument @any NXvelocity_selector @any NXaperture @any NXcollimator @any NXdetector}
     privilege spy
     datatype @none
     property {data true control true nxsave false klass NXinstrument type instrument}
diff --git a/site_ansto/instrument/hipd/config/motors/motor_configuration.tcl b/site_ansto/instrument/hipd/config/motors/motor_configuration.tcl
index 020c5ab2..b6822502 100644
--- a/site_ansto/instrument/hipd/config/motors/motor_configuration.tcl
+++ b/site_ansto/instrument/hipd/config/motors/motor_configuration.tcl
@@ -29,6 +29,7 @@ if {$sim_mode == "true"} {
   MakeAsyncQueue mc2 DMC2280 $dmc2280_controller2(host) $dmc2280_controller2(port)
   MakeAsyncQueue mc3 DMC2280 $dmc2280_controller3(host) $dmc2280_controller3(port)
   MakeAsyncQueue mc4 DMC2280 $dmc2280_controller4(host) $dmc2280_controller4(port)
+  makesctcontroller sct_mc2 galil mc2-wombat:[portnum pmc2-wombat]
 }
 
 #Measured absolute encoder reading at home position
diff --git a/site_ansto/instrument/hipd/wombat_configuration.tcl b/site_ansto/instrument/hipd/wombat_configuration.tcl
index 173884f7..aaf3ed56 100644
--- a/site_ansto/instrument/hipd/wombat_configuration.tcl
+++ b/site_ansto/instrument/hipd/wombat_configuration.tcl
@@ -15,11 +15,12 @@ source server_config.tcl
 ########################################
 # INSTRUMENT SPECIFIC CONFIGURATION
 
+source $cfPath(hipadaba)/hipadaba_configuration.tcl
 fileeval $cfPath(motors)/motor_configuration.tcl
+fileeval $cfPath(motors)/sct_oscmotor.tcl
 source instrument_vars.tcl
 
 fileeval $cfPath(source)/source.tcl
-source $cfPath(hipadaba)/hipadaba_configuration.tcl
 fileeval $cfPath(motors)/positmotor_configuration.tcl
 fileeval $cfPath(plc)/plc.tcl
 fileeval $cfPath(counter)/counter.tcl
diff --git a/site_ansto/instrument/server_config.tcl b/site_ansto/instrument/server_config.tcl
index e34a282d..813c19e0 100644
--- a/site_ansto/instrument/server_config.tcl
+++ b/site_ansto/instrument/server_config.tcl
@@ -4,7 +4,7 @@
 
 #set sicsroot /usr/local/sics
 VarMake opal_simulation Text internal
-opal_simulation false
+opal_simulation true
 
 VarMake detector_simulation Text internal
 detector_simulation false