Changeset 17800 for trunk/FACT++/www/viewer

Timestamp:

05/07/14 16:44:53 (11 years ago)

Author:

tbretz

Message:

It is nicer to have teh distance between two neighbors as 1. Reinvented $.conv.

Location:

trunk/FACT++/www/viewer

Files:

• index.html (modified) (1 diff)
• internal.js (modified) (4 diffs)

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

@@ -491 +491 @@
 <tr><td>$.neighbors</td><td>Array of 1440 arrays each containing the corresponding neighbors</td></tr>
 <tr><td>$.map</td><td>Array of 1440 entries (software index) containing the hardware indices.</td></tr>
-<tr><td>$.geom</td><td>Array of 1440 entries. Each an array with two entries, x and y in degree. The pixel diameter is assumed to be 0.1111&deg;.</td></tr>
-<tr><td>$.dist(i,j)</td><td>Calculated the distance of two pixels in degree</td></tr>
+<tr><td>$.geom</td><td>Array of 1440 entries. Each an array with two entries, x and y. The distance between two neighbors is 1.</td></tr>
+<tr><td>$.dist(i,j)</td><td>Calculated the distance of two pixels in degree.</td></tr>
+<tr><td>$.conv</td><td>Conversion factor to convert geom and dist to degree.</td></tr>
 </table>
 

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

@@ -1446 +1446 @@
 $.geom = (function()
 {
-    var convx = 0.1111;
-    var convy = convx*Math.sqrt(3)/2;
+    var s32 = Math.sqrt(3)/2;
 
     function Position(s, ring, i)
@@ -1466 +1465 @@
            return;
 
-        return [ x*convx, y*convy ];
+        return [ x, y*s32 ];
     }
 
@@ -1488 +1487 @@
     }
 
-    geom[map[1438]] = [ 7*convx, -22*convy ];
-    geom[map[1439]] = [ 7*convx,  22*convy ];
+    geom[map[1438]] = [ 7, -22*s32 ];
+    geom[map[1439]] = [ 7,  22*s32 ];
 
     return geom;
@@ -1501 +1500 @@
     return Math.sqrt(dx*dx + dy*dy);
 }
+
+$.conv = 0.1111;