Changeset 19415 for trunk/FACT++

Timestamp:

12/05/18 16:56:26 (6 years ago)

Author:

tbretz

Message:

FACT camera as default, correctly center cameras, slight modification to under-/overflow color, fixed calculation of image parameters.

File:

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

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

@@ -3 +3 @@
 // ==========================================================================
 
-var camera_type = "FAMOUS";
-
-var scale = camera_type=="FACT" ?   83 : 22;
-var npix  = camera_type=="FACT" ? 1440 : 64;
+var camera_type = "FACT";
+
+var scale    = camera_type=="FACT" ?      83 :  22;
+var npix     = camera_type=="FACT" ?    1440 :  64;
+var diameter = camera_type=="FACT" ?  0.1111 : 1.5;
+var center   = camera_type=="FACT" ? [0.5,0] : [0,0]
 
 function onRightMouseClick(event)
@@ -260 +262 @@
     }
     else
+    {
+        $(document.getElementById("file").value ? '#event' : '#file').focus();
         setFileChecks();
+    }
 }
 
@@ -293 +298 @@
     var sqrt32 = Math.sqrt(3)/2;
     
-    var arr = [ new Array(1440), new Array(1440) ];
-
-    for (var i=0; i<1440; i++)
-    {
-        arr[0][i] = coord[i][0]*0.1111;
-        arr[1][i] = coord[i][1]*0.1111*sqrt32;
+    var arr = [ new Array(npix), new Array(npix) ];
+
+    for (var i=0; i<npix; i++)
+    {
+        arr[0][i] = coord[i][0]*diameter;
+        arr[1][i] = coord[i][1]*diameter*sqrt32;
     }
 
@@ -372 +377 @@
 
     $(document).ajaxStart(function() { disableControls(true) }).ajaxStop(function() { disableControls(false); });
-
 
     $.ajax({
@@ -836 +840 @@
         return;
 
-    if (!f.type.match('text/plain') && !f.type.match('application/javascript') && !f.type.match('application/x-javascript'))
+    if (!f.type.match('text/plain') && !f.type.match('text/javascript') && !f.type.match('application/javascript') && !f.type.match('application/x-javascript'))
     {
         alert("ERROR - Unknown file type: "+f.type);
@@ -1368 +1372 @@
 
     if (hue<0)
-        return "eef"; // 555
+        return "e5f"; // 555
 
     if (hue>1)
-        return "dde";//"700"; // 666
+        return "600";//"dde";//"700"; // 666
 
     hue *= 14;
@@ -1494 +1498 @@
 
             ctx.beginPath();
-            ctx.moveTo(0.5, 0);
+            ctx.moveTo(center[0], center[1]);
             ctx.lineTo(h.mean[0], h.mean[1]);
 
@@ -1594 +1598 @@
 
     var cnt = 0;
-    for (var i=0; i<1440; i++)
+    for (var i=0; i<npix; i++)
     {
         if (data[i]===undefined || data[i]<min || data[i]>max)
@@ -1669 +1673 @@
         "sumw":  sz,
         "count": cnt,
-        "disp":  1.47/0.1111*(1-Math.sqrt(ratio)),
+        "disp":  1.47/diameter*(1-Math.sqrt(ratio)),
     };
 }