Implemented changes requested in

pvh email: RFS Echidna data file structure (09/01/07)

r1397 | ffr | 2007-01-12 11:46:57 +1100 (Fri, 12 Jan 2007) | 3 lines
This commit is contained in:
Ferdi Franceschini
2007-01-12 11:46:57 +11:00
committed by Douglas Clowes
parent 16d48adb16
commit f3ece2769d
4 changed files with 11 additions and 12 deletions

View File

@@ -1,6 +1,5 @@
##NXDICT-1.0
#----------------------------------------------------------------------------
# NeXus dictionary file for the SINQ instrument DMC and HRPT
#
# DO NOT EDIT WHEN YOU DO NOT KNOW WHAT YOU ARE DOING!
# This file determines the placement of data items in the Powder NeXus
@@ -10,8 +9,8 @@
#----------------------------------------------------------------------------
entryName=entry1
dataName=histogram
inst=HRPD
detector=hrdetector
inst=instrument
detector=detector
monochromator=monochromator
thetadim=128
scan_variable=scanvar

View File

@@ -1,5 +1,5 @@
# $Revision: 1.10 $
# $Date: 2007-01-09 22:15:02 $
# $Revision: 1.11 $
# $Date: 2007-01-12 00:46:57 $
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
# Last revision by: $Author: ffr $
@@ -25,11 +25,11 @@ VarMake sics_mono_crystal Text User
fileeval motor_configuration.tcl
proc nxcreatefile {{type nx5}} {
proc nxcreatefile {{type nx.hdf}} {
global dataFileName nxFileOpen;
SicsDataPostFix .$type;
array set nxmode [list h5 create5 nx5 create5 xml createxml];
array set nxmode [list nx.hdf create5 h5 create5 nx5 create5 xml createxml];
set dataFileName [nxscript makefilename]
nxscript $nxmode($type) $dataFileName echidna.dic;
set nxFileOpen true

View File

@@ -1,5 +1,5 @@
# $Revision: 1.2 $
# $Date: 2006-12-07 22:12:48 $
# $Revision: 1.3 $
# $Date: 2007-01-12 00:46:57 $
# Author: Mark Lesha (mle@ansto.gov.au)
# Last revision by: $Author: ffr $
@@ -89,8 +89,8 @@ proc hmmdictitemval {histomem dictitem} {
hmm configure histmode transparent
hmm configure bank 0
hmm configure rank 3
hmm configure dim0 [hmmdictitemval hmm oat_nxc_eff]
hmm configure dim1 [hmmdictitemval hmm oat_nyc_eff]
hmm configure dim0 [hmmdictitemval hmm oat_nyc_eff]
hmm configure dim1 [hmmdictitemval hmm oat_nxc_eff]
hmm configure dim2 [hmmdictitemval hmm oat_ntc_eff]
hmm init

View File

@@ -44,7 +44,7 @@ variable scanVariable scan_var scanVarStart 0 scanVarStep 1
variable scanVariable;
set scanVarPos [expr $scanVarStart + $pt * $scanVarStep];
nxreopenfile;
addnxentry nxscript scan_$pt $scanVariable $scanVarPos $scanVarStep;
addnxentry nxscript scan_[format "%05d" $pt] $scanVariable $scanVarPos $scanVarStep;
nxclosefile
}