cleanup

Author: baltzell

common-tools/clas-detector/src/main/java/org/jlab/detector/calib/utils/OccupanceTable.java

@@ -6,7 +6,6 @@
 import org.jlab.utils.groups.IndexedTable;
 import org.jlab.utils.groups.IndexedTable.IndexedEntry;
 import org.jlab.detector.banks.RawDataBank;
-import org.jlab.detector.banks.RawBank.OrderGroups;
 
 /**
  * Occupancy bookkeeper based on IndexedTable, with I/O helpers for indexed banks.
@@ -40,6 +39,10 @@ public OccupanceTable(String hitBank, int indexCount) {
         table = new IndexedTable(indexCount, new String[]{"occ/F"});
     }
 
+    public String getHitBank() { return hitBank; }
+    public String getOccBank() { return occBank; }
+    public final IndexedTable getTable() { return table; }
+
     /**
      * Zero the occupancy table.
      */
@@ -61,10 +64,6 @@ public final IndexedTable getOccupancy(long events) {
         return t;
     }
 
-    public final IndexedTable getTable() {
-        return table;
-    }
-
     /**
      * Fill the occupancy table.
      * @param weight
@@ -100,16 +99,6 @@ public void fill(RawDataBank bank, boolean weighted) {
         }
     }
 
-    /**
-     * Fill occupancy table from the hit bank, unweighted.
-     * @param event
-     */
-    public void fill(DataEvent event) {
-        RawDataBank b = new RawDataBank(hitBank, 1000, OrderGroups.NOMINAL);
-        b.read(event);
-        fill(b, false);
-    }
-
     /**
      * Get an occupancy bank, normalized by number of events.
      * @param events

reconstruction/calib/src/main/java/org/jlab/calibration/service/OccupanceEngine.java

@@ -5,6 +5,8 @@
 import java.nio.file.Paths;
 import org.jlab.io.base.DataEvent;
 import org.jlab.clas.reco.ReconstructionEngine;
+import org.jlab.detector.banks.RawBank.OrderGroups;
+import org.jlab.detector.banks.RawDataBank;
 import org.jlab.detector.calib.utils.OccupanceTable;
 import org.jlab.utils.system.ClasUtilsFile;
 
@@ -22,15 +24,19 @@ public OccupanceEngine() {
 
     @Override
     public boolean processDataEventUser(DataEvent event) {
-        for (OccupanceTable t : tables) t.fill(event);
-            if (++events % prescale == 0) {
-                for (OccupanceTable t : tables) {
-                    if (t.getTable().getRowCount() > 0)
-                        event.appendBank(t.create(events, event));
-                    t.reset();
-                }
-                events = 0;
+        for (OccupanceTable t : tables) {
+            RawDataBank b = new RawDataBank(t.getHitBank(), 1000, OrderGroups.NOMINAL);
+            b.read(event);
+            t.fill(b, false);
+        }
+        if (++events % prescale == 0) {
+            for (OccupanceTable t : tables) {
+                if (t.getTable().getRowCount() > 0)
+                    event.appendBank(t.create(events, event));
+                t.reset();
             }
+            events = 0;
+        }
         return true;
     }