PSI UPDATE

r2720 | ffr | 2008-10-13 15:40:07 +1100 (Mon, 13 Oct 2008) | 2 lines

site_ansto/instrument/hipd/config/motors/motor_configuration.tcl

@@ -111,6 +111,28 @@ set move_count 10
 #:TP at HOME
 #
 
+# Dummy motor based on Monochromator phi, Tilt 1, upper
+Motor dummy_motor asim [params \
+  asyncqueue mc1\
+  axis A\
+  units degrees\
+  hardlowerlim -169\
+  hardupperlim 169\
+  maxSpeed 1\
+  maxAccel 1\
+  maxDecel 1\
+  stepsPerX -25000\
+  absEnc 1\
+  absEncHome $mphi_Home\
+  cntsPerX -8192]
+setHomeandRange -motor dummy_motor -home 0 -lowrange 169 -uprange 169
+dummy_motor speed 1
+dummy_motor movecount $move_count
+dummy_motor precision 0.01
+dummy_motor part crystal
+dummy_motor long_name dummy_motor
+
+
 # Monochromator phi, Tilt 1, upper
 Motor mphi $motor_driver_type [params \
   asyncqueue mc1\

site_ansto/instrument/hrpd/config/hmm/hmm_configuration.tcl

@@ -13,7 +13,7 @@ proc ::histogram_memory::init_OAT_TABLE {} {
     OAT_TABLE Y -setdata BMIN -0.5
     OAT_TABLE Y -setdata BMAX  511.5
 
-    OAT_TABLE -set X { 127.5 126.5 } NXC 128 Y { -0.5 3.5 } NYC 128 T { 0 100000 } NTC 1 
+    OAT_TABLE -set X { 127.5 126.5 } NXC 128 Y { -0.5 3.5 } NYC 128 T { 0 20000 } NTC 1 
   } message ] {
     if {$::errorCode=="NONE"} {return $message}
     return -code error $message

site_ansto/instrument/reflectometer/config/motors/motor_configuration.tcl

@@ -200,6 +200,31 @@ set move_count 100
 #:TP at HOME
 #
 
+# Dummy motor based on Sample Tilt 1, upper (1 degree/turn)
+Motor dummy_motor asim [params \
+  asyncqueue mc2\
+  axis A\
+  units degrees\
+  hardlowerlim -169\
+  hardupperlim 169\
+  maxSpeed 1\
+  maxAccel 1\
+  maxDecel 1\
+  stepsPerX 25000\
+  backlash_offset -0.25\
+  absEnc 1\
+  absEncHome $sth_home\
+  cntsPerX 8192]
+dummy_motor part sample
+dummy_motor long_name dummy_motor
+setHomeandRange -motor dummy_motor -home 0 -lowrange 169 -uprange 169
+dummy_motor speed 1
+dummy_motor backlash_offset -0.1
+dummy_motor creep_offset 0.05
+dummy_motor creep_precision 0.0005
+dummy_motor precision 0.001
+
+
 # Beam Shade Vertical Translation (6mm/T double helix, 500mm)
 Motor bz $motor_driver_type [params \
   asyncqueue mc1\

site_ansto/instrument/rsd/config/motors/motor_configuration.tcl

@@ -120,6 +120,28 @@ set echi_Home 8919319
 #:TP at HOME
 # :TP 7830625, 7492855, 7432174, 7894708, 28473827, 11465496, 0, 0
 
+# Dummy motor based on Monochromator phi, Tilt 1, upper
+Motor dummy_motor asim [params \
+  asyncqueue mc1\
+  axis A\
+  units degrees\
+  hardlowerlim -169\
+  hardupperlim 169\
+  maxSpeed 1\
+  maxAccel 1\
+  maxDecel 1\
+  stepsPerX 25000\
+  absEnc 1\
+  absEncHome $mphi_Home\
+  cntsPerX 8192]
+setHomeandRange -motor dummy_motor -home 0 -lowrange 169 uprange 169
+dummy_motor speed 1
+dummy_motor movecount $move_count
+dummy_motor precision 0.01
+dummy_motor part crystal
+dummy_motor long_name dummy_motor
+
+
 # Monochromator phi, Tilt 1, upper
 Motor mphi $motor_driver_type [params \
   asyncqueue mc1\

site_ansto/instrument/util/extra_utility.tcl

@@ -63,9 +63,18 @@ proc errorInfowrite {args} {
   }
 }
 
-trace add variable errorInfo write errorInfowrite
-trace add execution catch enter entercatch
-trace add execution catch leave leavecatch
+proc callStack {enable} {
+  if {$enable} {
+    set trace_opt "add"
+  } else {
+    set trace_opt "remove"
+  }
+  trace $trace_opt variable errorInfo write errorInfowrite
+  trace $trace_opt execution catch enter entercatch
+  trace $trace_opt execution catch leave leavecatch
+}
+publish callStack mugger
+callStack true
  
  
 # LIST FUNCTIONS

site_ansto/instrument/util/utility.tcl

@@ -1,7 +1,7 @@
 # Some useful functions for SICS configuration.
 
-# $Revision: 1.18 $
-# $Date: 2008-10-01 04:10:50 $
+# $Revision: 1.19 $
+# $Date: 2008-10-13 04:40:06 $
 # Author: Ferdi Franceschini (ffr@ansto.gov.au)
 # Last revision by $Author: ffr $
 
@@ -512,7 +512,7 @@ proc ::utility::hgetplainprop {hpath prop} {
 }
 proc ::utility::hlistplainprop {hpath} {
   if [ catch {
-    return [string trim [join [split [hlistprop $hpath] =] ]]
+    return [string trim [join [split [string map {" " _} [hlistprop $hpath]] =] ]]
   } message ] {
     if {$::errorCode=="NONE"} {return $message}
     return -code error $message

site_ansto/make_gen_variables

@@ -1,33 +1,30 @@
 # vim: ft=make ts=4 sw=4 noet cindent
 COBJ = Sclient.o network.o ifile.o   intcli.o $(FORTIFYOBJ)  
-SOBJ =  network.o ifile.o conman.o SCinter.o splitter.o passwd.o \
-       servlog.o sicvar.o nserver.o SICSmain.o motorlist.o\
-       sicsexit.o  costa.o task.o $(FORTIFYOBJ) access.o\
-       macro.o ofac.o obpar.o obdes.o drive.o status.o intserv.o \
-       devexec.o mumo.o mumoconf.o selector.o selvar.o fupa.o lld.o \
-       lld_blob.o  strrepl.o lin2ang.o fomerge.o \
-       script.o o2t.o  alias.o napi.o napi5.o nxdata.o stringdict.o sdynar.o \
-       histmem.o histdriv.o histsim.o  interface.o callback.o nxio.o \
-        event.o emon.o evcontroller.o evdriver.o simev.o perfmon.o \
-       danu.o  nxdict.o varlog.o stptok.o nread.o nwatch.o trigd.o cell.o\
-       scan.o fitcenter.o telnet.o token.o  wwildcard.o hklmot.o\
-       tclev.o hkl.o integrate.o optimise.o dynstring.o nxutil.o \
-       mesure.o uubuffer.o  commandlog.o udpquieck.o fourtable.o\
-       rmtrail.o  help.o nxupdate.o confvirtualmot.o vector.o\
-       simchop.o choco.o chadapter.o  trim.o scaldate.o tasub.o\
-       hklscan.o xytable.o   exebuf.o exeman.o ubfour.o ubcalc.o\
-       circular.o  maximize.o sicscron.o  scanvar.o tasublib.o\
-       d_sign.o d_mod.o tcldrivable.o stdscan.o diffscan.o nxxml.o\
-       synchronize.o definealias.o  oscillate.o tasdrive.o \
-       hmcontrol.o userscan.o  rs232controller.o lomax.o tasscanub.o \
-       fourlib.o motreg.o motreglist.o anticollider.o nxdataset.o \
-       s_rnge.o sig_die.o gpibcontroller.o $(NIOBJ) mcreader.o mccontrol.o\
-       hmdata.o  nxscript.o  tclintimpl.o sicsdata.o mcstascounter.o \
-       mcstashm.o initializer.o remob.o tclmotdriv.o protocol.o \
-       sinfox.o sicslist.o cone.o hipadaba.o sicshipadaba.o statistics.o \
-       moregress.o hdbcommand.o multicounter.o regresscter.o histregress.o \
-       sicshdbadapter.o polldriv.o sicspoll.o statemon.o \
-       asyncqueue.o asyncprotocol.o
+SOBJ = access.o alias.o anticollider.o ascon.o asyncprotocol.o asyncqueue.o callback.o \
+       cell.o chadapter.o choco.o circular.o commandlog.o cone.o confvirtualmot.o \
+       conman.o costa.o danu.o definealias.o devexec.o devser.o diffscan.o d_mod.o \
+       drive.o d_sign.o dynstring.o emon.o errormsg.o evcontroller.o evdriver.o \
+       event.o exebuf.o exeman.o fitcenter.o fomerge.o $(FORTIFYOBJ) fourlib.o \
+       fourtable.o fupa.o genericcontroller.o gpibcontroller.o help.o hipadaba.o \
+       histdriv.o histmem.o histregress.o histsim.o hklmot.o hkl.o hklscan.o \
+       hmcontrol.o hmdata.o hmslave.o ifile.o initializer.o integrate.o interface.o \
+       intserv.o lin2ang.o lld_blob.o lld.o logger.o logreader.o logsetup.o lomax.o \
+       macro.o maximize.o mccontrol.o mcreader.o mcstascounter.o mcstashm.o mesure.o \
+       moregress.o motorlist.o motreglist.o motreg.o multicounter.o mumoconf.o mumo.o \
+       napi5.o napi.o network.o $(NIOBJ) nread.o nserver.o nwatch.o nxcopy.o nxdata.o \
+       nxdataset.o nxdict.o nxinterhelper.o nxinter_wrap.o nxio.o nxscript.o nxstack.o \
+       nxupdate.o nxutil.o nxxml.o o2t.o obdes.o obpar.o ofac.o optimise.o oscillate.o \
+       passwd.o perfmon.o polldriv.o protocol.o proxy.o regresscter.o remob.o \
+       rmtrail.o rs232controller.o savehdb.o scaldate.o scan.o scanvar.o SCinter.o \
+       scriptcontext.o script.o sctdriveadapter.o sctdriveobj.o sdynar.o selector.o \
+       selvar.o servlog.o sicscron.o sicsdata.o sicsexit.o sicshdbadapter.o \
+       sicshdbfactory.o sicshipadaba.o sicslist.o SICSmain.o sicsobj.o sicspoll.o \
+       sicvar.o sig_die.o simchop.o simev.o sinfox.o splitter.o s_rnge.o statemon.o \
+       statistics.o statusfile.o status.o stdscan.o stptok.o stringdict.o strrepl.o \
+       synchronize.o tasdrive.o task.o tasscanub.o tasublib.o tasub.o tcldrivable.o \
+       tclev.o tclintimpl.o tclmotdriv.o telnet.o token.o trigd.o trim.o ubcalc.o \
+       ubfour.o udpquieck.o userscan.o uubuffer.o varlog.o vector.o wwildcard.o \
+       xytable.o
 
 # These are intermediate files generated from .tc files, marking
 # them as SECONDARY prevents make from removing them.

site_ansto/motor_asim.c

@@ -664,6 +664,17 @@ int SimAction(SConnection *pCon, SicsInterp *pSics, void *pData,
     else if(strcasecmp("reset", argv[1]) == 0) { }
     else if(strcasecmp("state", argv[1]) == 0) { }
     else if(strcasecmp("trace", argv[1]) == 0) { }
+    else if(strcasecmp("thread0", argv[1]) == 0) {
+      char line[132];
+      snprintf(line, 132, "%s.thread0 = %d", argv[0], 1);
+      SCWrite(pCon, line, eStatus);
+      return 1;
+    } else if(strcasecmp("posit", argv[1]) == 0) {
+      char line[132];
+      snprintf(line, 132, "%s.posit = %f", argv[0], 1.0);
+      SCWrite(pCon, line, eStatus);
+      return 1;
+    }
   }
   return MotorAction(pCon, pSics, pData, argc, argv);
 }

site_ansto/site_ansto.c

@@ -20,6 +20,7 @@
 #include <site.h>
 #include <SCinter.h>
 
+#include "protocol.h"
 /* site-specific driver header files */
 #include "motor_dmc2280.h"
 #include "motor_asim.h"
@@ -73,6 +74,7 @@ static void AddCommands(SicsInterp *pInter)
   NHQ200InitProtocol(pInter);
   ORHVPSInitProtocol(pInter);
   LS340InitProtocol(pInter);
+  AddCommand(pInter,"InstallProtocolHandler", InstallProtocol,NULL,NULL);
   AddCommand(pInter,"MakeTCPSelector",VelSelTcpFactory,NULL,NULL);
   AddCommand(pInter,"portnum",portNumCmd,NULL,NULL);
   AddCommand(pInter,"abortbatch",AbortBatch,NULL,NULL);