From 89e7ac6ce397e2acd966fc1c5b4e295541a9ffe8 Mon Sep 17 00:00:00 2001
From: Nathan Baltzell <baltzell@jlab.org>
Date: Wed, 20 May 2026 19:18:47 -0400
Subject: [PATCH 1/7] unify io classes

---
 etc/services/data-ai-2026.yaml  | 8 ++++----
 etc/services/data-ai-uber.yml   | 4 ++--
 etc/services/data-ai.yaml       | 8 ++++----
 etc/services/data-aicv-uber.yml | 4 ++--
 etc/services/data-aicv.yaml     | 8 ++++----
 etc/services/data-cv-uber.yml   | 4 ++--
 etc/services/data-cv.yaml       | 8 ++++----
 etc/services/dcalign.yaml       | 8 ++++----
 etc/services/denoise.yaml       | 8 ++++----
 etc/services/eb.yaml            | 8 ++++----
 etc/services/kpp.yaml           | 8 ++++----
 etc/services/mc-ai.yaml         | 8 ++++----
 etc/services/mc-aicv.yaml       | 8 ++++----
 etc/services/mc-cv.yaml         | 8 ++++----
 etc/services/rgd-clarode.yml    | 2 +-
 etc/services/swaps.yaml         | 8 ++++----
 16 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/etc/services/data-ai-2026.yaml b/etc/services/data-ai-2026.yaml
index 2b1bf55a40..3d80acf6da 100644
--- a/etc/services/data-ai-2026.yaml
+++ b/etc/services/data-ai-2026.yaml
@@ -1,10 +1,10 @@
 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.swimtools.MagFieldsEngine
     name: MAGFIELDS
diff --git a/etc/services/data-ai-uber.yml b/etc/services/data-ai-uber.yml
index 6f15e67723..95177a8c4b 100644
--- a/etc/services/data-ai-uber.yml
+++ b/etc/services/data-ai-uber.yml
@@ -14,8 +14,8 @@ 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
diff --git a/etc/services/data-ai.yaml b/etc/services/data-ai.yaml
index a2c827da14..d46ad58625 100644
--- a/etc/services/data-ai.yaml
+++ b/etc/services/data-ai.yaml
@@ -1,10 +1,10 @@
 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.swimtools.MagFieldsEngine
     name: MAGFIELDS
diff --git a/etc/services/data-aicv-uber.yml b/etc/services/data-aicv-uber.yml
index 08d6d1ac16..99f790085b 100644
--- a/etc/services/data-aicv-uber.yml
+++ b/etc/services/data-aicv-uber.yml
@@ -14,8 +14,8 @@ 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
diff --git a/etc/services/data-aicv.yaml b/etc/services/data-aicv.yaml
index a1851e0a74..0a84c0259b 100644
--- a/etc/services/data-aicv.yaml
+++ b/etc/services/data-aicv.yaml
@@ -1,10 +1,10 @@
 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.swimtools.MagFieldsEngine
     name: MAGFIELDS
diff --git a/etc/services/data-cv-uber.yml b/etc/services/data-cv-uber.yml
index 538c5837f9..6486721bee 100644
--- a/etc/services/data-cv-uber.yml
+++ b/etc/services/data-cv-uber.yml
@@ -12,8 +12,8 @@ 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
diff --git a/etc/services/data-cv.yaml b/etc/services/data-cv.yaml
index 050fcb3279..9d6f411a42 100644
--- a/etc/services/data-cv.yaml
+++ b/etc/services/data-cv.yaml
@@ -1,10 +1,10 @@
 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.swimtools.MagFieldsEngine
     name: MAGFIELDS
diff --git a/etc/services/dcalign.yaml b/etc/services/dcalign.yaml
index 3f2699a6a1..74a9a8ddbe 100644
--- a/etc/services/dcalign.yaml
+++ b/etc/services/dcalign.yaml
@@ -1,10 +1,10 @@
 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.swimtools.MagFieldsEngine
     name: MAGFIELDS
diff --git a/etc/services/denoise.yaml b/etc/services/denoise.yaml
index c06a7b902c..e948f0d968 100644
--- a/etc/services/denoise.yaml
+++ b/etc/services/denoise.yaml
@@ -1,10 +1,10 @@
 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.swimtools.MagFieldsEngine
     name: MAGFIELDS
diff --git a/etc/services/eb.yaml b/etc/services/eb.yaml
index 047e66a291..84745172e7 100644
--- a/etc/services/eb.yaml
+++ b/etc/services/eb.yaml
@@ -1,10 +1,10 @@
 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.service.eb.EBTBEngine
     name: EBTB
diff --git a/etc/services/kpp.yaml b/etc/services/kpp.yaml
index d56b4f905f..10972d0af2 100644
--- a/etc/services/kpp.yaml
+++ b/etc/services/kpp.yaml
@@ -1,10 +1,10 @@
 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.swimtools.MagFieldsEngine
     name: MAGFIELDS
diff --git a/etc/services/mc-ai.yaml b/etc/services/mc-ai.yaml
index 3b6a64255c..aa1a80ba8f 100644
--- a/etc/services/mc-ai.yaml
+++ b/etc/services/mc-ai.yaml
@@ -1,10 +1,10 @@
 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.swimtools.MagFieldsEngine
     name: MAGFIELDS
diff --git a/etc/services/mc-aicv.yaml b/etc/services/mc-aicv.yaml
index 6dcf7509b7..9a5014894c 100644
--- a/etc/services/mc-aicv.yaml
+++ b/etc/services/mc-aicv.yaml
@@ -1,10 +1,10 @@
 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.swimtools.MagFieldsEngine
     name: MAGFIELDS
diff --git a/etc/services/mc-cv.yaml b/etc/services/mc-cv.yaml
index 54d187522b..25f6f24328 100644
--- a/etc/services/mc-cv.yaml
+++ b/etc/services/mc-cv.yaml
@@ -1,10 +1,10 @@
 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.swimtools.MagFieldsEngine
     name: MAGFIELDS
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/swaps.yaml b/etc/services/swaps.yaml
index c3ed9868de..c16d59da46 100644
--- a/etc/services/swaps.yaml
+++ b/etc/services/swaps.yaml
@@ -2,11 +2,11 @@
 # Note, it must come before all other 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.service.swaps.SwapEngine
     name: SWAPS

From 1beaa16b3e45cb7e181902f95370aadfeaf6f731 Mon Sep 17 00:00:00 2001
From: Nathan Baltzell <baltzell@jlab.org>
Date: Thu, 21 May 2026 13:04:36 -0400
Subject: [PATCH 2/7] add DecoderEngine to all yamls

---
 etc/services/data-ai-2026.yaml  | 2 ++
 etc/services/data-ai-uber.yml   | 2 ++
 etc/services/data-ai.yaml       | 2 ++
 etc/services/data-aicv-uber.yml | 2 ++
 etc/services/data-aicv.yaml     | 2 ++
 etc/services/data-cv-uber.yml   | 2 ++
 etc/services/data-cv.yaml       | 2 ++
 etc/services/dcalign.yaml       | 2 ++
 etc/services/denoise.yaml       | 2 ++
 etc/services/eb.yaml            | 2 ++
 etc/services/kpp.yaml           | 2 ++
 etc/services/mc-ai.yaml         | 2 ++
 etc/services/mc-aicv.yaml       | 2 ++
 etc/services/mc-cv.yaml         | 2 ++
 etc/services/rgl-clarode.yml    | 2 ++
 etc/services/swaps.yaml         | 4 +++-
 16 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/etc/services/data-ai-2026.yaml b/etc/services/data-ai-2026.yaml
index 3d80acf6da..80fccf0326 100644
--- a/etc/services/data-ai-2026.yaml
+++ b/etc/services/data-ai-2026.yaml
@@ -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/data-ai-uber.yml b/etc/services/data-ai-uber.yml
index 95177a8c4b..5a173f9c37 100644
--- a/etc/services/data-ai-uber.yml
+++ b/etc/services/data-ai-uber.yml
@@ -20,6 +20,8 @@ io-services:
     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 d46ad58625..38c26c7e42 100644
--- a/etc/services/data-ai.yaml
+++ b/etc/services/data-ai.yaml
@@ -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/data-aicv-uber.yml b/etc/services/data-aicv-uber.yml
index 99f790085b..d5ba19d256 100644
--- a/etc/services/data-aicv-uber.yml
+++ b/etc/services/data-aicv-uber.yml
@@ -20,6 +20,8 @@ io-services:
     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 0a84c0259b..7e62bcc414 100644
--- a/etc/services/data-aicv.yaml
+++ b/etc/services/data-aicv.yaml
@@ -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/data-cv-uber.yml b/etc/services/data-cv-uber.yml
index 6486721bee..bcdcc52715 100644
--- a/etc/services/data-cv-uber.yml
+++ b/etc/services/data-cv-uber.yml
@@ -18,6 +18,8 @@ io-services:
     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 9d6f411a42..51c9e17b1d 100644
--- a/etc/services/data-cv.yaml
+++ b/etc/services/data-cv.yaml
@@ -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/dcalign.yaml b/etc/services/dcalign.yaml
index 74a9a8ddbe..1a99135ec4 100644
--- a/etc/services/dcalign.yaml
+++ b/etc/services/dcalign.yaml
@@ -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/denoise.yaml b/etc/services/denoise.yaml
index e948f0d968..46a0cca21d 100644
--- a/etc/services/denoise.yaml
+++ b/etc/services/denoise.yaml
@@ -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/eb.yaml b/etc/services/eb.yaml
index 84745172e7..76109a39e6 100644
--- a/etc/services/eb.yaml
+++ b/etc/services/eb.yaml
@@ -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.service.eb.EBTBEngine
     name: EBTB
 configuration:
diff --git a/etc/services/kpp.yaml b/etc/services/kpp.yaml
index 10972d0af2..f0a37eac5f 100644
--- a/etc/services/kpp.yaml
+++ b/etc/services/kpp.yaml
@@ -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/mc-ai.yaml b/etc/services/mc-ai.yaml
index aa1a80ba8f..4ecf37e4f4 100644
--- a/etc/services/mc-ai.yaml
+++ b/etc/services/mc-ai.yaml
@@ -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/mc-aicv.yaml b/etc/services/mc-aicv.yaml
index 9a5014894c..55fa409a2b 100644
--- a/etc/services/mc-aicv.yaml
+++ b/etc/services/mc-aicv.yaml
@@ -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/mc-cv.yaml b/etc/services/mc-cv.yaml
index 25f6f24328..94b3ffb2bc 100644
--- a/etc/services/mc-cv.yaml
+++ b/etc/services/mc-cv.yaml
@@ -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/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 c16d59da46..a03d1c4018 100644
--- a/etc/services/swaps.yaml
+++ b/etc/services/swaps.yaml
@@ -1,5 +1,5 @@
 # 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.Clas12Reader
@@ -8,6 +8,8 @@ io-services:
     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:

From 0d5d6a15e01b933c52c78e7cae24f7a9b772fee1 Mon Sep 17 00:00:00 2001
From: Nathan Baltzell <baltzell@jlab.org>
Date: Thu, 21 May 2026 15:46:11 -0400
Subject: [PATCH 3/7] fix comments

---
 .../src/main/java/org/jlab/io/clara/Clas12Reader.java |  2 +-
 .../src/main/java/org/jlab/io/clara/Clas12Writer.java | 11 +++++------
 .../main/java/org/jlab/io/clara/DecoderReader.java    |  6 +-----
 3 files changed, 7 insertions(+), 12 deletions(-)

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
  */

From e87faf3d64d8a85d76fc1d1e875ed276bf8d26d4 Mon Sep 17 00:00:00 2001
From: Nathan Baltzell <baltzell@gmx.com>
Date: Fri, 22 May 2026 13:52:11 -0400
Subject: [PATCH 4/7] fix name

---
 etc/services/rgd-clarode.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/services/rgd-clarode.yml b/etc/services/rgd-clarode.yml
index 2537677a1b..e46daddc7e 100644
--- a/etc/services/rgd-clarode.yml
+++ b/etc/services/rgd-clarode.yml
@@ -20,7 +20,7 @@ configuration:
 io-services:
   reader:
     class: org.jlab.io.clara.Clas12Reader
-    name: EvioReader
+    name: Clas12Reader
   writer:
     class: org.jlab.io.clara.Clas12Writer
     name: Clas12Writer

From 8339655ffc6b97a04c5bbb8b7d964943866d6b88 Mon Sep 17 00:00:00 2001
From: Nathan Baltzell <baltzell@jlab.org>
Date: Fri, 22 May 2026 20:13:59 -0400
Subject: [PATCH 5/7] revert for mc yamls

---
 etc/services/mc-ai.yaml   | 8 ++++----
 etc/services/mc-aicv.yaml | 8 ++++----
 etc/services/mc-cv.yaml   | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/etc/services/mc-ai.yaml b/etc/services/mc-ai.yaml
index 4ecf37e4f4..239e8e3a75 100644
--- a/etc/services/mc-ai.yaml
+++ b/etc/services/mc-ai.yaml
@@ -1,10 +1,10 @@
 io-services:
   reader:
-    class: org.jlab.io.clara.Clas12Reader
-    name: Clas12Reader
+    class: org.jlab.io.clara.HipoToHipoReader
+    name: HipoToHipoReader
   writer:
-    class: org.jlab.io.clara.Clas12Writer
-    name: Clas12Writer
+    class: org.jlab.io.clara.HipoToHipoWriter
+    name: HipoToHipoWriter
 services:
   - class: org.jlab.clas.reco.DecoderEngine
     name: DECO
diff --git a/etc/services/mc-aicv.yaml b/etc/services/mc-aicv.yaml
index 55fa409a2b..295bd9c8f5 100644
--- a/etc/services/mc-aicv.yaml
+++ b/etc/services/mc-aicv.yaml
@@ -1,10 +1,10 @@
 io-services:
   reader:
-    class: org.jlab.io.clara.Clas12Reader
-    name: Clas12Reader
+    class: org.jlab.io.clara.HipoToHipoReader
+    name: HipoToHipoReader
   writer:
-    class: org.jlab.io.clara.Clas12Writer
-    name: Clas12Writer
+    class: org.jlab.io.clara.HipoToHipoWriter
+    name: HipoToHipoWriter
 services:
   - class: org.jlab.clas.reco.DecoderEngine
     name: DECO
diff --git a/etc/services/mc-cv.yaml b/etc/services/mc-cv.yaml
index 94b3ffb2bc..749252d1fa 100644
--- a/etc/services/mc-cv.yaml
+++ b/etc/services/mc-cv.yaml
@@ -1,10 +1,10 @@
 io-services:
   reader:
-    class: org.jlab.io.clara.Clas12Reader
-    name: Clas12Reader
+    class: org.jlab.io.clara.HipoToHipoReader
+    name: HipoToHipoReader
   writer:
-    class: org.jlab.io.clara.Clas12Writer
-    name: Clas12Writer
+    class: org.jlab.io.clara.HipoToHipoWriter
+    name: HipoToHipoWriter
 services:
   - class: org.jlab.clas.reco.DecoderEngine
     name: DECO

From 2379287b44b1b6374940ca3b0a12e946294b2f2e Mon Sep 17 00:00:00 2001
From: Nathan Baltzell <baltzell@jlab.org>
Date: Fri, 22 May 2026 20:15:00 -0400
Subject: [PATCH 6/7] revert for mc yamls

---
 etc/services/mc-ai.yaml   | 2 --
 etc/services/mc-aicv.yaml | 2 --
 etc/services/mc-cv.yaml   | 2 --
 3 files changed, 6 deletions(-)

diff --git a/etc/services/mc-ai.yaml b/etc/services/mc-ai.yaml
index 239e8e3a75..3b6a64255c 100644
--- a/etc/services/mc-ai.yaml
+++ b/etc/services/mc-ai.yaml
@@ -6,8 +6,6 @@ io-services:
     class: org.jlab.io.clara.HipoToHipoWriter
     name: HipoToHipoWriter
 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 295bd9c8f5..6dcf7509b7 100644
--- a/etc/services/mc-aicv.yaml
+++ b/etc/services/mc-aicv.yaml
@@ -6,8 +6,6 @@ io-services:
     class: org.jlab.io.clara.HipoToHipoWriter
     name: HipoToHipoWriter
 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 749252d1fa..54d187522b 100644
--- a/etc/services/mc-cv.yaml
+++ b/etc/services/mc-cv.yaml
@@ -6,8 +6,6 @@ io-services:
     class: org.jlab.io.clara.HipoToHipoWriter
     name: HipoToHipoWriter
 services:
-  - class: org.jlab.clas.reco.DecoderEngine
-    name: DECO
   - class: org.jlab.clas.swimtools.MagFieldsEngine
     name: MAGFIELDS
   - class: org.jlab.rec.ft.cal.FTCALEngine

From 7f21eab90813f5c636c5d333f3d89002d1ccc5a6 Mon Sep 17 00:00:00 2001
From: Nathan Baltzell <baltzell@jlab.org>
Date: Fri, 22 May 2026 20:16:38 -0400
Subject: [PATCH 7/7] restore

---
 etc/services/swaps.yaml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/etc/services/swaps.yaml b/etc/services/swaps.yaml
index a03d1c4018..c3ed9868de 100644
--- a/etc/services/swaps.yaml
+++ b/etc/services/swaps.yaml
@@ -1,15 +1,13 @@
 # Just an example of configuring SwapEngine.
-# Note, it must come before detector services.
+# Note, it must come before all other services.
 io-services:
   reader:
-    class: org.jlab.io.clara.Clas12Reader
-    name: Clas12Reader
+    class: org.jlab.io.clara.HipoToHipoReader
+    name: HipoToHipoReader
   writer:
-    class: org.jlab.io.clara.Clas12Writer
-    name: Clas12Writer
+    class: org.jlab.io.clara.HipoToHipoWriter
+    name: HipoToHipoWriter
 services:
-  - class: org.jlab.clas.reco.DecoderEngine
-    name: DECO
   - class: org.jlab.service.swaps.SwapEngine
     name: SWAPS
 configuration: