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 index e4cf0b7625..245c60b718 100644 --- 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 @@ -12,7 +12,7 @@ import org.json.JSONObject; /** - * Just reads EVIO or HIPO, and passes it along. + * Just reads EVIO or HIPO and passes it along. * * @author baltzell */ diff --git a/common-tools/clara-io/src/main/java/org/jlab/io/clara/Clas12Writer.java b/common-tools/clara-io/src/main/java/org/jlab/io/clara/Clas12Writer.java index 02fe28979a..6a36e60488 100644 --- a/common-tools/clara-io/src/main/java/org/jlab/io/clara/Clas12Writer.java +++ b/common-tools/clara-io/src/main/java/org/jlab/io/clara/Clas12Writer.java @@ -21,13 +21,12 @@ import org.json.JSONObject; /** - * Combined with DecoderReader, a port of the standard "decoder" to CLARA. - * + * * 1. Copies certain banks on-the-fly to new tag-1 events - * 2. Caches helicity states and scaler readouts, for later use in post-processing - * 3. Writes the helicity sequence to HEL::flip banks in new tag-1 events - * 4. Adds .hipo to the output filename, if necessary - * 5. Runs post-processing, writing tag-1 information to all events + * 2. Caches helicity states, scaler readouts, and unix time + * 3. Writes HEL::flip, RUN/HEL::scaler, and RUN::unix to new tag-1 events + * 4. Runs post-processing, writing tag-1 information to all events + * 5. Adds .hipo to the output filename, if necessary * * @author baltzell */ 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 a307e1790c..da7a334bf4 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,11 +14,7 @@ import org.json.JSONObject; /** - * 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 - * 3. Pulse extraction, e.g., Mode-1 FADC250 + * The CLAS decoder. Requires EVIO input. * * @author baltzell */ diff --git a/etc/services/data-ai-2026.yaml b/etc/services/data-ai-2026.yaml index 2b1bf55a40..80fccf0326 100644 --- a/etc/services/data-ai-2026.yaml +++ b/etc/services/data-ai-2026.yaml @@ -1,11 +1,13 @@ io-services: reader: - class: org.jlab.io.clara.HipoToHipoReader - name: HipoToHipoReader + class: org.jlab.io.clara.Clas12Reader + name: Clas12Reader writer: - class: org.jlab.io.clara.HipoToHipoWriter - name: HipoToHipoWriter + class: org.jlab.io.clara.Clas12Writer + name: Clas12Writer services: + - class: org.jlab.clas.reco.DecoderEngine + name: DECO - class: org.jlab.clas.swimtools.MagFieldsEngine name: MAGFIELDS - class: org.jlab.rec.ft.cal.FTCALEngine diff --git a/etc/services/data-ai-uber.yml b/etc/services/data-ai-uber.yml index 6f15e67723..5a173f9c37 100644 --- a/etc/services/data-ai-uber.yml +++ b/etc/services/data-ai-uber.yml @@ -14,12 +14,14 @@ configuration: run: "19000" 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.Clas12Writer name: Clas12Writer services: + - class: org.jlab.clas.reco.DecoderEngine + name: DECO - class: org.jlab.service.uber.Uber$First name: 1ST - class: org.jlab.service.uber.Uber$ForwardTagger diff --git a/etc/services/data-ai.yaml b/etc/services/data-ai.yaml index a2c827da14..38c26c7e42 100644 --- a/etc/services/data-ai.yaml +++ b/etc/services/data-ai.yaml @@ -1,11 +1,13 @@ io-services: reader: - class: org.jlab.io.clara.HipoToHipoReader - name: HipoToHipoReader + class: org.jlab.io.clara.Clas12Reader + name: Clas12Reader writer: - class: org.jlab.io.clara.HipoToHipoWriter - name: HipoToHipoWriter + class: org.jlab.io.clara.Clas12Writer + name: Clas12Writer services: + - class: org.jlab.clas.reco.DecoderEngine + name: DECO - class: org.jlab.clas.swimtools.MagFieldsEngine name: MAGFIELDS - class: org.jlab.rec.ft.cal.FTCALEngine diff --git a/etc/services/data-aicv-uber.yml b/etc/services/data-aicv-uber.yml index 08d6d1ac16..d5ba19d256 100644 --- a/etc/services/data-aicv-uber.yml +++ b/etc/services/data-aicv-uber.yml @@ -14,12 +14,14 @@ configuration: run: "19000" 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.Clas12Writer name: Clas12Writer services: + - class: org.jlab.clas.reco.DecoderEngine + name: DECO - class: org.jlab.service.uber.Uber$First name: 1ST - class: org.jlab.service.uber.Uber$ForwardTagger diff --git a/etc/services/data-aicv.yaml b/etc/services/data-aicv.yaml index a1851e0a74..7e62bcc414 100644 --- a/etc/services/data-aicv.yaml +++ b/etc/services/data-aicv.yaml @@ -1,11 +1,13 @@ io-services: reader: - class: org.jlab.io.clara.HipoToHipoReader - name: HipoToHipoReader + class: org.jlab.io.clara.Clas12Reader + name: Clas12Reader writer: - class: org.jlab.io.clara.HipoToHipoWriter - name: HipoToHipoWriter + class: org.jlab.io.clara.Clas12Writer + name: Clas12Writer services: + - class: org.jlab.clas.reco.DecoderEngine + name: DECO - class: org.jlab.clas.swimtools.MagFieldsEngine name: MAGFIELDS - class: org.jlab.rec.ft.cal.FTCALEngine diff --git a/etc/services/data-cv-uber.yml b/etc/services/data-cv-uber.yml index 538c5837f9..bcdcc52715 100644 --- a/etc/services/data-cv-uber.yml +++ b/etc/services/data-cv-uber.yml @@ -12,12 +12,14 @@ configuration: run: "19000" 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.Clas12Writer name: Clas12Writer services: + - class: org.jlab.clas.reco.DecoderEngine + name: DECO - class: org.jlab.service.uber.Uber$First name: 1ST - class: org.jlab.service.uber.Uber$ForwardTagger diff --git a/etc/services/data-cv.yaml b/etc/services/data-cv.yaml index 050fcb3279..51c9e17b1d 100644 --- a/etc/services/data-cv.yaml +++ b/etc/services/data-cv.yaml @@ -1,11 +1,13 @@ io-services: reader: - class: org.jlab.io.clara.HipoToHipoReader - name: HipoToHipoReader + class: org.jlab.io.clara.Clas12Reader + name: Clas12Reader writer: - class: org.jlab.io.clara.HipoToHipoWriter - name: HipoToHipoWriter + class: org.jlab.io.clara.Clas12Writer + name: Clas12Writer services: + - class: org.jlab.clas.reco.DecoderEngine + name: DECO - class: org.jlab.clas.swimtools.MagFieldsEngine name: MAGFIELDS - class: org.jlab.rec.ft.cal.FTCALEngine diff --git a/etc/services/dcalign.yaml b/etc/services/dcalign.yaml index 3f2699a6a1..1a99135ec4 100644 --- a/etc/services/dcalign.yaml +++ b/etc/services/dcalign.yaml @@ -1,11 +1,13 @@ io-services: reader: - class: org.jlab.io.clara.HipoToHipoReader - name: HipoToHipoReader + class: org.jlab.io.clara.Clas12Reader + name: Clas12Reader writer: - class: org.jlab.io.clara.HipoToHipoWriter - name: HipoToHipoWriter + class: org.jlab.io.clara.Clas12Writer + name: Clas12Writer services: + - class: org.jlab.clas.reco.DecoderEngine + name: DECO - class: org.jlab.clas.swimtools.MagFieldsEngine name: MAGFIELDS - class: org.jlab.rec.ft.cal.FTCALEngine diff --git a/etc/services/denoise.yaml b/etc/services/denoise.yaml index c06a7b902c..46a0cca21d 100644 --- a/etc/services/denoise.yaml +++ b/etc/services/denoise.yaml @@ -1,11 +1,13 @@ io-services: reader: - class: org.jlab.io.clara.HipoToHipoReader - name: HipoToHipoReader + class: org.jlab.io.clara.Clas12Reader + name: Clas12Reader writer: - class: org.jlab.io.clara.HipoToHipoWriter - name: HipoToHipoWriter + class: org.jlab.io.clara.Clas12Writer + name: Clas12Writer services: + - class: org.jlab.clas.reco.DecoderEngine + name: DECO - class: org.jlab.clas.swimtools.MagFieldsEngine name: MAGFIELDS - class: org.jlab.rec.ft.cal.FTCALEngine diff --git a/etc/services/eb.yaml b/etc/services/eb.yaml index 047e66a291..76109a39e6 100644 --- a/etc/services/eb.yaml +++ b/etc/services/eb.yaml @@ -1,11 +1,13 @@ io-services: reader: - class: org.jlab.io.clara.HipoToHipoReader - name: HipoToHipoReader + class: org.jlab.io.clara.Clas12Reader + name: Clas12Reader writer: - class: org.jlab.io.clara.HipoToHipoWriter - name: HipoToHipoWriter + class: org.jlab.io.clara.Clas12Writer + name: Clas12Writer services: + - class: org.jlab.clas.reco.DecoderEngine + name: DECO - class: org.jlab.service.eb.EBTBEngine name: EBTB configuration: diff --git a/etc/services/kpp.yaml b/etc/services/kpp.yaml index d56b4f905f..f0a37eac5f 100644 --- a/etc/services/kpp.yaml +++ b/etc/services/kpp.yaml @@ -1,11 +1,13 @@ io-services: reader: - class: org.jlab.io.clara.HipoToHipoReader - name: HipoToHipoReader + class: org.jlab.io.clara.Clas12Reader + name: Clas12Reader writer: - class: org.jlab.io.clara.HipoToHipoWriter - name: HipoToHipoWriter + class: org.jlab.io.clara.Clas12Writer + name: Clas12Writer services: + - class: org.jlab.clas.reco.DecoderEngine + name: DECO - class: org.jlab.clas.swimtools.MagFieldsEngine name: MAGFIELDS - class: org.jlab.rec.ft.cal.FTCALEngine diff --git a/etc/services/mc-ai.yaml b/etc/services/mc-ai.yaml index 3b6a64255c..4ecf37e4f4 100644 --- a/etc/services/mc-ai.yaml +++ b/etc/services/mc-ai.yaml @@ -1,11 +1,13 @@ io-services: reader: - class: org.jlab.io.clara.HipoToHipoReader - name: HipoToHipoReader + class: org.jlab.io.clara.Clas12Reader + name: Clas12Reader writer: - class: org.jlab.io.clara.HipoToHipoWriter - name: HipoToHipoWriter + class: org.jlab.io.clara.Clas12Writer + name: Clas12Writer services: + - class: org.jlab.clas.reco.DecoderEngine + name: DECO - class: org.jlab.clas.swimtools.MagFieldsEngine name: MAGFIELDS - class: org.jlab.rec.ft.cal.FTCALEngine diff --git a/etc/services/mc-aicv.yaml b/etc/services/mc-aicv.yaml index 6dcf7509b7..55fa409a2b 100644 --- a/etc/services/mc-aicv.yaml +++ b/etc/services/mc-aicv.yaml @@ -1,11 +1,13 @@ io-services: reader: - class: org.jlab.io.clara.HipoToHipoReader - name: HipoToHipoReader + class: org.jlab.io.clara.Clas12Reader + name: Clas12Reader writer: - class: org.jlab.io.clara.HipoToHipoWriter - name: HipoToHipoWriter + class: org.jlab.io.clara.Clas12Writer + name: Clas12Writer services: + - class: org.jlab.clas.reco.DecoderEngine + name: DECO - class: org.jlab.clas.swimtools.MagFieldsEngine name: MAGFIELDS - class: org.jlab.rec.ft.cal.FTCALEngine diff --git a/etc/services/mc-cv.yaml b/etc/services/mc-cv.yaml index 54d187522b..94b3ffb2bc 100644 --- a/etc/services/mc-cv.yaml +++ b/etc/services/mc-cv.yaml @@ -1,11 +1,13 @@ io-services: reader: - class: org.jlab.io.clara.HipoToHipoReader - name: HipoToHipoReader + class: org.jlab.io.clara.Clas12Reader + name: Clas12Reader writer: - class: org.jlab.io.clara.HipoToHipoWriter - name: HipoToHipoWriter + class: org.jlab.io.clara.Clas12Writer + name: Clas12Writer services: + - class: org.jlab.clas.reco.DecoderEngine + name: DECO - class: org.jlab.clas.swimtools.MagFieldsEngine name: MAGFIELDS - class: org.jlab.rec.ft.cal.FTCALEngine diff --git a/etc/services/rgd-clarode.yml b/etc/services/rgd-clarode.yml index 5d63253fd8..2537677a1b 100644 --- a/etc/services/rgd-clarode.yml +++ b/etc/services/rgd-clarode.yml @@ -19,7 +19,7 @@ configuration: outputBankPrefix: "HB" io-services: reader: - class: org.jlab.io.clara.EvioToEvioReader + class: org.jlab.io.clara.Clas12Reader name: EvioReader writer: class: org.jlab.io.clara.Clas12Writer diff --git a/etc/services/rgl-clarode.yml b/etc/services/rgl-clarode.yml index 762f68d804..9c92b0a1d2 100644 --- a/etc/services/rgl-clarode.yml +++ b/etc/services/rgl-clarode.yml @@ -6,6 +6,8 @@ io-services: class: org.jlab.io.clara.Clas12Writer name: Clas12Writer services: + - class: org.jlab.clas.reco.DecoderEngine + name: DECO - class: org.jlab.clas.swimtools.MagFieldsEngine name: MAGFIELDS - class: org.jlab.rec.ft.cal.FTCALEngine diff --git a/etc/services/swaps.yaml b/etc/services/swaps.yaml index c3ed9868de..a03d1c4018 100644 --- a/etc/services/swaps.yaml +++ b/etc/services/swaps.yaml @@ -1,13 +1,15 @@ # Just an example of configuring SwapEngine. -# Note, it must come before all other services. +# Note, it must come before detector services. io-services: reader: - class: org.jlab.io.clara.HipoToHipoReader - name: HipoToHipoReader + class: org.jlab.io.clara.Clas12Reader + name: Clas12Reader writer: - class: org.jlab.io.clara.HipoToHipoWriter - name: HipoToHipoWriter + class: org.jlab.io.clara.Clas12Writer + name: Clas12Writer services: + - class: org.jlab.clas.reco.DecoderEngine + name: DECO - class: org.jlab.service.swaps.SwapEngine name: SWAPS configuration: