diff --git a/common-tools/clara-io/src/main/java/org/jlab/io/clara/DecoderWriter.java b/common-tools/clara-io/src/main/java/org/jlab/io/clara/Clas12Writer.java similarity index 99% rename from common-tools/clara-io/src/main/java/org/jlab/io/clara/DecoderWriter.java rename to common-tools/clara-io/src/main/java/org/jlab/io/clara/Clas12Writer.java index 127b29c0ab..8eebff8f4f 100644 --- a/common-tools/clara-io/src/main/java/org/jlab/io/clara/DecoderWriter.java +++ b/common-tools/clara-io/src/main/java/org/jlab/io/clara/Clas12Writer.java @@ -30,7 +30,7 @@ * * @author baltzell */ -public class DecoderWriter extends HipoToHipoWriter { +public class Clas12Writer extends HipoToHipoWriter { static final String[] TAG1BANKS = {"RUN::scaler","HEL::scaler","RAW::scaler","RAW::epics","HEL::flip","COAT::config"}; diff --git a/common-tools/clara-io/src/main/java/org/jlab/io/clara/DecoderReader.java b/common-tools/clara-io/src/main/java/org/jlab/io/clara/DecoderReader.java index e105739f17..a307e1790c 100644 --- a/common-tools/clara-io/src/main/java/org/jlab/io/clara/DecoderReader.java +++ b/common-tools/clara-io/src/main/java/org/jlab/io/clara/DecoderReader.java @@ -14,7 +14,7 @@ import org.json.JSONObject; /** - * Combined with DecoderWriter, a port of the standard "decoder" to CLARA. + * Combined with Clas12Writer, a port of the standard "decoder" to CLARA. * * 1. Convert EVIO to HIPO * 2. CCDB translation tables, c/s/c -> s/l/c/o diff --git a/common-tools/clara-io/src/main/resources/org/jlab/io/clara/DecoderWriter.yaml b/common-tools/clara-io/src/main/resources/org/jlab/io/clara/Clas12Writer.yaml similarity index 74% rename from common-tools/clara-io/src/main/resources/org/jlab/io/clara/DecoderWriter.yaml rename to common-tools/clara-io/src/main/resources/org/jlab/io/clara/Clas12Writer.yaml index f84fed809a..7b54c1bc9a 100644 --- a/common-tools/clara-io/src/main/resources/org/jlab/io/clara/DecoderWriter.yaml +++ b/common-tools/clara-io/src/main/resources/org/jlab/io/clara/Clas12Writer.yaml @@ -1,6 +1,6 @@ --- -name: DecoderWriter -engine: org.jlab.io.clara.DecoderWriter +name: Clas12Writer +engine: org.jlab.io.clara.Clas12Writer type: java author: Nathan Baltzell diff --git a/etc/services/data-ai-uber.yml b/etc/services/data-ai-uber.yml index 7bb7c6ec74..6f15e67723 100644 --- a/etc/services/data-ai-uber.yml +++ b/etc/services/data-ai-uber.yml @@ -17,8 +17,8 @@ io-services: class: org.jlab.io.clara.DecoderReader name: DecoderReader writer: - class: org.jlab.io.clara.DecoderWriter - name: DecoderWriter + class: org.jlab.io.clara.Clas12Writer + name: Clas12Writer services: - class: org.jlab.service.uber.Uber$First name: 1ST diff --git a/etc/services/data-aicv-uber.yml b/etc/services/data-aicv-uber.yml index 186c43d954..08d6d1ac16 100644 --- a/etc/services/data-aicv-uber.yml +++ b/etc/services/data-aicv-uber.yml @@ -17,8 +17,8 @@ io-services: class: org.jlab.io.clara.DecoderReader name: DecoderReader writer: - class: org.jlab.io.clara.DecoderWriter - name: DecoderWriter + class: org.jlab.io.clara.Clas12Writer + name: Clas12Writer services: - class: org.jlab.service.uber.Uber$First name: 1ST diff --git a/etc/services/data-cv-uber.yml b/etc/services/data-cv-uber.yml index 6c7c899dab..538c5837f9 100644 --- a/etc/services/data-cv-uber.yml +++ b/etc/services/data-cv-uber.yml @@ -15,8 +15,8 @@ io-services: class: org.jlab.io.clara.DecoderReader name: DecoderReader writer: - class: org.jlab.io.clara.DecoderWriter - name: DecoderWriter + class: org.jlab.io.clara.Clas12Writer + name: Clas12Writer services: - class: org.jlab.service.uber.Uber$First name: 1ST diff --git a/etc/services/decode.yaml b/etc/services/decode.yaml index 4a0966d2f3..6708387a12 100644 --- a/etc/services/decode.yaml +++ b/etc/services/decode.yaml @@ -1,20 +1,12 @@ io-services: reader: - class: org.jlab.io.clara.DecoderReader - name: DecoderReader + class: org.jlab.io.clara.Clas12Reader + name: Clas12Reader writer: - class: org.jlab.io.clara.DecoderWriter - name: DecoderWriter + class: org.jlab.io.clara.Clas12Writer + name: Clas12Writer services: - # FIXME: replace with dummy/useful service - - class: org.jlab.service.eb.EBTBEngine - name: EBTB -configuration: - io-services: - reader: - variation: default - timestamp: 05/11/2025-00:00:00 - writer: - schema_dir: full + - class: org.jlab.clas.reco.DecoderEngine + name: DECO mime-types: - binary/data-hipo diff --git a/etc/services/rgd-clarode.yml b/etc/services/rgd-clarode.yml index e00a0b0395..5d63253fd8 100644 --- a/etc/services/rgd-clarode.yml +++ b/etc/services/rgd-clarode.yml @@ -22,8 +22,8 @@ io-services: class: org.jlab.io.clara.EvioToEvioReader name: EvioReader writer: - class: org.jlab.io.clara.DecoderWriter - name: DecoderWriter + class: org.jlab.io.clara.Clas12Writer + name: Clas12Writer services: - class: org.jlab.clas.reco.DecoderEngine name: DECO diff --git a/etc/services/rgl-clarode.yml b/etc/services/rgl-clarode.yml index b6b417c4da..762f68d804 100644 --- a/etc/services/rgl-clarode.yml +++ b/etc/services/rgl-clarode.yml @@ -3,8 +3,8 @@ io-services: class: org.jlab.io.clara.Clas12Reader name: Clas12Reader writer: - class: org.jlab.io.clara.DecoderWriter - name: DecoderWriter + class: org.jlab.io.clara.Clas12Writer + name: Clas12Writer services: - class: org.jlab.clas.swimtools.MagFieldsEngine name: MAGFIELDS