Changeset 17843

Timestamp:

05/13/14 09:21:52 (11 years ago)

Author:

tbretz

Message:

Fixed/simplified width/length/disp calculation by applying the scale factor in the calculation and removing it from the plotting.

File:

• trunk/FACT++/www/viewer/index.js (modified) (6 diffs)

trunk/FACT++/www/viewer/index.js

@@ -1412 +1412 @@
             ctx.save();
 
+            ctx.scale(1, 2/Math.sqrt(3));
+
             ctx.translate(h.mean[0], h.mean[1]);
             ctx.rotate(h.phi);
@@ -1511 +1513 @@
         return;
 
+    // Coordinates need to be scaled in y
+    var f = Math.sqrt(3)/2;
+
+    my  *= f;
+    mxy *= f;
+    my2 *= f*f;
+
     var xx = mx2 - mx*mx/sz;
     var yy = my2 - my*my/sz;
@@ -1527 +1536 @@
 
     // Correction for scale in x
-    var f = Math.sqrt(3)/2; 
-    var ratio = xx/yy/f;
+    var ratio = xx/yy;
 
     if (d1!=0 || d2==0)
@@ -1549 +1557 @@
         axis1 /= s2;
         axis2 /= s2;
-
-        ratio *= (f + tand*tand)/(tand*tand*f + 1);
     }
 
@@ -1556 +1562 @@
     var width  = axis2<0 ? 0 : Math.sqrt(axis2/sz);
 
-    //var r = (cos*cos*f + sin*sin)/(sin*sin*f + cos*cos);
     return {
         "mean":  [ mx/sz, my/sz ],
@@ -1564 +1569 @@
         "sumw":  sz,
         "count": cnt,
-        "disp":  1.42/0.1111*(1-Math.sqrt(ratio)),
+        "disp":  1.47/0.1111*(1-Math.sqrt(ratio)),
     };
 }