fix oops

Author: baltzell

common-tools/clas-detector/src/main/java/org/jlab/detector/serial/SerialHoncho.java

@@ -83,7 +83,7 @@ public void process(Event event) {
             processEventUnix(event, cfg);
             if (evt.getRows() > 0) {
                 event.remove(evt.getSchema());
-                //processHelicity(event, cfg, evt);
+                processHelicity(event, cfg, evt);
                 processScalers(cfg, evt);
                 event.write(evt);
             }
@@ -118,6 +118,10 @@ public void clear() {
         helicitySequence = null;
     }
 
+    public TreeSet<HelicityState> getHelicities() {
+        return helicities;
+    }
+
     public DaqScalersSequence getScalers() {
         return scalers;
     }
@@ -130,10 +134,6 @@ public SchemaFactory getSchemaFactory() {
         return schema;
     }
 
-    public TreeSet<HelicityState> getHelicities() {
-        return helicities;
-    }
-
     public void updateHelicitySequence() {
         helicitySequence = new HelicitySequenceDelayed(
             conman.getConstants(run, "/runcontrol/helicity").getIntValue("delay",0,0,0));

common-tools/clas-reco/src/main/java/org/jlab/clas/reco/ReconMutil.java

@@ -44,7 +44,7 @@
  */
 final class ReconMutil {
 
-    boolean DEBUG = true;
+    boolean DEBUG = false;
 
     // Performance parameters:
     final int BENCH_SECONDS = 30;
@@ -190,7 +190,11 @@ void decode(int thread) {
         while (true) {
             List<Object> input = decoQueue.poll();
             if (input == null) {
-                if (decoQueue.isEmpty() && readerThread.isDone() && decoQueue.isEmpty()) break; 
+                if (decoQueue.isEmpty() && readerThread.isDone() && decoQueue.isEmpty()) {
+                    if (thread == 0) serial.updateHelicitySequence();
+                    System.err.println("recon-mutil::  Helicity sequence updated");
+                    break;
+                } 
                 sleep(100);
             }
             else {
@@ -224,7 +228,7 @@ void process(int thread) {
                 continue;
             }
             if (procQueue.isEmpty() && decoThreads.isEmpty() && procQueue.isEmpty()) {
-                if (writeEvents+skipEvents+failEvents >= readEvents) break;
+                if (writeEvents+skipEvents+failEvents >= readEvents+taggedEvents.get()) break;
                 sleep(100);
             }
             List<HipoDataEvent> input = procQueue.poll();
@@ -246,7 +250,6 @@ void process(int thread) {
                     Event e = input.get(i).getHipoEvent();
                     Benchmark.getInstance().resume("post");
                     serial.process(e);
-                    serial.process(e);
                     Benchmark.getInstance().pause("post");
                     output.add(e);
                 }