Changeset 162 for trunk/MultiChannelUSB/UserInterface.tcl

Timestamp:

Feb 22, 2012, 11:09:22 PM (13 years ago)

Author:

demin

Message:

add spectrum histogram 2

File:

• trunk/MultiChannelUSB/UserInterface.tcl (modified) (15 diffs)

trunk/MultiChannelUSB/UserInterface.tcl

@@ -248 +248 @@
         set hstmux(1) 0
         set hstmux(2) 0
+        set hstmux(3) 0
 
         trace add variable [myvar chan_val] write [myproc chan_val_update]
@@ -260 +261 @@
         $config(6).chan_3_1 select
 
+        $config(7).hstmux_1_1 select
+        $config(8).hstmux_2_2 select
+        $config(9).hstmux_3_1 select
+
         for {set i 1} {$i <= 3} {incr i} {
-          $config(7).polar_$i select
-        }
-
-        $config(8).hstmux_1_1 select
-        $config(9).hstmux_2_1 select
+          $config(10).polar_$i select
+        }
     }
 
@@ -305 +307 @@
         }
 
-        set config(7) [labelframe ${master}.mux_7 -borderwidth 1 -relief sunken -text {Polarity inversion} -font {-weight bold}]
-        set config(8) [labelframe ${master}.mux_8 -borderwidth 1 -relief sunken -text {Spectrum histogram} -font {-weight bold}]
+        set config(7) [labelframe ${master}.mux_7 -borderwidth 1 -relief sunken -text {Spectrum histogram 1} -font {-weight bold}]
+        set config(8) [labelframe ${master}.mux_8 -borderwidth 1 -relief sunken -text {Spectrum histogram 2} -font {-weight bold}]
         set config(9) [labelframe ${master}.mux_9 -borderwidth 1 -relief sunken -text {Rate histogram} -font {-weight bold}]
+
+        set config(10) [labelframe ${master}.mux_10 -borderwidth 1 -relief sunken -text {Polarity inversion} -font {-weight bold}]
+
         for {set i 1} {$i <= 3} {incr i} {
           set value [expr {$i - 1}]
 
-          checkbutton $config(7).polar_$i -text "ADC $i" -variable [myvar polar($i)]
-          grid ${config(7)}.polar_$i
-
-          radiobutton $config(8).hstmux_1_$i -text "ADC $i" -variable [myvar hstmux(1)] -value $value
-          grid ${config(8)}.hstmux_1_$i
-
-          radiobutton $config(9).hstmux_2_$i -text "ADC $i" -variable [myvar hstmux(2)] -value $value
-          grid ${config(9)}.hstmux_2_$i
-        }
-        grid $config(7) -row 3 -column 0 -sticky news -padx 10 -pady 50
-        grid $config(8) -row 3 -column 1 -sticky news -padx 10 -pady 50
-        grid $config(9) -row 3 -column 2 -sticky news -padx 10 -pady 50
+          radiobutton $config(7).hstmux_1_$i -text "ADC $i" -variable [myvar hstmux(1)] -value $value
+          grid ${config(7)}.hstmux_1_$i
+
+          radiobutton $config(8).hstmux_2_$i -text "ADC $i" -variable [myvar hstmux(2)] -value $value
+          grid ${config(8)}.hstmux_2_$i
+
+          radiobutton $config(9).hstmux_3_$i -text "ADC $i" -variable [myvar hstmux(3)] -value $value
+          grid ${config(9)}.hstmux_3_$i
+
+          checkbutton $config(10).polar_$i -text "ADC $i" -variable [myvar polar($i)]
+          grid ${config(10)}.polar_$i
+        }
+        grid $config(7) -row 3 -column 0 -sticky news -padx 10 -pady 30
+        grid $config(8) -row 3 -column 1 -sticky news -padx 10 -pady 30
+        grid $config(9) -row 3 -column 2 -sticky news -padx 10 -pady 30
+
+        grid $config(10) -row 4 -column 0 -sticky news -padx 10 -pady 10
 
         grid columnconfigure ${master} 0 -weight 1
@@ -332 +342 @@
         grid rowconfigure ${master} 2 -weight 0
         grid rowconfigure ${master} 3 -weight 0
-        grid rowconfigure ${master} 4 -weight 1
+        grid rowconfigure ${master} 4 -weight 0
+        grid rowconfigure ${master} 5 -weight 1
 
     }
@@ -364 +375 @@
         my instvar controller hstmux
 
-        set value [format {%x%x} $hstmux(2) $hstmux(1)]
-
-        $controller usbCmd 00020008000400${value}
+        set value [format {%x%x%x} $hstmux(3) $hstmux(2) $hstmux(1)]
+
+        $controller usbCmd 0002000600040${value}
     }
 
@@ -587 +598 @@
         }
 
-        set val_addr [format %02x [expr {6 + 2 * ${number}}]]
+        set val_addr [format %02x [expr {7 + ${number}}]]
 
         if {$thrs} {
@@ -793 +804 @@
         set size 4096
 
-        set prefix [format {%x} [expr {$number + 2}]]
+        set prefix [format {%x} [expr {2 + ${number}}]]
 
         set value [format {%08x} [expr {$size * 2}]]
@@ -802 +813 @@
         set yvec_new [usb::integrateBlt [myvar yvec] 0]
 
-        set prefix [format {%x} [expr {$number + 5}]]
+        set prefix [format {%x} [expr {5 + ${number}}]]
         set command 0001${prefix}000000200000003000400050000
 
@@ -872 +883 @@
         my set recs 0
 
-        vector create [myvar xvec](16384)
-        vector create [myvar yvec](16384)
-
-        # fill one vector for the x axis with 16384 points
-        [myvar xvec] seq -0.5 16384.5
+        vector create [myvar xvec](4096)
+        vector create [myvar yvec](4096)
+
+        # fill one vector for the x axis with 4096 points
+        [myvar xvec] seq -0.5 4095.5
 
         my setup
@@ -930 +941 @@
         $graph grid configure -hide no
         $graph legend configure -hide yes
-        $graph axis configure x -min 0 -max 16384
+        $graph axis configure x -min 0 -max 4096
 
         set config [frame ${master}.config -width 170]
@@ -1054 +1065 @@
 
         set number 0
-        set val_addr [format %02x [expr {7 + 2 * ${number}}]]
+        set val_addr [format %02x [expr {9 + ${number}}]]
 
         if {$thrs} {
@@ -1255 +1266 @@
         my instvar cntr cntr_val recs recs_val
 
-        set size 16384
+        set size 4096
 
         set prefix [format {%x} 8]
@@ -1311 +1322 @@
 
     CntDisplay instproc register {} {
-        my save_data [join [[myvar yvec] range 0 16383] \n]
+        my save_data [join [[myvar yvec] range 0 4095] \n]
     }
 
@@ -1831 +1842 @@
 
 set window [frame ${notebook}.hst_0]
-$notebook insert end -text "Spectrum histogram" -window $window -fill both
+$notebook insert end -text "Spectrum histogram 1" -window $window -fill both
 ::mca::HstDisplay hst_0 -number 0 -master $window -controller usb
+
+set window [frame ${notebook}.hst_1]
+$notebook insert end -text "Spectrum histogram 2" -window $window -fill both
+::mca::HstDisplay hst_1 -number 1 -master $window -controller usb
 
 set window [frame ${notebook}.cnt_0]
@@ -1852 +1867 @@
 hst_0 start
 
+hst_1 start
+
 cnt_0 start