- Enhanced and debugged histogram memory for AMOR
* added PROJECT both in HM and driver code * added single detector support. - Removed several bugs in the AMOR data bit. - Updated documentation
This commit is contained in:
57
amor.dic
57
amor.dic
@ -11,8 +11,9 @@
|
||||
# AMOR may have variable time binning. In order
|
||||
# to cope with that, we use NXDICT's text replacement feature and define
|
||||
# these things
|
||||
timebin = 512
|
||||
detsize = 255
|
||||
timebin=512
|
||||
detxsize=255
|
||||
detysize=255
|
||||
scanlength = 10
|
||||
#---------- NXentry level
|
||||
etitle=/entry1,NXentry/SDS title -type DFNT_CHAR -rank 1 -dim {132}
|
||||
@ -89,6 +90,8 @@ d3dist=/entry1,NXentry/reflectometer,NXinstrument/diaphragm3,NXfilter/SDS distan
|
||||
#---------------- sample table
|
||||
saname=/entry1,NXentry/sample,NXsample/SDS name \
|
||||
-type DFNT_CHAR -rank 1 -dim {132}
|
||||
baseheight=/entry1,NXentry/sample,NXsample/SDS base_height \
|
||||
-attr {units,mm}
|
||||
somheight=/entry1,NXentry/sample,NXsample/SDS omega_height \
|
||||
-attr {units,mm}
|
||||
schi=/entry1,NXentry/sample,NXsample/SDS chi \
|
||||
@ -108,13 +111,19 @@ d4t=/entry1,NXentry/reflectometer,NXinstrument/diaphragm4,NXfilter/SDS top \
|
||||
-attr {units,mm}
|
||||
d4b=/entry1,NXentry/reflectometer,NXinstrument/diaphragm4,NXfilter/SDS bottom \
|
||||
-attr {units,mm}
|
||||
d4dist=/entry1,NXentry/reflectometer,NXinstrument/diaphragm4,NXfilter/SDS distance \
|
||||
-attr {units,mm}
|
||||
d4dist=/entry1,NXentry/reflectometer,NXinstrument/diaphragm4,NXfilter/SDS \
|
||||
distance_to_sample -attr {units,mm}
|
||||
d4base =/entry1,NXentry/reflectometer,NXinstrument/diaphragm4,NXfilter/SDS \
|
||||
base_height -attr {units,mm}
|
||||
#------------ analyzer
|
||||
anname=/entry1,NXentry/reflectometer,NXinstrument/polarizer,NXfilter/SDS name \
|
||||
-type DFNT_CHAR -rank 1 -dim {132}
|
||||
anoz=/entry1,NXentry/reflectometer,NXinstrument/analyzer,NXfilter/SDS omega_height \
|
||||
-attr {units,mm}
|
||||
abase=/entry1,NXentry/reflectometer,NXinstrument/analyzer,NXfilter/SDS base_height \
|
||||
-attr {units,mm}
|
||||
adis=/entry1,NXentry/reflectometer,NXinstrument/analyzer,NXfilter/SDS \
|
||||
distance_to_sample -attr {units,mm}
|
||||
anom=/entry1,NXentry/reflectometer,NXinstrument/analyzer,NXfilter/SDS omega \
|
||||
-attr {units,degree}
|
||||
antz=/entry1,NXentry/reflectometer,NXinstrument/analyzer,NXfilter/SDS height \
|
||||
@ -130,8 +139,10 @@ d5t=/entry1,NXentry/reflectometer,NXinstrument/diaphragm5,NXfilter/SDS top \
|
||||
-attr {units,mm}
|
||||
d5b=/entry1,NXentry/reflectometer,NXinstrument/diaphragm5,NXfilter/SDS bottom \
|
||||
-attr {units,mm}
|
||||
d5dist=/entry1,NXentry/reflectometer,NXinstrument/diaphragm5,NXfilter/SDS distance \
|
||||
-attr {units,mm}
|
||||
d5dist=/entry1,NXentry/reflectometer,NXinstrument/diaphragm5,NXfilter/SDS \
|
||||
distance_to_sample -attr {units,mm}
|
||||
d5base =/entry1,NXentry/reflectometer,NXinstrument/diaphragm5,NXfilter/SDS \
|
||||
base_height -attr {units,mm}
|
||||
#---------- count control
|
||||
cnmode=/entry1,NXentry/reflectometer,NXinstrument/counter,NXmonitor/SDS count_mode \
|
||||
-type DFNT_CHAR -rank 1 -dim {30}
|
||||
@ -147,13 +158,13 @@ cnmon2=/entry1,NXentry/reflectometer,NXinstrument/counter,NXmonitor/SDS monitor2
|
||||
dettype=/entry1,NXentry/reflectometer,NXinstrument/TOF,NXdetector/SDS type \
|
||||
-type DFNT_CHAR -rank 1 -dim {132}
|
||||
dety=/entry1,NXentry/reflectometer,NXinstrument/TOF,NXdetector/SDS y_detector \
|
||||
-type DFNT_FLOAT32 -rank 1 -dim {$(detsize)} -attr {axis,1} \
|
||||
-type DFNT_FLOAT32 -rank 1 -dim {$(detysize)} -attr {axis,1} \
|
||||
-attr {units,mm}
|
||||
detxx=/entry1,NXentry/reflectometer,NXinstrument/TOF,NXdetector/SDS x_detector \
|
||||
-type DFNT_FLOAT32 -rank 1 -dim {$(detsize)} -attr {axis,2} \
|
||||
-type DFNT_FLOAT32 -rank 1 -dim {$(detxsize)} -attr {axis,2} \
|
||||
-attr {units,mm}
|
||||
detz=/entry1,NXentry/reflectometer,NXinstrument/TOF,NXdetector/SDS z \
|
||||
-type DFNT_FLOAT32 -rank 1 -dim {$(detsize)} -attr {axis,2} \
|
||||
-type DFNT_FLOAT32 -rank 1 -dim {$(detxsize)} -attr {axis,2} \
|
||||
-attr {units,mm}
|
||||
detx=/entry1,NXentry/reflectometer,NXinstrument/TOF,NXdetector/SDS x \
|
||||
-type DFNT_FLOAT32 -attr {units,mm}
|
||||
@ -161,17 +172,32 @@ detom=/entry1,NXentry/reflectometer,NXinstrument/TOF,NXdetector/SDS omega \
|
||||
-type DFNT_FLOAT32 -attr {units,degree}
|
||||
detheight=/entry1,NXentry/reflectometer,NXinstrument/TOF,NXdetector/SDS height \
|
||||
-type DFNT_FLOAT32 -attr {units,mm}
|
||||
detdist=/entry1,NXentry/reflectometer,NXinstrument/TOF,NXdetector/SDS distance \
|
||||
-type DFNT_FLOAT32 -attr {units,mm}
|
||||
detdist=/entry1,NXentry/reflectometer,NXinstrument/TOF,NXdetector/SDS \
|
||||
distance_to_sample -type DFNT_FLOAT32 -attr {units,mm}
|
||||
detbase=/entry1,NXentry/reflectometer,NXinstrument/TOF,NXdetector/SDS \
|
||||
base_height -type DFNT_FLOAT32 -attr {units,mm}
|
||||
dettime=/entry1,NXentry/reflectometer,NXinstrument/TOF,NXdetector/SDS time_binning \
|
||||
-type DFNT_FLOAT32 -rank 1 -dim {$(timebin)} -attr {axis,3} \
|
||||
-attr {units,ms}
|
||||
spinup=/entry1,NXentry/reflectometer,NXinstrument/TOF,NXdetector/SDS spinup \
|
||||
-type DFNT_INT32 -rank 3 -dim {$(detsize),$(detsize),$(timebin)} \
|
||||
-attr {signal,1}
|
||||
-type DFNT_INT32 -rank 3 -dim {$(detxsize),$(detysize),$(timebin)} \
|
||||
-LZW -attr {signal,1}
|
||||
spinup2d=/entry1,NXentry/reflectometer,NXinstrument/TOF,NXdetector/SDS spinup \
|
||||
-type DFNT_INT32 -rank 2 -dim {$(detxsize),$(detysize)} \
|
||||
-LZW -attr {signal,1}
|
||||
spindown=/entry1,NXentry/reflectometer,NXinstrument/TOF,NXdetector/SDS spindown \
|
||||
-type DFNT_INT32 -rank 3 -dim {$(detsize),$(detsize),$(timebin)} \
|
||||
-attr {signal,1}
|
||||
-type DFNT_INT32 -rank 3 -dim {$(detxsize),$(detysize),$(timebin)} \
|
||||
-LZW -attr {signal,1}
|
||||
#------------ single detectors TOF -------------------------------------
|
||||
singleup=/entry1,NXentry/reflectometer,NXinstrument/single,NXdetector/SDS \
|
||||
spinup -type DFNT_INT32 -rank 2 -dim {2, $(timebin)} -LZW \
|
||||
-attr {signal,1}
|
||||
singledown=/entry1,NXentry/reflectometer,NXinstrument/single,NXdetector/SDS \
|
||||
spinup -type DFNT_INT32 -rank 2 -dim {2, $(timebin)} -LZW \
|
||||
-attr {signal,1}
|
||||
singletime=/entry1,NXentry/reflectometer,NXinstrument/single,NXdetector/SDS \
|
||||
time_binning -type DFNT_FLOAT32 -rank 1 -dim {$(timebin)} \
|
||||
-attr {axis,2}
|
||||
#------------ detector: scan mode
|
||||
scanroot=/entry1,NXentry/reflectometer,NXinstrument/scan,NXdetector/SDS
|
||||
sdetx=/entry1,NXentry/reflectometer,NXinstrument/scan,NXdetector/SDS x \
|
||||
@ -206,5 +232,6 @@ sdetdist=/entry1,NXentry/reflectometer,NXinstrument/scan,NXdetector/SDS distance
|
||||
-type DFNT_FLOAT32 -attr {units,mm}
|
||||
#------------------- data vGroup
|
||||
dana=/entry1,NXentry/TOF,NXdata/NXVGROUP
|
||||
singledana=/entry1,NXentry/single,NXdata/NXVGROUP
|
||||
sdana=/entry1,NXentry/scan,NXdata/NXVGROUP
|
||||
|
||||
|
Reference in New Issue
Block a user