Changeset 472

Timestamp:

Dec 4, 2009 5:06:44 PM (14 years ago)

Author:

toby

Message:

# on 2001/10/19 19:27:58, toby did:
Change use of $newhist(setnum) for 8.0 compatibility

File:

• trunk/addcmds.tcl (modified) (5 diffs, 3 props)

trunk/addcmds.tcl

@@ -746 +746 @@
             grid $np.dl2 -column 0 -row 9
             catch {
-                foreach {x tmin tmax x} $newhist(inst${newhist(setnum)}ITYP) {}
+                set s $newhist(setnum)
+                foreach {x tmin tmax x} $newhist(inst${s}ITYP) {}
                 $np.d1.m1 config -text $tmin
                 $np.d1.m2 config -text $tmax
@@ -819 +820 @@
     if {$newhist(insttype) == "TOF"} {
         catch {
-            foreach {x tmin tmax x} $newhist(inst${newhist(setnum)}ITYP) {}
+            set s $newhist(setnum)
+            foreach {x tmin tmax x} $newhist(inst${s}ITYP) {}
             if {$newhist(tmin) <$tmin } {
                 $np.d1.e1 config -fg red
@@ -828 +830 @@
                 append msg "Max value of $newhist(tmax) msec is invalid.\n"
             }
+            set s $newhist(setnum)
             set dmin [expr {1000. * $newhist(tmin) / \
-                    [lindex $newhist(inst${newhist(setnum)}ICONS) 0]}]
+                    [lindex $newhist(inst${s}ICONS) 0]}]
             set dmax [expr {1000. * $newhist(tmax) / \
-                    [lindex $newhist(inst${newhist(setnum)}ICONS) 0]}]
+                    [lindex $newhist(inst${s}ICONS) 0]}]
         }
     } elseif {$newhist(insttype) == "CW"} {
@@ -843 +846 @@
         }
         catch {
-            set dmin [expr {[lindex $newhist(inst${newhist(setnum)}ICONS) 0]\
+            set s $newhist(setnum)
+            set dmin [expr {[lindex $newhist(inst${s}ICONS) 0]\
                     * 0.5 / sin(acos(0.)*$newhist(tmax)/180.)}]
-            set dmax [expr {[lindex $newhist(inst${newhist(setnum)}ICONS) 0]\
+            set dmax [expr {[lindex $newhist(inst${s}ICONS) 0]\
                     * 0.5 / sin(acos(0.)*$newhist(tmin)/180.)}]
         }
@@ -858 +862 @@
         }
         catch {
-            set ang [lindex $newhist(inst${newhist(setnum)}ICONS) 0]
+            set s $newhist(setnum)
+            set ang [lindex $newhist(inst${s}ICONS) 0]
             set dmin [expr {12.398/ (2.0*sin($ang*acos(0.)/180) * \
                     $newhist(tmax))}]