Prototype file writing support and extending hipadaba to counters and histmem.

r1328 | ffr | 2006-11-30 08:28:47 +1100 (Thu, 30 Nov 2006) | 2 lines

site_ansto/instrument/hrpd/MANIFEST.TXT

@@ -6,4 +6,4 @@ hipadaba_configuration.tcl
 hpaths.tcl
 sim_configuration.tcl
 extraconfig.tcl
-InstXML.tcl
+InstXML.xml

site_ansto/instrument/hrpd/echidna.dic

@@ -21,8 +21,6 @@ eend=/$(entryName),NXentry/SDS end_time -type NX_CHAR
 iname=/$(entryName),NXentry/$(inst),NXinstrument/SDS name -type NX_CHAR \
       -rank 1 -dim {132}
 
-#----------------- NXdata
-dname=/$(entryName),NXentry/$(dataName),NXdata/SDS name -type NX_CHAR \
 
 #----------------- NXmonitor
 mmode=/$(entryName),NXentry/monitor,NXmonitor/SDS mode -type NX_CHAR 
@@ -37,19 +35,6 @@ sprobe=/$(entryName),NXentry/$(inst),NXinstrument/source,NXsource/SDS probe -typ
 #----------------- NXcrystal
 clambda=/$(entryName),NXentry/$(inst),NXinstrument/Ge113,NXcrystal/SDS wavelength -type NX_FLOAT32 -attr {units,Angstrom}
 #------------- counter
-cter_mode=/$(entryName),NXentry/$(inst),NXinstrument/$(detector),NXdetector/SDS \
-	CounterMode -type NX_CHAR -rank 1 -dim {30}
-cter_preset=/$(entryName),NXentry/$(inst),NXinstrument/$(detector),NXdetector/SDS \
-	Preset 
-cter_time=/$(entryName),NXentry/$(inst),NXinstrument/$(detector),NXdetector/SDS \
-	time
-
-cter_01=/$(entryName),NXentry/$(inst),NXinstrument/$(detector),NXdetector/SDS \
-	Monitor -type NX_INT32 -attr {units,counts}
-cter_00=/$(entryName),NXentry/$(inst),NXinstrument/$(detector),NXdetector/SDS \
-	beam_monitor -type NX_INT32 -attr {units,counts}
-cter_04=/$(entryName),NXentry/$(inst),NXinstrument/$(detector),NXdetector/SDS \
-	proton_monitor -type NX_INT32 -attr {units,counts}
 #-------------- histogram data 
 dradius=/$(entryName),NXentry/$(inst),NXinstrument/$(detector),NXdetector/SDS distance -type NX_FLOAT32  
 dtheta=/$(entryName),NXentry/$(inst),NXinstrument/$(detector),NXdetector/SDS polar_angle -type NX_FLOAT32  -LZW -rank 1 -dim {$(thetadim)} -attr {units,degree}
@@ -65,23 +50,9 @@ ddesc=/$(entryName),NXentry/$(inst),NXinstrument/$(detector),NXdetector/SDS  des
 dtype=/$(entryName),NXentry/$(inst),NXinstrument/$(detector),NXdetector/SDS  type -type NX_CHAR
 
 dlayout=/$(entryName),NXentry/$(inst),NXinstrument/$(detector),NXdetector/SDS  layout -type NX_CHAR
-#dthst=/$(entryName),NXentry/$(inst),NXinstrument/$(detector),NXdetector/SDS \
-#	two_theta_start -attr {units,degree}
-#dtstep=/$(entryName),NXentry/$(inst),NXinstrument/$(detector),NXdetector/SDS \
-#	Step -attr {units,degree}
-#dtnstep=/$(entryName),NXentry/$(inst),NXinstrument/$(detector),NXdetector/SDS \
-#	no_of_steps -type NX_INT32
 #--------------- NXsample
 saname=/$(entryName),NXentry/sample,NXsample/SDS name -type NX_CHAR 
 sarot=/$(entryName),NXentry/sample,NXsample/SDS rotation_angle  -type NX_FLOAT32 -attr {units,degree}
-stemp=/$(entryName),NXentry/sample,NXsample/SDS sample_temperature -attr {units,K}
-smean=/$(entryName),NXentry/sample,NXsample/SDS temperature_mean -attr {units,K}
-stddev=/$(entryName),NXentry/sample,NXsample/SDS temperature_stddev -attr {units,K}
-mfield=/$(entryName),NXentry/sample,NXsample/SDS magfield -attr {units,T}
-saangle=/$(entryName),NXentry/sample,NXsample/SDS sample_table_rotation \
-	-attr {units,degree}
-smur=/$(entryName),NXentry/sample,NXsample/SDS sample_mur \
-	-attr {units,degree}
 #----------------NXdata ------------------------------------------------
 dana=/$(entryName),NXentry/data,NXdata/NXVGROUP
 

site_ansto/instrument/hrpd/echidna_configuration.tcl

@@ -1,7 +1,7 @@
-# $Revision: 1.6 $
+# $Revision: 1.7 $
-# $Date: 2006-11-13 22:40:28 $
+# $Date: 2006-11-29 21:28:47 $
 # Author: Ferdi Franceschini (ffr@ansto.gov.au)
-# Last revision by: $Author: dcl $
+# Last revision by: $Author: ffr $
 
 #START SERVER CONFIGURATION SECTION
 source dmc2280_util.tcl
@@ -18,9 +18,24 @@ VarMake Instrument Text Internal
 Instrument Echidna 
 Instrument lock
 
-MakeCounter simCtr SIM -1.0
+#MakeCounter simCtr SIM -1.0
-MakeScanCommand  xxxscan simCtr echidna.hdd recover.bin
+#MakeScanCommand  xxxscan simCtr echidna.hdd recover.bin
 
 fileeval motor_configuration.tcl
+
+proc nxcreatefile {{type hdf}} {
+  SicsDataPostFix .$type;
+
+  array set nxmode [list hdf create5 nx5 create5 xml createxml];
+  nxscript $nxmode($type) [nxscript makefilename] echidna.dic;
+}
+
+publish nxcreatefile user
+
+########
 source gen_hipadaba.tcl
-source extraconfig.tcl
+source counter.tcl
+source histogram.tcl
+source scan.tcl
+source nxscripts.tcl
+fileeval extraconfig.tcl

site_ansto/instrument/hrpd/extraconfig.tcl

@@ -8,3 +8,4 @@ mphi fixed 1
 mz fixed 1
 mx fixed 1
 stth fixed 1
+

site_ansto/instrument/hrpd/hpaths.tcl

@@ -1,6 +1,6 @@
 set hpaths [list \
 /sample  /monochromator /slits \
-/slits/1 /slits/2 /detector ] 
+/slits/1 /slits/2 /detector /detector/monitor /detector/histmem ] 
 
 # Maps devices (eg motors) to hipadaba paths.
 array set motor_hpath [list \
@@ -24,13 +24,18 @@ som /sample \
 schi /sample \
 sphi /sample \
 sx /sample \
-sz /sample \
+sy /sample \
 stth /sample \
+sth /sample \
 mom /monochromator \
 mchi /monochromator \
 mphi /monochromator \
 mx /monochromator \
-mz /monochromator \
+my /monochromator \
 mtth /monochromator \
-hm /detector ]
+mth /monochromator ]
+
+array set counter_hpath [ list \
+hm /detector/histmem \
+counter /detector/monitor ]