Index: trunk/FACT++/www/viewer/index.html =================================================================== --- trunk/FACT++/www/viewer/index.html (revision 17727) +++ trunk/FACT++/www/viewer/index.html (revision 17728) @@ -119,4 +119,8 @@ 

    
+   
Run info

+   

+      

+   

    
Debug

    

@@ -159,6 +163,7 @@
    -         -         +         +         +         
@@ -175,4 +180,6 @@
                
+         
+         

       





       
       

             
          
          
@@ -233,6 +240,7 @@
          
          
-            Pixel value: 
-            
+            Show pixel marker
+            
          
          
@@ -323,6 +331,9 @@
 The environment provides a global object (namesapce) called $ with the following members:
 
+
+
+
+
-
@@ -330,6 +341,11 @@
 
+
-
+
+
+
+
+
$.file.numEventsNumber of events in the file
$.file.runStartMJD of run start minus 40587 (unix time in days)
$.file.runEndMJD of run end minus 40587 (unix time in days)
$.file.drsFileIf this is a DRS calibration file, the step id, otherwise -1

 
$.eventThe event header information as obtained from the file
$.event.numEventsNumber of events in the file

 
$.event.numRoiNumber of samples per pixel

 
$.event.numPixNumber of pixels
$.event.triggerNumberTrigger number

 
$.event.triggerTypeTrigger type
$.event.triggerDecoded trigger information

 
$.event.unixTime[2]Timestamp when the event arrived at the event builder
$.data[numPix][numRoi]Theevent data
$.data[numPix][numRoi]The event data
$.nroiShortcut to $.event.numRoi
$.npixShortcut to $.event.numPix
$.triggerShortcut to $.event.trigger
$.neighborsArray of 1440 arrays each containing the corresponding neighbors

 

 
Index: trunk/FACT++/www/viewer/index.js
===================================================================
--- trunk/FACT++/www/viewer/index.js	(revision 17727)
+++ trunk/FACT++/www/viewer/index.js	(revision 17728)
@@ -264,5 +264,12 @@
     }
 
-    $("#file").autocomplete({source: rc, select: onFileSelect} );
+    var opts =
+    {
+        source: rc,
+        select: onFileSelect,
+        position: { my: "right top", at: "right bottom", collision: "flipfit" },
+    };
+
+    $("#file").autocomplete(opts);
     document.getElementById("file").value = "2014/04/17-181";
 
@@ -313,6 +320,4 @@
     if (document.getElementById("cameramaxon"+n).checked)
         document.getElementById("cameramax"+n).value = canv.max;
-
-    onCameraMinMax(n);
 }
 
@@ -338,9 +343,22 @@
     }
 
-    document.getElementById("event").max = rc.event.numEvents;
+    var evt = rc.event;
+    var file = rc.file;
+
+    document.getElementById("event").max = file.numEvents;
     var el = document.getElementById("numevents");
     if (el.firstChild)
         el.removeChild(el.firstChild);
-    el.appendChild(document.createTextNode(rc.event.numEvents));
+    el.appendChild(document.createTextNode(file.numEvents));
+
+    var infotxt = "
";
+    infotxt += "\nStart time: "+new Date(file.runStart*24*3600*1000).toUTCString();
+    infotxt += "\nEnd   time: "+new Date(file.runEnd*24*3600*1000).toUTCString();
+    infotxt += "\nRun   type: "+file.runType;
+    if (file.drsFile>=0)
+        infotxt += " [drs-step "+file.drsFile+"]";
+
+    $("#runinfo").html(infotxt);
+    $("#eventinfo").html("Trigger: "+evt.trigger.join(' | ')+" [0x"+evt.triggerType.toString(16)+"]");
 
     if (rc.ret)
@@ -397,6 +415,12 @@
     }
 
-    if (canv.dataAbs && rc.event)
-        document.getElementById("value").value = canv.dataAbs[rc.event.pixel];
+    // We have to redraw all of them to display the changed pixel value
+    onCameraMinMax(1);
+    onCameraMinMax(2);
+    onCameraMinMax(3);
+    onCameraMinMax(4);
+
+    //if (canv.dataAbs && evt)
+    //    document.getElementById("value").value = canv.dataAbs[evt.pixel];
 
     debug("Total time = "+(rc.timePhp*1000).toFixed(1)+" ms");
@@ -411,10 +435,10 @@
         var min = [];
         var max = [];
-        if (Array.isArray(rc.waveform) && rc.waveform.length==rc.event.numRoi)
+        if (Array.isArray(rc.waveform) && rc.waveform.length==evt.numRoi)
         {
             min.push(Math.min.apply(Math, rc.waveform));
             max.push(Math.max.apply(Math, rc.waveform));
 
-            for (var i=0; i 395.75)
+                    continue;
+
+                coord[cnt++] = [ pos.x, pos.y];
+            }
+        }
+    }
+
+    coord[1438] = [7, -22];
+    coord[1439] = [7,  22];
+}
+
+initCameraCoordinates();
 
 function hueToRGB(hue)
@@ -939,16 +1002,6 @@
 }
 
-function drawHex(ctx, x, y, col, min, max)
-{
-    if (col===undefined || col===null)
-        return;
-
-    var lvl = (col-min)/(max-min);
-
-    ctx.fillStyle = "#"+HLStoRGB(lvl);
-
-    ctx.save();
-
-    ctx.translate(x, y);
+function outlineHex(ctx)
+{
     ctx.scale(1/2, 1/3);
 
@@ -960,6 +1013,20 @@
     ctx.lineTo( 0, -2);
     ctx.lineTo( 1, -1);
+    ctx.lineTo( 1,  1);
+}
+
+function drawHex(ctx, x, y, col, min, max)
+{
+    if (col===undefined || col===null)
+        return;
+
+    var lvl = (col-min)/(max-min);
+
+    ctx.fillStyle = "#"+HLStoRGB(lvl);
+
+    ctx.save();
+    ctx.translate(x, y);
+    outlineHex(ctx);
     ctx.fill();
-
     ctx.restore();
 }
@@ -979,4 +1046,7 @@
 }
 
+var positions = [ ];
+
+
 function drawFullCam(id)
 {
@@ -994,4 +1064,6 @@
     if (!data)
         return;
+
+    var pixel = document.getElementById('pixel').value;
 
     var min = (canv.zmin-canv.min)/canv.max;
@@ -1010,25 +1082,21 @@
     ctx.translate(-0.5, 0);
 
-    drawHex(ctx, 0, 0, data[map[0]], min, max);
-
-    var cnt = 1;
-    for (var ring=1; ring<24; ring++)
-    {
-        for (var s=0; s<6; s++)
-        {
-            for (var i=1; i<=ring; i++)
-            {
-                var pos = new Position(s, ring, i);
-                if (pos.d() - pos.x > 395.75)
-                    continue;
-
-                drawHex(ctx, pos.x, pos.y, data[map[cnt]], min, max);
-                cnt++;
-            }
-        }
-    }
-
-    drawHex(ctx, 7, -22, data[map[1438]], min, max);
-    drawHex(ctx, 7,  22, data[map[1439]], min, max);
+    for (var i=0; i<1440; i++)
+        drawHex(ctx, coord[i][0], coord[i][1], data[map[i]], min, max);
+
+    if (document.getElementById('marker').checked)
+    {
+        // Draw marker
+        ctx.save();
+
+        ctx.lineWidth = 0.25;
+        ctx.fillStyle = "#000";
+
+        ctx.translate(coord[pixel][0], coord[pixel][1]);
+        outlineHex(ctx);
+        ctx.stroke();
+
+        ctx.restore();
+    }
 
     ctx.restore();
@@ -1036,4 +1104,5 @@
     // ======================= Draw Legend ======================
 
+    var pval = canv.dataAbs[pixel].toFixed(1);
     var lmin = parseFloat(canv.min).toFixed(1);
     var lmax = parseFloat(canv.max).toFixed(1);
@@ -1058,4 +1127,5 @@
 
     var mw = Math.max(ctx.measureText(lmin).width,
+                      ctx.measureText(pval).width,
                       ctx.measureText(lmax).width);
 
@@ -1063,7 +1133,7 @@
     ctx.strokeStyle  = "#000";
 
-    //ctx.strokeText(min, 5+mw, 5+24);
-    ctx.strokeText(lmin, 5+mw, 5+12);
-    ctx.strokeText(lmax, 5+mw, 5);
-}
-
+    ctx.strokeText(lmax, 5+mw, 5+24);
+    ctx.strokeText(pval, 5+mw, 5+12);
+    ctx.strokeText(lmin, 5+mw, 5);
+}
+