Merged Release 1.2

r1897 | ffr | 2007-04-20 11:53:31 +1000 (Fri, 20 Apr 2007) | 2 lines
This commit is contained in:
Ferdi Franceschini
2007-04-20 11:53:31 +10:00
committed by Douglas Clowes
parent d0957b18d5
commit ade5216ea9
22 changed files with 901 additions and 182 deletions

View File

@@ -9,7 +9,7 @@
set tmpstr [string map {"$" ""} {$Name: not supported by cvs2svn $}]
set nx_content_release_tag [lindex $tmpstr [expr [llength $tmpstr] - 1]]
set tmpstr [string map {"$" ""} {$Revision: 1.22 $}]
set tmpstr [string map {"$" ""} {$Revision: 1.23 $}]
set nx_content_revision_num [lindex $tmpstr [expr [llength $tmpstr] - 1]]
MakeNXScript
@@ -101,7 +101,7 @@ proc hmm_save {nxobj entryname point} {
$nxobj updatedictvar padim0 $dim0
$nxobj updatedictvar padim1 $dim1
$nxobj putslab $dictalias(hmm) [list $point 0 0] [list 1 $dim0 $dim1 ] hmm [SplitReply [hmm_start]] $histo_length [SplitReply [hmm_bank]]
put2Dpolar_angle $nxobj $point $dim0 $dim1;
# put2Dpolar_angle $nxobj $point $dim0 $dim1;
#TODO replace scandata with generic name
$nxobj makelink scandata hmcounts
$nxobj makelink scanhoraxis dhaxis