From 3c09996bbb8e6daaf8774ae2d56109ae40cd102c Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Wed, 22 Apr 2026 18:01:54 -0400 Subject: [PATCH 01/12] add convenience method --- .../src/main/java/org/jlab/detector/decode/CLASDecoder.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/CLASDecoder.java b/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/CLASDecoder.java index 667d8ab586..19374cfac3 100644 --- a/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/CLASDecoder.java +++ b/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/CLASDecoder.java @@ -792,4 +792,8 @@ public Event getDecodedEvent(EvioDataEvent rawEvent, int run, int counter, Doubl return decodedEvent; } + + public Event getDecodedEvent(EvioDataEvent rawEvent) { + return getDecodedEvent(rawEvent, -1, -1, null, null); + } } From 0a2b0f79aa575d71578ccb5d3bd70d65a2f51dc5 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Wed, 22 Apr 2026 18:06:05 -0400 Subject: [PATCH 02/12] remove unused stuff --- .../main/java/org/jlab/detector/decode/CLASDecoder.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/CLASDecoder.java b/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/CLASDecoder.java index 19374cfac3..4a89b73a91 100644 --- a/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/CLASDecoder.java +++ b/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/CLASDecoder.java @@ -15,8 +15,6 @@ import org.jlab.io.base.DataEvent; import org.jlab.io.evio.EvioDataEvent; -import org.jlab.io.hipo.HipoDataEvent; -import org.jlab.io.hipo.HipoDataSync; import org.jlab.jnp.hipo4.data.Bank; import org.jlab.jnp.hipo4.data.Event; @@ -38,8 +36,6 @@ public class CLASDecoder { protected SchemaFactory schemaFactory = new SchemaFactory(); private CodaEventDecoder codaDecoder = null; private List dataList = new ArrayList<>(); - private HipoDataSync writer = null; - private HipoDataEvent hipoEvent = null; private boolean isRunNumberFixed = false; private int decoderDebugMode = 0; private ModeAHDC ahdcExtractor = new ModeAHDC(); @@ -48,8 +44,6 @@ public class CLASDecoder { public CLASDecoder(boolean development){ codaDecoder = new CodaEventDecoder(); detectorDecoder = new DetectorEventDecoder(development); - writer = new HipoDataSync(); - hipoEvent = (HipoDataEvent) writer.createEvent(); String dir = ClasUtilsFile.getResourceDir("CLAS12DIR", "etc/bankdefs/hipo4"); schemaFactory.initFromDirectory(dir); } @@ -57,8 +51,6 @@ public CLASDecoder(boolean development){ public CLASDecoder(){ codaDecoder = new CodaEventDecoder(); detectorDecoder = new DetectorEventDecoder(); - writer = new HipoDataSync(); - hipoEvent = (HipoDataEvent) writer.createEvent(); String dir = ClasUtilsFile.getResourceDir("CLAS12DIR", "etc/bankdefs/hipo4"); schemaFactory.initFromDirectory(dir); } From d05507ab49da34181a85ebbc4ccdb19509375258 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Wed, 22 Apr 2026 19:37:28 -0400 Subject: [PATCH 03/12] add decoding engine --- .../org/jlab/clas/reco/DecodingEngine.java | 91 +++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 common-tools/clas-reco/src/main/java/org/jlab/clas/reco/DecodingEngine.java diff --git a/common-tools/clas-reco/src/main/java/org/jlab/clas/reco/DecodingEngine.java b/common-tools/clas-reco/src/main/java/org/jlab/clas/reco/DecodingEngine.java new file mode 100644 index 0000000000..cf19e00b14 --- /dev/null +++ b/common-tools/clas-reco/src/main/java/org/jlab/clas/reco/DecodingEngine.java @@ -0,0 +1,91 @@ +package org.jlab.clas.reco; + +import java.util.Set; +import java.util.HashSet; +import java.nio.ByteBuffer; +import org.jlab.clara.base.ClaraUtil; +import org.jlab.clara.engine.Engine; +import org.jlab.clara.engine.EngineData; +import org.jlab.clara.engine.EngineDataType; +import org.jlab.clara.engine.EngineStatus; +import org.jlab.detector.decode.CLASDecoder; +import org.jlab.io.evio.EvioDataEvent; +import org.jlab.io.hipo.HipoDataEvent; +import org.jlab.jnp.hipo4.data.SchemaFactory; +import org.json.JSONObject; + +/** + * + * @author baltzell + */ +public class DecodingEngine implements Engine { + + SchemaFactory schema; + CLASDecoder decoder; + + public DecodingEngine() { + schema = new SchemaFactory(); + schema.initFromDirectory(System.getenv("CLAS12DIR") + "/etc/bankdefs/hipo4"); + } + + @Override + public EngineData executeGroup(Set set) { return null; } + @Override + public Set getStates() { return new HashSet<>(); } + @Override + public String getDescription() { return "decoder engine"; } + @Override + public String getVersion() { return "1.0"; } + @Override + public String getAuthor() { return "baltzell"; } + @Override + public void reset() {} + @Override + public void destroy() {} + + @Override + public Set getInputDataTypes() { + return ClaraUtil.buildDataTypes(Clas12Types.EVIO); + } + + @Override + public Set getOutputDataTypes() { + return ClaraUtil.buildDataTypes(Clas12Types.HIPO); + } + + @Override + public EngineData configure(EngineData ed) { + JSONObject j = new JSONObject(ed.getData()); + if (j.has("variation")) decoder.setVariation(j.getString("variation")); + if (j.has("timestamp")) decoder.setVariation(j.getString("timestamp")); + return ed; + } + + @Override + public EngineData execute(EngineData input) { + EngineData output = input; + EvioDataEvent evio; + HipoDataEvent hipo; + try { + ByteBuffer bb = (ByteBuffer) input.getData(); + evio = new EvioDataEvent(bb.array(), bb.order()); + } 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 { + hipo = new HipoDataEvent(decoder.getDecodedEvent(evio),schema); + output.setData("binary/data-hipo", hipo.getHipoEvent()); + } 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; + } + +} From 48f1ce684fd1d3a328d7861138d2a5fce54dad12 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Wed, 22 Apr 2026 19:40:54 -0400 Subject: [PATCH 04/12] add it to the clara yaml --- etc/services/rgd-clarode.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/etc/services/rgd-clarode.yml b/etc/services/rgd-clarode.yml index 0fef0e2016..d70e0ec901 100644 --- a/etc/services/rgd-clarode.yml +++ b/etc/services/rgd-clarode.yml @@ -19,12 +19,14 @@ configuration: outputBankPrefix: "HB" io-services: reader: - class: org.jlab.io.clara.Clas12Reader - name: Clas12Reader + class: org.jlab.io.clara.EvioToEvioReader + name: EvioReader writer: class: org.jlab.io.clara.DecoderWriter name: DecoderWriter services: + - class: org.jlab.clas.reco.DecodingEngine + name: DECO - class: org.jlab.service.ai.DCDenoiseEngine name: DCDN - class: org.jlab.clas.swimtools.MagFieldsEngine From a2278df92706bde3c514c76ad11acb380bd7fa87 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Wed, 22 Apr 2026 20:03:25 -0400 Subject: [PATCH 05/12] use a pool --- .../org/jlab/clas/reco/DecodingEngine.java | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/common-tools/clas-reco/src/main/java/org/jlab/clas/reco/DecodingEngine.java b/common-tools/clas-reco/src/main/java/org/jlab/clas/reco/DecodingEngine.java index cf19e00b14..31dab691fd 100644 --- a/common-tools/clas-reco/src/main/java/org/jlab/clas/reco/DecodingEngine.java +++ b/common-tools/clas-reco/src/main/java/org/jlab/clas/reco/DecodingEngine.java @@ -3,6 +3,9 @@ import java.util.Set; import java.util.HashSet; import java.nio.ByteBuffer; +import java.nio.ByteOrder; +import java.util.concurrent.ArrayBlockingQueue; +import java.util.concurrent.BlockingQueue; import org.jlab.clara.base.ClaraUtil; import org.jlab.clara.engine.Engine; import org.jlab.clara.engine.EngineData; @@ -21,7 +24,8 @@ public class DecodingEngine implements Engine { SchemaFactory schema; - CLASDecoder decoder; + + BlockingQueue pool; public DecodingEngine() { schema = new SchemaFactory(); @@ -56,8 +60,13 @@ public Set getOutputDataTypes() { @Override public EngineData configure(EngineData ed) { JSONObject j = new JSONObject(ed.getData()); - if (j.has("variation")) decoder.setVariation(j.getString("variation")); - if (j.has("timestamp")) decoder.setVariation(j.getString("timestamp")); + pool = new ArrayBlockingQueue<>(64); + for (int i=0; i<64; i++) { + CLASDecoder d = new CLASDecoder(); + if (j.has("variation")) d.setVariation(j.getString("variation")); + if (j.has("timestamp")) d.setVariation(j.getString("timestamp")); + pool.add(d); + } return ed; } @@ -68,7 +77,8 @@ public EngineData execute(EngineData input) { HipoDataEvent hipo; try { ByteBuffer bb = (ByteBuffer) input.getData(); - evio = new EvioDataEvent(bb.array(), bb.order()); + //evio = new EvioDataEvent(bb.array(), bb.order()); + evio = new EvioDataEvent(bb.array(), ByteOrder.LITTLE_ENDIAN); } catch (Exception e) { String msg = String.format("Error reading input event%n%n%s", ClaraUtil.reportException(e)); output.setStatus(EngineStatus.ERROR); @@ -77,7 +87,9 @@ public EngineData execute(EngineData input) { } try { - hipo = new HipoDataEvent(decoder.getDecodedEvent(evio),schema); + CLASDecoder d = pool.take(); + hipo = new HipoDataEvent(d.getDecodedEvent(evio),schema); + pool.put(d); output.setData("binary/data-hipo", hipo.getHipoEvent()); } catch (Exception e) { String msg = String.format("Error processing input event%n%n%s", ClaraUtil.reportException(e)); From b770eb6390f284b93a6023e0305c2fa57864425c Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Wed, 22 Apr 2026 20:10:29 -0400 Subject: [PATCH 06/12] hmm --- .../src/main/java/org/jlab/io/clara/EvioToEvioReader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common-tools/clara-io/src/main/java/org/jlab/io/clara/EvioToEvioReader.java b/common-tools/clara-io/src/main/java/org/jlab/io/clara/EvioToEvioReader.java index fb8303719a..372bd423a7 100644 --- a/common-tools/clara-io/src/main/java/org/jlab/io/clara/EvioToEvioReader.java +++ b/common-tools/clara-io/src/main/java/org/jlab/io/clara/EvioToEvioReader.java @@ -39,7 +39,7 @@ public int readEventCount() throws EventReaderException { @Override public ByteOrder readByteOrder() throws EventReaderException { - return reader.getFileByteOrder(); + return ByteOrder.LITTLE_ENDIAN; //reader.getFileByteOrder(); } @Override From c8c4d9816e9220e26f7dd0e20bde11fc5b02c587 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Wed, 22 Apr 2026 20:20:03 -0400 Subject: [PATCH 07/12] allow decoder instances to share ConstantsManagers --- .../src/main/java/org/jlab/detector/decode/CLASDecoder.java | 4 ++++ .../java/org/jlab/detector/decode/DetectorEventDecoder.java | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/CLASDecoder.java b/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/CLASDecoder.java index 4a89b73a91..d537c5ae00 100644 --- a/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/CLASDecoder.java +++ b/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/CLASDecoder.java @@ -59,6 +59,10 @@ public SchemaFactory getSchemaFactory(){ return schemaFactory; } + public void shareManagers(CLASDecoder d) { + detectorDecoder.shareManagers(d.detectorDecoder); + } + public void setVariation(String variation) { detectorDecoder.setVariation(variation); } diff --git a/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/DetectorEventDecoder.java b/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/DetectorEventDecoder.java index 84ec0a6cf4..b689c0f854 100644 --- a/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/DetectorEventDecoder.java +++ b/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/DetectorEventDecoder.java @@ -80,6 +80,12 @@ public float getRcdbSolenoidScale() { getValue()).floatValue(); } + public void shareManagers(DetectorEventDecoder d) { + translationManager = d.translationManager; + fitterManager = d.fitterManager; + scalerManager = d.scalerManager; + } + public DetectorEventDecoder(){ this.initDecoder(); } From 6f48d30096a47b4cc9194e03a7b2b87535dfabea Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Wed, 22 Apr 2026 20:20:22 -0400 Subject: [PATCH 08/12] share ConstantsManagers --- .../src/main/java/org/jlab/clas/reco/DecodingEngine.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common-tools/clas-reco/src/main/java/org/jlab/clas/reco/DecodingEngine.java b/common-tools/clas-reco/src/main/java/org/jlab/clas/reco/DecodingEngine.java index 31dab691fd..a66b1dc164 100644 --- a/common-tools/clas-reco/src/main/java/org/jlab/clas/reco/DecodingEngine.java +++ b/common-tools/clas-reco/src/main/java/org/jlab/clas/reco/DecodingEngine.java @@ -61,10 +61,12 @@ public Set getOutputDataTypes() { public EngineData configure(EngineData ed) { JSONObject j = new JSONObject(ed.getData()); pool = new ArrayBlockingQueue<>(64); + CLASDecoder d0 = new CLASDecoder(); for (int i=0; i<64; i++) { - CLASDecoder d = new CLASDecoder(); + CLASDecoder d = i==0 ? d0 : new CLASDecoder(); if (j.has("variation")) d.setVariation(j.getString("variation")); if (j.has("timestamp")) d.setVariation(j.getString("timestamp")); + if (i > 0) d.shareManagers(d0); pool.add(d); } return ed; From 962f29261adfcb6dd145f2b8bb41eddf875f354e Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Wed, 22 Apr 2026 20:23:38 -0400 Subject: [PATCH 09/12] kludge test --- .../src/main/java/org/jlab/io/clara/EvioToEvioReader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common-tools/clara-io/src/main/java/org/jlab/io/clara/EvioToEvioReader.java b/common-tools/clara-io/src/main/java/org/jlab/io/clara/EvioToEvioReader.java index 372bd423a7..e4ae442101 100644 --- a/common-tools/clara-io/src/main/java/org/jlab/io/clara/EvioToEvioReader.java +++ b/common-tools/clara-io/src/main/java/org/jlab/io/clara/EvioToEvioReader.java @@ -53,6 +53,6 @@ public Object readEvent(int eventNumber) throws EventReaderException { @Override protected EngineDataType getDataType() { - return Clas12Types.EVIO; + return Clas12Types.HIPO; } } From 053b58ae3170d8e09e4612fdd4926bcda3f911af Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Wed, 22 Apr 2026 21:04:29 -0400 Subject: [PATCH 10/12] remove example engine --- .../clas/service/PulseExtractorEngine.java | 53 ------------------- 1 file changed, 53 deletions(-) delete mode 100644 common-tools/clas-reco/src/main/java/org/jlab/clas/service/PulseExtractorEngine.java diff --git a/common-tools/clas-reco/src/main/java/org/jlab/clas/service/PulseExtractorEngine.java b/common-tools/clas-reco/src/main/java/org/jlab/clas/service/PulseExtractorEngine.java deleted file mode 100644 index 3f2dc5254e..0000000000 --- a/common-tools/clas-reco/src/main/java/org/jlab/clas/service/PulseExtractorEngine.java +++ /dev/null @@ -1,53 +0,0 @@ -package org.jlab.clas.service; - -import org.jlab.clas.reco.ReconstructionEngine; -import org.jlab.detector.pulse.Mode3; -import org.jlab.detector.pulse.Mode7; -import org.jlab.detector.pulse.ModeAHDC; -import org.jlab.io.base.DataEvent; - -/** - * An example of using a {@link org.jlab.detector.pulse.HipoExtractor} from a - * {@link org.jlab.clas.reco.ReconstructionEngine}. - * - * @author baltzell - */ -public class PulseExtractorEngine extends ReconstructionEngine { - - Mode3 mode3 = new Mode3(); - Mode3 mode7 = new Mode7(); - ModeAHDC mode_ahdc = new ModeAHDC(); - - public PulseExtractorEngine() { - super("PULSE", "baltzell", "0.0"); - } - - @Override - public boolean init() { - // If using a CCDB table, must register it here: - //requireConstants("/daq/config/ahdc"); - return true; - } - - @Override - public boolean processDataEvent(DataEvent event) { - - // No CCDB table, hardcoded parameters in the extractor: - //mode3.update(6, null, event, "BMT::wf", "BMT::adc"); - //mode7.update(80, null, event, "AHDC::wf", "AHDC::adc"); - mode_ahdc.update(30, null, event, "AHDC::wf", "AHDC::adc"); - - /* - // Requiring a CCDB table: - DataBank runConfig = event.getBank("RUN::config"); - if (runConfig.rows()>0) { - IndexedTable it = getConstantsManager().getConstants( - runConfig.getInt("run", 0), "/daq/config/ahdc"); - basic.update(136, it, event, "AHDC::wf", "AHDC::adc"); - } - */ - - return true; - } - -} From b7fad4dd75f2614431e6509b2e3b2faafcced873 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Wed, 22 Apr 2026 21:04:48 -0400 Subject: [PATCH 11/12] cleanup --- .../src/main/java/org/jlab/clas/reco/DecodingEngine.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common-tools/clas-reco/src/main/java/org/jlab/clas/reco/DecodingEngine.java b/common-tools/clas-reco/src/main/java/org/jlab/clas/reco/DecodingEngine.java index a66b1dc164..2f018aafb0 100644 --- a/common-tools/clas-reco/src/main/java/org/jlab/clas/reco/DecodingEngine.java +++ b/common-tools/clas-reco/src/main/java/org/jlab/clas/reco/DecodingEngine.java @@ -62,10 +62,10 @@ public EngineData configure(EngineData ed) { JSONObject j = new JSONObject(ed.getData()); pool = new ArrayBlockingQueue<>(64); CLASDecoder d0 = new CLASDecoder(); + if (j.has("variation")) d0.setVariation(j.getString("variation")); + if (j.has("timestamp")) d0.setVariation(j.getString("timestamp")); for (int i=0; i<64; i++) { CLASDecoder d = i==0 ? d0 : new CLASDecoder(); - if (j.has("variation")) d.setVariation(j.getString("variation")); - if (j.has("timestamp")) d.setVariation(j.getString("timestamp")); if (i > 0) d.shareManagers(d0); pool.add(d); } From a9eb2e64b148e12c47600f95292e623f73eeb5b6 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Wed, 22 Apr 2026 21:39:35 -0400 Subject: [PATCH 12/12] remove unnecessary reader class --- .../java/org/jlab/io/clara/Clas12Reader.java | 91 ------------------- .../org/jlab/io/clara/Clas12Reader.yaml | 11 --- 2 files changed, 102 deletions(-) delete mode 100644 common-tools/clara-io/src/main/java/org/jlab/io/clara/Clas12Reader.java delete mode 100644 common-tools/clara-io/src/main/resources/org/jlab/io/clara/Clas12Reader.yaml diff --git a/common-tools/clara-io/src/main/java/org/jlab/io/clara/Clas12Reader.java b/common-tools/clara-io/src/main/java/org/jlab/io/clara/Clas12Reader.java deleted file mode 100644 index cd1f39dc95..0000000000 --- a/common-tools/clara-io/src/main/java/org/jlab/io/clara/Clas12Reader.java +++ /dev/null @@ -1,91 +0,0 @@ -package org.jlab.io.clara; - -import java.nio.ByteBuffer; -import java.nio.ByteOrder; -import java.nio.file.Path; -import org.jlab.clara.engine.EngineDataType; -import org.jlab.clara.std.services.AbstractEventReaderService; -import org.jlab.clara.std.services.EventReaderException; -import org.jlab.coda.jevio.EvioException; -import org.jlab.detector.decode.CLASDecoder4; -import org.jlab.io.evio.EvioDataEvent; -import org.jlab.io.evio.EvioSource; -import org.jlab.jnp.hipo4.data.Event; -import org.jlab.jnp.hipo4.io.HipoReader; -import org.json.JSONObject; - -/** - * Emulate DecoderReader for EVIO files, or HipoToHipoReader for HIPO files. - * - * @author baltzell - */ -public class Clas12Reader extends AbstractEventReaderService { - - boolean evio; - CLASDecoder4 decoder; - private long maxEvents; - private Double torus; - private Double solenoid; - - @Override - protected Object createReader(Path path, JSONObject opts) throws EventReaderException { - if (path.toString().endsWith(".hipo")) { - evio = false; - HipoReader r = new HipoReader(); - r.open(path.toString()); - return r; - } - else { - evio = true; - EvioSource r = new EvioSource(); - r.open(path.toString()); - maxEvents = r.getEventCount(); - decoder = new CLASDecoder4(); - torus = opts.has("torus") ? opts.getDouble("torus") : null; - solenoid = opts.has("solenoid") ? opts.getDouble("solenoid") : null; - if (opts.has("variation")) decoder.setVariation(opts.getString("variation")); - if (opts.has("timestamp")) decoder.setTimestamp(opts.getString("timestamp")); - return r; - } - } - - @Override - protected void closeReader() { - if (evio) ((EvioSource)reader).close(); - else ((HipoReader)reader).close(); - } - - @Override - protected int readEventCount() throws EventReaderException { - if (evio) return ((EvioSource)reader).getEventCount(); - else return ((HipoReader)reader).getEventCount(); - } - - @Override - protected Object readEvent(int eventNumber) throws EventReaderException { - try { - if (evio) { - if (eventNumber++ >= maxEvents) return null; - ByteBuffer b = ((EvioSource)reader).getEventBuffer(eventNumber, true); - EvioDataEvent e = new EvioDataEvent(b.array(), readByteOrder()); - return decoder.getDecodedEvent(e, -1, eventNumber, torus, solenoid); - } - else { - return ((HipoReader)reader).getEvent(new Event(),eventNumber); - } - } catch (EvioException e) { - throw new EventReaderException(e); - } - } - - @Override - public ByteOrder readByteOrder() throws EventReaderException { - return ByteOrder.LITTLE_ENDIAN; - } - - @Override - protected EngineDataType getDataType() { - return Clas12Types.HIPO; - } - -} diff --git a/common-tools/clara-io/src/main/resources/org/jlab/io/clara/Clas12Reader.yaml b/common-tools/clara-io/src/main/resources/org/jlab/io/clara/Clas12Reader.yaml deleted file mode 100644 index 30c6e00495..0000000000 --- a/common-tools/clara-io/src/main/resources/org/jlab/io/clara/Clas12Reader.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -name: Clas12Reader -engine: org.jlab.io.clara.Clas12Reader -type: java - -author: Nathan Baltzell -email: baltzell@jlab.org - -version: 0.1 -description: - Reads EVIO or HIPO events from a file, converting to HIPO via "decoding" if EVIO.