finish

Author: baltzell

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

@@ -19,8 +19,10 @@
 import java.util.Arrays;
 import org.jlab.coda.jevio.EvioException;
 import org.jlab.detector.decode.CLASDecoder;
+import org.jlab.io.base.DataBank;
 import org.jlab.io.evio.EvioDataEvent;
 import org.jlab.io.evio.EvioSource;
+import org.jlab.io.hipo.HipoDataEvent;
 import org.jlab.jnp.hipo4.data.Event;
 import org.jlab.jnp.hipo4.data.SchemaFactory;
 import org.json.JSONObject;
@@ -42,6 +44,8 @@ public class EngineProcessor {
     private SchemaFactory banksToKeep = null;
     private final List<String> schemaExempt = Arrays.asList("RUN::config","DC::tdc");
 
+    private CLASDecoder decoder = new CLASDecoder();
+
     public EngineProcessor(){}
 
     private ReconstructionEngine findEngine(String clazz) {
@@ -297,7 +301,7 @@ public void processEvent(DataEvent event, HipoDataSync writer) {
         removeBanks(event);
         writer.writeEvent(event);
     }
-    
+
     public void processFile(HipoDataSource reader, HipoDataSync writer, int skipEvents, int maxEvents) {
         if (updateDictionary==true) updateDictionary(reader, writer);
         ProgressPrintout progress = new ProgressPrintout();
@@ -314,7 +318,6 @@ public void processFile(HipoDataSource reader, HipoDataSync writer, int skipEven
     }
 
     public void processFile(EvioSource reader, HipoDataSync writer, int skipEvents, int maxEvents) {
-        CLASDecoder decoder = new CLASDecoder();
         ProgressPrintout progress = new ProgressPrintout();
         int eventsRead = 0;
         while (reader.hasEvent()) {
@@ -323,35 +326,37 @@ public void processFile(EvioSource reader, HipoDataSync writer, int skipEvents,
                 ByteBuffer bb = reader.getEventBuffer(eventsRead, true);
                 EvioDataEvent evio = new EvioDataEvent(bb.array(), ByteOrder.LITTLE_ENDIAN);
                 Event hipo = decoder.getDecodedEvent(evio, -1, eventsRead, null, null);
-                //processEvent(hipo, writer);
+                HipoDataEvent hipo2 = new HipoDataEvent(hipo, decoder.getSchemaFactory());
+                if (skipEvents <= 0 || eventsRead > skipEvents) processEvent(hipo2, writer);
+                if (maxEvents > 0 && eventsRead > maxEvents+skipEvents) break;
             } catch (EvioException ex) {
                 System.getLogger(EngineProcessor.class.getName()).log(System.Logger.Level.ERROR, (String) null, ex);
             }
             progress.updateStatus();
         }
+        progress.showStatus();
+        writer.close();
     }
 
     /**}
      * process entire file through engine chain.
-     * @param file input file name to process
+     * @param input input file name to process
      * @param output output filename
      * @param nskip number of events to skip
      * @param nevents number of events to process
      */
-    public void processFile(String file, String output, int nskip, int nevents) {
-        if (file.endsWith(".hipo")  ||  file.endsWith(".h5") || file.endsWith(".h4")) {
+    public void processFile(String input, String output, int nskip, int nevents) {
+        HipoDataSync writer = new HipoDataSync();
+        writer.setCompressionType(2);
+        if (input.endsWith(".hipo")  ||  input.endsWith(".h5") || input.endsWith(".h4")) {
             HipoDataSource reader = new HipoDataSource();
-            reader.open(file);
-            HipoDataSync writer = new HipoDataSync();
-            writer.setCompressionType(2);
+            reader.open(input);
             writer.open(output);
             processFile(reader, writer, nskip, nevents);
         } else {
-            LOGGER.info(() -> "No HIPO file extension found, assuming this is an EVIO file:  "+file);
+            LOGGER.info(() -> "No HIPO file extension found, assuming this is an EVIO file:  "+input);
             EvioSource reader = new EvioSource();
-            reader.open(file);
-            HipoDataSync writer = new HipoDataSync();
-            writer.setCompressionType(2);
+            reader.open(input);
             writer.open(output);
             processFile(reader, writer, nskip, nevents);
         }

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

@@ -434,7 +434,6 @@ public EngineData execute(EngineData input) {
             try {
                 this.processDataEvent(dataevent);
                 ByteBuffer  bbo = dataevent.getEventBuffer();
-                //byte[] buffero = bbo.array();
                 output.setData(mt, bbo);
             } catch (Exception e) {
                 String msg = String.format("Error processing input event%n%n%s", ClaraUtil.reportException(e));
@@ -446,42 +445,6 @@ public EngineData execute(EngineData input) {
         }
 
         return input;
-        /*
-        if (!mt.equalsIgnoreCase()) {
-            String msg = String.format("Wrong input type: %s", mt);
-            output.setStatus(EngineStatus.ERROR);
-            output.setDescription(msg);
-            return output;
-        }*/
-        /*
-        EvioDataEvent dataevent = null;
-
-        try {
-            ByteBuffer bb = (ByteBuffer) input.getData();
-            byte[] buffer = bb.array();
-            ByteOrder endianness = bb.order();
-            dataevent = new EvioDataEvent(buffer, endianness, EvioFactory.getDictionary());
-        } catch (Exception e) {
-            String msg = String.format("Error reading input event%n%n%s", ClaraUtil.reportException(e));
-            output.setStatus(EngineStatus.ERROR);
-            output.setDescription(msg);
-            return output;
-        }
-
-        try {
-            this.processDataEvent(dataevent);
-            ByteBuffer  bbo = dataevent.getEventBuffer();
-            //byte[] buffero = bbo.array();
-            output.setData(mt, bbo);
-        } catch (Exception e) {
-            String msg = String.format("Error processing input event%n%n%s", ClaraUtil.reportException(e));
-            output.setStatus(EngineStatus.ERROR);
-            output.setDescription(msg);
-            return output;
-        }
-
-        return output;
-        */
     }
 
     @Override