Changeset 881

Timestamp:

Dec 4, 2009 5:13:39 PM (11 years ago)

Author:

toby

Message:

# on 2006/04/30 23:13:59, toby did:
remove last of background function #3
compute Q in same manner as in calcbak (results still differ)

File:

• trunk/liveplot (modified) (11 diffs, 3 props)

trunk/liveplot

@@ -1382 +1382 @@
     set good 1
 
-#    if {$expgui(FitFunction) == 3} {
-#       set expgui(RadiiList) {}
-#       for {set j 0} {$j < ($expgui(FitOrder) - 2)/2} {incr j} {
-#           lappend expgui(RadiiList) $bkgeditbox(r$j)
-#           if {[catch {expr $bkgeditbox(r$j)}]} {
-#               $top.r$j.e config -fg red
-#               set good 0
-#           } elseif {$bkgeditbox(r$j) == 0} {
-#               $top.r$j.e config -fg red
-#               set good 0
-#           } else {
-#               $top.r$j.e config -fg black
-#           }
-#       }
-#       set o [expr {2 + ($expgui(FitOrder) - 2)/2}]
-#    } else {
-        set o $expgui(FitOrder)
-#    }
+    set o $expgui(FitOrder)
+
     set termlist {}
     for {set j 0} {$j < $o} {incr j} {
@@ -1485 +1469 @@
 
 # convert x values to Q
-proc toQ {xlist hst} {
+proc bkgtoQ {xlist hst} {
     global expmap
     if {[string range $expmap(htype_$hst) 2 2] == "T"} {
-        return [toftoQ $xlist $hst]
+        return [bkgtof2Q $xlist $hst]
     } elseif {[string range $expmap(htype_$hst) 2 2] == "C"} {
         return [tttoQ $xlist $hst]
@@ -1497 +1481 @@
     }
 }
-# convert tof to Q
-proc toftoQ {toflist hst} {
+# convert tof to Q (as done in BKG routines -- no zero or difa)
+proc bkgtof2Q {toflist hst} {
     set difc [expr {[histinfo $hst difc]/1000.}]
-    set difc2 [expr {$difc*$difc}]
-    set difa [expr {[histinfo $hst difa]/1000.}]
-    set zero [expr {[histinfo $hst zero]/1000.}]
     set 2pi [expr {4.*acos(0.)}]
     set ans {}
@@ -1511 +1492 @@
             lappend ans 0.
         } else {
-            set td [expr {$tof-$zero}]
-            lappend ans [expr {$2pi * \
-                    ($difc2*$difc+2.0*$difa*$td)/($td*($difc2+$difa*$td))}]
+            lappend ans [expr {$2pi * $difc / $tof}]
         }
     }
@@ -1584 +1563 @@
         }
         return $blist
-    } elseif {$num == 3} {
-        set Qlist [toQ $tlist $hst]
-        foreach Q $Qlist tofm $tlist {
-            set i 0
-            set j -1
-            foreach t $terms {
-                incr i
-                if {$i == 1} {
-                    set bkg $t
-                } elseif {$i == 2} {
-                    set bkg [expr {$bkg + $tofm * $t}]
-                } else {
-                    incr j 
-                    set r [lindex $rlist $j]
-                    set QR [expr {$Q * $r}]
-                    set bkg [expr {$bkg + $t * sin($QR)/$QR}]
-                }
-            }
-            lappend blist $bkg
-        }
-        return $blist
     } elseif {$num == 4} {
-        set Qlist [toQ $tlist $hst]
+        set Qlist [bkgtoQ $tlist $hst]
         foreach Q $Qlist {
             set i -1
@@ -1623 +1581 @@
         return $blist
     } elseif {$num == 5} {
-        set Qlist [toQ $tlist $hst]
+        set Qlist [bkgtoQ $tlist $hst]
         foreach Q $Qlist {
             set i -1
@@ -1640 +1598 @@
         return $blist
     } elseif {$num == 6} {
-        set Qlist [toQ $tlist $hst]
+        set Qlist [bkgtoQ $tlist $hst]
         foreach Q $Qlist {
             set i 0
@@ -1705 +1663 @@
         return $deriv
     } elseif {$num == 3} {
-        set Q [toQ $tof $hst]
+        set Q [bkgtoQ $tof $hst]
         set j -1
         #set n [expr {2 + ($nterms - 2)/2}]
@@ -1722 +1680 @@
         return $deriv
     } elseif {$num == 4} {
-        set Q [toQ $tof $hst]
+        set Q [bkgtoQ $tof $hst]
         set QT 1
         for {set i 0} {$i < $nterms} {incr i} {
@@ -1733 +1691 @@
         return $deriv
     } elseif {$num == 5} {
-        set Q [toQ $tof $hst]
+        set Q [bkgtoQ $tof $hst]
         set QT 1
         for {set i 0} {$i < $nterms} {incr i} {
@@ -1744 +1702 @@
         return $deriv
     } elseif {$num == 6} {
-        set Q [toQ $tof $hst]
+        set Q [bkgtoQ $tof $hst]
         set QT 1
         for {set i 1} {$i <= $nterms} {incr i} {