linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Integrated hmm with nexus data file writing.

Browse Source 
Now have hm and bm scans.

r1354 | ffr | 2006-12-08 09:12:48 +1100 (Fri, 08 Dec 2006) | 3 lines
This commit is contained in:
Ferdi Franceschini
2006-12-08 09:12:48 +11:00
committed by Douglas Clowes
parent 280d440494
commit 641ed5227e
7 changed files with 185 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
site_ansto/instrument/hrpd/hmm_configuration.tcl
View File

@@ -1,14 +1,8 @@
# $Revision: 1.1 $
# $Date: 2006-12-03 22:44:35 $
# $Revision: 1.2 $
# $Date: 2006-12-07 22:12:48 $
# Author: Mark Lesha (mle@ansto.gov.au)
# Last revision by: $Author: ffr $
# Provides simulated motors for experimenting with scan and batch commands
#START SERVER CONFIGURATION SECTION
set sicsroot ../
source echidna_configuration.tcl
#END SERVER CONFIGURATION SECTION
#-------------------------------------------------------------------------
# System: Histogram Server (sample)
#------------------------------------------------------------------------
@@ -21,7 +15,7 @@ source echidna_configuration.tcl
# remote histogram server via http, and acquisition
# of histogram period data.
MakeHM hmm anstohttp
hmm configure hmaddress http://137.157.201.12:8080
hmm configure hmaddress http://das1-echidna:8080
hmm configure username spy
hmm configure password 007
@@ -107,7 +101,7 @@ hmm init
##############################################
# Make and configure an ANSTO beam monitor counter.
MakeCounter bm anstomonitor [ params host "137.157.201.12" port "30000" ]
MakeCounter bm anstomonitor [ params host "das1-echidna" port "30000" ]
bm SetExponent 0
# Make our special HMControl_ANSTO object with the bm controlling the hmm.
@@ -126,7 +120,7 @@ MakeHMControl_ANSTO hmc bm hmm
#
# Define two scan objects which use the beam monitor counter.
#
# For scan1, the hmc object uses the bm counter to control
# For hmscan, the hmc object uses the bm counter to control
# acquisition duration. In other words, the acquisition duration
# is controlled via SICS. This is fine if the duration doesn't
# need to be controlled to an accuracy of less than one second.
@@ -160,13 +154,13 @@ MakeHMControl_ANSTO hmc bm hmm
#
# 17/11/06 NOTE: The Beam Monitor is not yet interfaced directly to the
# Histogram Server. This means that for BM-controlled acquisitions,
# SICS needs to use the BM counter (i.e. use scan1 not scan2).
# SICS needs to use the BM counter (i.e. use hmscan not scan2).
#
# EXAMPLES: For scan running over 5 stops and acquisition of 1 sec at each stop:
# scan1 run 5 timer 1 (termination controlled by the beam monitor)
# hmscan run 5 timer 1 (termination controlled by the beam monitor)
# scan2_runb 5 TIME 100 IMMEDIATE (termination controlled by the histogram server)
#
MakeScanCommand scan1 bm echidna.hdd recover.bin
MakeScanCommand hmscan bm echidna.hdd recover.bin
MakeScanCommand scan2 bm echidna.hdd recover.bin
#
# Call is: scan2_runa <n>
@@ -205,7 +199,7 @@ blockctr SetPreset 0
# Later on we can add some motors to drive...
#Motor som2 ASIM 0 100 -1.0 0.01
#scan1 add som2 0 1
#hmscan add som2 0 1
##############################################
# Support for using expanded histogram period
@@ -388,14 +382,14 @@ Publish hs_finish User
# are properly defined.
# A different count callback is defined in the two cases.
#
scan1 configure script
scan1 function prepare hs_prepare
scan1 function count hs_count_bm_controlled
scan1 function collect hs_collect
scan1 function finish hs_finish
hmscan configure script
#hmscan function prepare hs_prepare
hmscan function count hs_count_bm_controlled
hmscan function collect hs_collect
hmscan function finish hs_finish
#
scan2 configure script
scan2 function prepare hs_prepare
#scan2 function prepare hs_prepare
scan2 function count hs_count_hs_controlled
scan2 function collect hs_collect
scan2 function finish hs_finish