Engine proc redux

.github/workflows/ci.yml

@@ -224,20 +224,15 @@ jobs:
             clas_018779.evio.00001
       - name: untar build
         run: |
-          tar xzvf clara.tar.gz
           tar xzvf coatjava.tar.gz
       - run: ls
       - name: run test
-        run: ./bin/run-clara -y ./etc/services/rgd-clarode.yml -t 4 -n 500 -c ./clara -o ./tmp ./clas_018779.evio.00001
-      - name: ls tmp
-        run: ls -lhtr tmp
-      - name: rename
-        run: mv -v tmp/rec_clas_018779.evio.00001.hipo rec.hipo
+        run: ./coatjava/bin/recon-mutil -t 4 -n 500 -y etc/services/rgd-clarode.yml -o rec_clas_018779.evio.00001.hipo -i clas_018779.evio.00001
       - uses: actions/upload-artifact@v7
         with:
           name: test_clara_result
           retention-days: 1
-          path: rec.hipo
+          path: rec_clas_018779.evio.00001.hipo
 
   test_coatjava:
     needs: [ build ]

bin/recon-mutil

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+. `dirname $0`/../libexec/env.sh
+
+split_cli $@
+
+export MALLOC_ARENA_MAX=1
+
+java ${JAVA_OPTS-} -Xms10240m -XX:+UseParallelGC ${jvm_options[@]} \
+    -cp ${COATJAVA_CLASSPATH:-''} \
+    org.jlab.clas.reco.ReconMutil \
+    ${class_options[@]}

build-coatjava.sh

@@ -403,6 +403,6 @@ done
 echo "installed coatjava to: $prefix_dir"
 
 # install clara
-if $installClara; then ./bin/install-clara -c $prefix_dir $clara_home; fi
+if $installClara; then ./bin/install-clara -b -c $prefix_dir $clara_home; fi
 
 echo "COATJAVA SUCCESSFULLY BUILT !"

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

@@ -18,11 +18,10 @@
 import org.jlab.clara.engine.EngineDataType;
 import java.util.Arrays;
 import org.jlab.coda.jevio.EvioException;
-import org.jlab.detector.decode.CLASDecoder4;
+import org.jlab.detector.decode.CLASDecoder;
+import org.jlab.detector.decode.CLASDecoderPool;
 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;
 import org.jlab.utils.ClaraYaml;
@@ -36,13 +35,13 @@ public class EngineProcessor {
     public static final String ENGINE_CLASS_BG = "org.jlab.service.bg.BackgroundEngine";
     public static final String ENGINE_CLASS_PP = "org.jlab.service.postproc.PostprocEngine";
 
-    private final Map<String,ReconstructionEngine>  processorEngines = new LinkedHashMap<>();
+    protected final Map<String,ReconstructionEngine> processorEngines = new LinkedHashMap<>();
     private static final Logger LOGGER = Logger.getLogger(EngineProcessor.class.getPackage().getName());
     private boolean updateDictionary = true;
     private SchemaFactory banksToKeep = null;
     private final List<String> schemaExempt = Arrays.asList("RUN::config","DC::tdc");
 
-    private CLASDecoder4 decoder = new CLASDecoder4();
+    protected final CLASDecoderPool decoders = new CLASDecoderPool(64,"default",null);
 
     public EngineProcessor(){}
 
@@ -94,7 +93,7 @@ private void setPreloadFiles(String filenames, boolean restream, boolean rebuild
         findEngine(ENGINE_CLASS_PP).init();
     }
 
-    private void updateDictionary(HipoDataSource source, HipoDataSync sync){
+    protected void updateDictionary(HipoDataSource source, HipoDataSync sync){
         SchemaFactory fsync = sync.getWriter().getSchemaFactory();
         SchemaFactory fsrc  = source.getReader().getSchemaFactory();
         List<String> schemaList = fsync.getSchemaKeys();
@@ -255,7 +254,8 @@ public void addEngine(String name, String clazz, String jsonConf) {
                 }
                 this.processorEngines.put(name == null ? engine.getName() : name, engine);
             } else {
-                LOGGER.log(Level.SEVERE, ">>>> ERROR: class is not a reconstruction engine : {0}", clazz);
+                LOGGER.log( clazz.contains("DecoderEngine") ? Level.INFO : Level.SEVERE,
+                        "Class is not a reconstruction engine : {0}", clazz);
             }
 
         } catch (ClassNotFoundException | InstantiationException | IllegalAccessException ex) {
@@ -342,9 +342,13 @@ public void processFile(EvioSource reader, HipoDataSync writer, int skipEvents,
                 ByteBuffer bb = reader.getEventBuffer(eventsRead, true);
                 if (skipEvents <= 0 || eventsRead > skipEvents) {
                     EvioDataEvent evio = new EvioDataEvent(bb.array(), ByteOrder.LITTLE_ENDIAN);
-                    Event hipo = decoder.getDecodedEvent(evio, -1, eventsRead, null, null);
-                    HipoDataEvent hipo2 = new HipoDataEvent(hipo, decoder.getSchemaFactory());
-                    processEvent(hipo2, writer);
+                    try {
+                        CLASDecoder d = decoders.take();
+                        processEvent(d.getDecodedDataEvenet(evio), writer);
+                        decoders.put(d);
+                    } catch (InterruptedException ex) {
+                        System.getLogger(EngineProcessor.class.getName()).log(System.Logger.Level.ERROR, (String) null, ex);
+                    }
                 }
                 if (maxEvents > 0 && eventsRead > maxEvents+skipEvents) break;
             } catch (EvioException ex) {
@@ -394,17 +398,17 @@ protected static OptionParser getParser() {
         OptionParser parser = new OptionParser("recon-util");
         parser.addRequired("-o","output.hipo");
         parser.addRequired("-i","input.evio/hipo");
-        parser.setRequiresInputList(false);
         parser.addOption("-c","0","use default configuration [0 - no, 1 - yes/default, 2 - all services] ");
-        parser.addOption("-s","-1","number of events to skip");
-        parser.addOption("-n","-1","number of events to process");
+        parser.addOption("-s","0","number of events to skip");
+        parser.addOption("-n","0","number of events to process");
         parser.addOption("-y","0","yaml file");
         parser.addOption("-u","true","update dictionary from writer ? ");
         parser.addOption("-S",null,"schema directory");
         parser.addOption("-B",null,"background file");
         parser.addOption("-P",null,"preload file for post-processing");
         parser.addOption("-R","0","rebuild scalers");
         parser.addOption("-H","0","restream helicity");
+        parser.setRequiresInputList(false);
         return parser;
     }