From e18b4fb22d02593946c24c01147d7b923ce9903e Mon Sep 17 00:00:00 2001 From: koennecke Date: Thu, 8 May 2008 09:28:16 +0000 Subject: [PATCH] - Updated vdmc to work with the new Hipadaba structure --- mcstas/dmc/DataNumber | 2 +- mcstas/dmc/vdmc.tcl | 7 +++++++ mcstas/dmc/vdmcstatus.tcl | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/mcstas/dmc/DataNumber b/mcstas/dmc/DataNumber index 6a90ab30..b4495070 100644 --- a/mcstas/dmc/DataNumber +++ b/mcstas/dmc/DataNumber @@ -1,3 +1,3 @@ - 227 + 230 NEVER, EVER modify or delete this file You'll risk eternal damnation and a reincarnation as a cockroach!|n \ No newline at end of file diff --git a/mcstas/dmc/vdmc.tcl b/mcstas/dmc/vdmc.tcl index 56fb7f62..2d7b9049 100644 --- a/mcstas/dmc/vdmc.tcl +++ b/mcstas/dmc/vdmc.tcl @@ -287,9 +287,15 @@ hset /instrument/commands/scan/scan_increments .3 hset /instrument/commands/scan/NP 25 hset /instrument/commands/scan/preset 2 +hcommand /instrument/commands/wait wait +hsetprop /instrument/commands/wait type command +hsetprop /instrument/commands/wait priv user +hmake /instrument/commands/wait/time user int + #---------------- graphics hmake /graphics spy none hmake /graphics/powder_diagram spy none +hattach /graphics/powder_diagram title title hsetprop /graphics/powder_diagram type graphdata hsetprop /graphics/powder_diagram viewer default hmake /graphics/powder_diagram/rank internal int @@ -336,6 +342,7 @@ hmake /graphics/samenv/dim user intar 1 hset /graphics/samenv/dim 300 hmake /graphics/samenv/getdata user text hsetprop /graphics/samenv/getdata type logcommand +hsetprop /graphics/samenv/getdata datacom true hmake /graphics/samenv/getdata/starttime spy text hmake /graphics/samenv/getdata/endtime spy text diff --git a/mcstas/dmc/vdmcstatus.tcl b/mcstas/dmc/vdmcstatus.tcl index e79da773..1b9a1bb9 100644 --- a/mcstas/dmc/vdmcstatus.tcl +++ b/mcstas/dmc/vdmcstatus.tcl @@ -257,7 +257,7 @@ comment2 UNKNOWN comment2 setAccess 2 comment3 UNKNOWN comment3 setAccess 2 -starttime 2008-03-07 15:24:52 +starttime 2008-03-18 13:09:23 starttime setAccess 2 adress 2223 Luketown, 33 Luke Drive adress setAccess 2 @@ -269,7 +269,7 @@ email Luke@luke.ch email setAccess 2 sample_mur 0.000000 sample_mur setAccess 2 -lastdatafile /afs/psi.ch/user/k/koennecke/src/workspace/sics/mcstas/dmc/000/vdmc2008n000226.xml +lastdatafile /afs/psi.ch/user/k/koennecke/src/workspace/sics/mcstas/dmc/000/vdmc2008n000230.xml lastdatafile setAccess 2 lastscancommand unknown scan lastscancommand setAccess 2