- Updated the managers documentation a little

- The  crystal settings calculation in hkl now tried to put omega into
  the limts by calculating a delta omega.
- TRICS data files now include HKL and the UB
- The scan module has been expanded to support user defined scans which
  run a script at any scan point.
- A small fix to the PSD code in SinqHM_srv_filler
This commit is contained in:
cvs
2001-07-20 08:05:25 +00:00
parent 8f84d45dd6
commit 0fac95ea9b
25 changed files with 741 additions and 522 deletions

View File

@ -15,21 +15,21 @@
fnum = /frame0000,NXentry/SDS CurrentFrameNumber -type DFNT_INT32
framename = frame0000
#------ NXentry
etitle = /$(framename),NXentry/SDS title -type DFNT_UINT8 -rank 1 -dim {132}
etitle0 = /frame0000,NXentry/SDS title -type DFNT_UINT8 -rank 1 -dim {132}
etime = /$(framename),NXentry/SDS start_time -type DFNT_UINT8 -rank 1 -dim {132}
etitle = /$(framename),NXentry/SDS title -type DFNT_CHAR -rank 1 -dim {132}
etitle0 = /frame0000,NXentry/SDS title -type DFNT_CHAR -rank 1 -dim {132}
etime = /$(framename),NXentry/SDS start_time -type DFNT_CHAR -rank 1 -dim {132}
entry = /$(framename),NXentry/NXVGROUP
#--------------NXinstrument
iname = /$(framename),NXentry/TRICS,NXinstrument/SDS name -type DFNT_UINT8 \
iname = /$(framename),NXentry/TRICS,NXinstrument/SDS name -type DFNT_CHAR \
-rank 1 -dim {132}
iname0 = /frame0000,NXentry/TRICS,NXinstrument/SDS name -type DFNT_UINT8 \
iname0 = /frame0000,NXentry/TRICS,NXinstrument/SDS name -type DFNT_CHAR \
-rank 1 -dim {132}
inst0 = /$(framename),NXentry/TRICS,NXinstrument/NXVGROUP
#------------------------NXSource
sname = /$(framename),NXentry/TRICS,NXinstrument/SINQ,NXsource/SDS name \
-type DFNT_UINT8 -rank 1 -dim {20}
-type DFNT_CHAR -rank 1 -dim {20}
stype = /$(framename),NXentry/TRICS,NXinstrument/SINQ,NXsource/SDS type \
-type DFNT_UINT8 -rank 1 -dim {60}
-type DFNT_CHAR -rank 1 -dim {60}
source0 = /frame0000,NXentry/TRICS,NXinstrument/SINQ,NXsource/NXVGROUP
#------------------------Monochromator
monodes = /frame0000,NXentry/TRICS,NXinstrument/monochromator,NXcrystal/SDS \
@ -56,7 +56,7 @@ dnumber = detector1
framedim1 = 256
framedim2 = 256
ddescription = /frame0000,NXentry/TRICS,NXinstrument/$(dnumber),NXdetector/SDS \
name -type DFNT_UINT8 -rank 1 -dim {132}
name -type DFNT_CHAR -rank 1 -dim {132}
detectorx = /frame0000,NXentry/TRICS,NXinstrument/$(dnumber),NXdetector/SDS x \
-attr {axis,1} -attr {units,mm} -type DFNT_FLOAT32 \
-rank 1 -dim {$(framedim1)}
@ -72,7 +72,7 @@ frametilt = /$(framename),NXentry/TRICS,NXinstrument/$(dnumber),NXdetector/SDS
-attr {units,degrees}
framecounts = /$(framename),NXentry/TRICS,NXinstrument/$(dnumber),NXdetector/SDS counts \
-attr {signal,1} -attr {units,counts} -type DFNT_INT32 \
-rank 2 -dim {$(framedim1),$(framedim2)}
-LZW -rank 2 -dim {$(framedim1),$(framedim2)}
detzerox = \
/frame0000,NXentry/TRICS,NXinstrument/$(dnumber),NXdetector/SDS x_zero_point \
-attr {units,pixel}
@ -86,10 +86,12 @@ detvalid = \
/$(framename),NXentry/TRICS,NXinstrument/$(dnumber),NXdetector/SDS valid \
-type DFNT_INT32
#-------------- NXsample
samplename = /frame0000,NXentry/sample,NXsample/SDS name -type DFNT_UINT8 -rank 1 \
samplename = /frame0000,NXentry/sample,NXsample/SDS name -type DFNT_CHAR -rank 1 \
-dim {256}
sampleub = /frame0000,NXentry/sample/NXsample/SDS UB -type DFNT_FLOAT32 \
sampleub = /frame0000,NXentry/sample,NXsample/SDS UB -type DFNT_FLOAT32 \
-rank 2 -dim {3,3}
samplehkl = /frame0000,NXentry/sample,NXsample/SDS HKL -type DFNT_FLOAT32 \
-rank 1 -dim {3}
samplev = /$(framename),NXentry/sample,NXsample/NXVGROUP
framechi = /$(framename),NXentry/sample,NXsample/SDS chi -attr {units,degrees}
framephi = /$(framename),NXentry/sample,NXsample/SDS phi -attr {units,degrees}