From 8d2488b9dec7e4cc98ef52637370ef218caedff9 Mon Sep 17 00:00:00 2001 From: Ferdi Franceschini Date: Tue, 20 Feb 2007 16:15:49 +1100 Subject: [PATCH] Use generic name for scan header. r1532 | ffr | 2007-02-20 16:15:49 +1100 (Tue, 20 Feb 2007) | 2 lines --- .../instrument/hipd/config/scan/{wombat.hdd => scan.hdd} | 0 site_ansto/instrument/hipd/config/scan/scan.tcl | 6 +++--- .../hipd/script_validator/config/hmm/hmm_configuration.tcl | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename site_ansto/instrument/hipd/config/scan/{wombat.hdd => scan.hdd} (100%) diff --git a/site_ansto/instrument/hipd/config/scan/wombat.hdd b/site_ansto/instrument/hipd/config/scan/scan.hdd similarity index 100% rename from site_ansto/instrument/hipd/config/scan/wombat.hdd rename to site_ansto/instrument/hipd/config/scan/scan.hdd diff --git a/site_ansto/instrument/hipd/config/scan/scan.tcl b/site_ansto/instrument/hipd/config/scan/scan.tcl index 8e49190c..e787cb6f 100644 --- a/site_ansto/instrument/hipd/config/scan/scan.tcl +++ b/site_ansto/instrument/hipd/config/scan/scan.tcl @@ -1,5 +1,5 @@ namespace eval scanCommand { -#MakeScanCommand escan counter echidna.hdd recover.bin + variable scanVariable scan_var scanVarStart 0 scanVarStep 1 proc scan_prepare {sobj uobj} { variable scanVarStart; @@ -107,7 +107,7 @@ proc hdb_hmscan {scanvar scanstart scanincr np mode preset} { hmscan clear hmscan configure script - hmscan add $scanvar scanstart scanincr + hmscan add $scanvar $scanstart $scanincr set status [catch {hmscan run $np $mode $preset} msg] hmscan configure soft if {$status == 0} { @@ -119,7 +119,7 @@ proc hdb_hmscan {scanvar scanstart scanincr np mode preset} { publish hdb_hmscan user -MakeScanCommand bmonscan bm $cfPath(scan)/echidna.hdd recover.bin +MakeScanCommand bmonscan bm $cfPath(scan)/scan.hdd recover.bin bmonscan configure script bmonscan function writeheader ::scanCommand::donothing bmonscan function writepoint ::scanCommand::bm_nxaddpoint diff --git a/site_ansto/instrument/hipd/script_validator/config/hmm/hmm_configuration.tcl b/site_ansto/instrument/hipd/script_validator/config/hmm/hmm_configuration.tcl index 717141c7..c7283dcc 100644 --- a/site_ansto/instrument/hipd/script_validator/config/hmm/hmm_configuration.tcl +++ b/site_ansto/instrument/hipd/script_validator/config/hmm/hmm_configuration.tcl @@ -14,7 +14,7 @@ hmm configure Counter counter hmm configure init 0 hmm init -MakeScanCommand hmscan bm echidna.hdd recover.bin +MakeScanCommand hmscan bm scan.hdd recover.bin proc hs_prepare {scanobjectname userobjectname} {} proc hs_finish {scanobjectname userobjectname} {}