Print

---

Author: [log in to unmask]
Date: Fri Mar  6 05:32:34 2015
New Revision: 2296

Log:
fixing mistake in getChannelIdFromRowColumn

Modified:
    java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalMonitoringUtilities.java

Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalMonitoringUtilities.java
 =============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalMonitoringUtilities.java	(original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalMonitoringUtilities.java	Fri Mar  6 05:32:34 2015
@@ -12,26 +12,26 @@
     final static int XOFFSET = 23;
     final static int YOFFSET = 5;
     final static int XHOLEWIDTH = 9;
-    final static int XHOLESTART = -9;
+    final static int XHOLESTART = -10;
     
     private EcalMonitoringUtilities() {        
     }
     
     public static int getRowFromHistoID(int id) {
-        return (YOFFSET - (id % (YOFFSET*2+1)));
+        return (YOFFSET - (id % (2*YOFFSET+1)));
     }
 
     public static int getColumnFromHistoID(int id) {
-        return ((id / (YOFFSET*2+1)) - XOFFSET);
+        return ((id / (2*YOFFSET+1)) - XOFFSET);
     }
 
     public static int getHistoIDFromRowColumn(int row, int column) {
-        return (-row + YOFFSET) + (YOFFSET*2+1) * (column + XOFFSET);
+        return (-row + YOFFSET) + (2*YOFFSET+1) * (column + XOFFSET);
     }
 
     public static Boolean isInHole(int row, int column) {
         if (row == 1 || row == -1) {
-            if (column < XHOLESTART+XHOLEWIDTH-1 && column >= XHOLESTART-1) {
+            if (column < XHOLESTART+XHOLEWIDTH && column >= XHOLESTART) {
                 return true;
             }
         }
@@ -42,9 +42,9 @@
     {
         int ix = col + XOFFSET + (col>0 ? -1 : 0);
         int iy = row + YOFFSET + (row>0 ? -1 : 0);
-        int cid = ix + 2*XOFFSET*(YOFFSET*2-iy-1) + 1;
+        int cid = ix + 2*XOFFSET*(2*YOFFSET-iy-1) + 1;
         if      (row== 1 && col>=XHOLESTART) cid -= XHOLEWIDTH;
-        else if (row==-1 && col<=XHOLESTART) cid -= XHOLEWIDTH;
+        else if (row==-1 && col< XHOLESTART) cid -= XHOLEWIDTH;
         else if (row < 0)                    cid -= 2*XHOLEWIDTH;
         return cid; 
     }