From fc79bf1e45c7f21c3025c107ed58932ed42ad331 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Fri, 10 Oct 2025 17:40:47 -0400 Subject: [PATCH 1/3] use stock schema in yamls --- .github/workflows/ci.yml | 23 +++++++++++++++++++++++ etc/services/data-ai.yaml | 8 +++----- etc/services/data-aicv.yaml | 9 ++++----- etc/services/data-cv.yaml | 8 +++----- etc/services/dcalign.yaml | 6 +++--- etc/services/decode.yaml | 2 +- etc/services/denoise.yaml | 9 ++++----- etc/services/eb.yaml | 6 +++--- etc/services/mc-ai.yaml | 9 ++++----- etc/services/mc-aicv.yaml | 6 +++--- etc/services/mc-cv.yaml | 6 +++--- 11 files changed, 54 insertions(+), 38 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b115ec2670..07cbac1a73 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -154,6 +154,29 @@ jobs: run: | ./coatjava/bin/decoder -n 10000 -o dog.hipo ./clas_005038.evio.00000 + test_clara: + needs: [ build ] + strategy: + fail-fast: true + steps: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v5 + - name: Set up JDK + uses: actions/setup-java@v5 + with: + java-version: ${{ env.java_version }} + distribution: ${{ env.java_distribution }} + - uses: actions/download-artifact@v5 + with: + name: build_${{ matrix.runner }} + - name: untar build + run: tar xzvf coatjava.tar.gz + - name: run test + run: | + cd validation/advanced-tests + ls -lhtr + test_coatjava: needs: [ build ] strategy: diff --git a/etc/services/data-ai.yaml b/etc/services/data-ai.yaml index 46daa569c3..89df678cf5 100644 --- a/etc/services/data-ai.yaml +++ b/etc/services/data-ai.yaml @@ -70,11 +70,9 @@ configuration: ## uncomment the following two lines for compatibility with alignments before the DC fixes # dcMinistagger: "NOTONREFWIRE" # dcFeedthroughs: "OFF" -# io-services: -# writer: -# schema_dir: "absolute-path-to-schema-folder" -# for example: -# schema_dir: "/home/clas12-1/chef/myClara/plugins/clas12/etc/bankdefs/dst" + io-services: + writer: + schema_dir: data-ai services: MAGFIELDS: magfieldSolenoidMap: Symm_solenoid_r601_phi1_z1201_13June2018.dat diff --git a/etc/services/data-aicv.yaml b/etc/services/data-aicv.yaml index 8516df30e3..21e7be3167 100644 --- a/etc/services/data-aicv.yaml +++ b/etc/services/data-aicv.yaml @@ -81,11 +81,10 @@ configuration: ## uncomment the following two lines for compatibility with alignments before the DC fixes # dcMinistagger: "NOTONREFWIRE" # dcFeedthroughs: "OFF" -# io-services: -# writer: -# schema_dir: "absolute-path-to-schema-folder" -# for example: -# schema_dir: "/home/clas12-1/chef/myClara/plugins/clas12/etc/bankdefs/dst" + io-services: + writer: + schema_dir: data-aicv + #schema_dir: "/home/clas12-1/chef/myClara/plugins/clas12/etc/bankdefs/dst" services: MAGFIELDS: magfieldSolenoidMap: Symm_solenoid_r601_phi1_z1201_13June2018.dat diff --git a/etc/services/data-cv.yaml b/etc/services/data-cv.yaml index 00554281fd..df9768827a 100644 --- a/etc/services/data-cv.yaml +++ b/etc/services/data-cv.yaml @@ -69,11 +69,9 @@ configuration: ## uncomment the following two lines for compatibility with alignments before the DC fixes # dcMinistagger: "NOTONREFWIRE" # dcFeedthroughs: "OFF" -# io-services: -# writer: -# schema_dir: "absolute-path-to-schema-folder" -# for example: -# schema_dir: "/home/clas12-1/chef/myClara/plugins/clas12/etc/bankdefs/dst" + io-services: + writer: + schema_dir: data-cv services: MAGFIELDS: magfieldSolenoidMap: Symm_solenoid_r601_phi1_z1201_13June2018.dat diff --git a/etc/services/dcalign.yaml b/etc/services/dcalign.yaml index 692d3083a1..3f2699a6a1 100644 --- a/etc/services/dcalign.yaml +++ b/etc/services/dcalign.yaml @@ -57,9 +57,9 @@ configuration: global: variation: rgb_spring2019 # timestamp: 12/31/2020-00:00:00 -# io-services: -# writer: -# schema_dir: "absolute-path-to-distribution/etc/bankdefs/hipo4/singles/dcalign" + io-services: + writer: + schema_dir: dcalign services: MAGFIELDS: magfieldSolenoidMap: Symm_solenoid_r601_phi1_z1201_13June2018.dat diff --git a/etc/services/decode.yaml b/etc/services/decode.yaml index 4d498322c4..4a0966d2f3 100644 --- a/etc/services/decode.yaml +++ b/etc/services/decode.yaml @@ -15,6 +15,6 @@ configuration: variation: default timestamp: 05/11/2025-00:00:00 writer: - schema_dir: /farm/home/baltzell/sw/coatjava/io-dev-2/coatjava/etc/bankdefs/hipo4/singles/dst + schema_dir: full mime-types: - binary/data-hipo diff --git a/etc/services/denoise.yaml b/etc/services/denoise.yaml index 0c98be66a5..c06a7b902c 100644 --- a/etc/services/denoise.yaml +++ b/etc/services/denoise.yaml @@ -83,11 +83,10 @@ configuration: ## uncomment the following two lines for compatibility with alignments before the DC fixes # dcMinistagger: "NOTONREFWIRE" # dcFeedthroughs: "OFF" -# io-services: -# writer: -# schema_dir: "absolute-path-to-schema-folder" -# for example: -# schema_dir: "/home/clas12-1/chef/myClara/plugins/clas12/etc/bankdefs/dst" + io-services: + writer: + schema_dir: dst + #schema_dir: "/home/clas12-1/chef/myClara/plugins/clas12/etc/bankdefs/dst" services: MAGFIELDS: magfieldSolenoidMap: Symm_solenoid_r601_phi1_z1201_13June2018.dat diff --git a/etc/services/eb.yaml b/etc/services/eb.yaml index b50771e5cf..047e66a291 100644 --- a/etc/services/eb.yaml +++ b/etc/services/eb.yaml @@ -9,9 +9,9 @@ services: - class: org.jlab.service.eb.EBTBEngine name: EBTB configuration: -# io-services: -# writer: -# schema_dir: "absolute-path-to-schema-folder" + io-services: + writer: + schema_dir: dst services: EBTB: dropBanks: 'true' diff --git a/etc/services/mc-ai.yaml b/etc/services/mc-ai.yaml index 8412fc9a15..19aa5e8f55 100644 --- a/etc/services/mc-ai.yaml +++ b/etc/services/mc-ai.yaml @@ -69,11 +69,10 @@ configuration: # timestamp: 12/31/2020-00:00:00 # dcMinistagger: "NOTONREFWIRE" # dcFeedthroughs: "OFF" -# io-services: -# writer: -# schema_dir: "absolute-path-to-schema-folder" -# for example: -# schema_dir: "/home/clas12-1/chef/myClara/plugins/clas12/etc/bankdefs/dst" + io-services: + writer: + schema_dir: mc-ai + #schema_dir: "/home/clas12-1/chef/myClara/plugins/clas12/etc/bankdefs/dst" services: MAGFIELDS: magfieldSolenoidMap: Symm_solenoid_r601_phi1_z1201_13June2018.dat diff --git a/etc/services/mc-aicv.yaml b/etc/services/mc-aicv.yaml index d86b4549d2..51112d338d 100644 --- a/etc/services/mc-aicv.yaml +++ b/etc/services/mc-aicv.yaml @@ -79,9 +79,9 @@ configuration: # variation: rga_fall2018_mc # dcMinistagger: "NOTONREFWIRE" # dcFeedthroughs: "OFF" -# io-services: -# writer: -# schema_dir: "absolute-path-to-schema-folder" + io-services: + writer: + schema_dir: mc-aicv services: MAGFIELDS: magfieldSolenoidMap: Symm_solenoid_r601_phi1_z1201_13June2018.dat diff --git a/etc/services/mc-cv.yaml b/etc/services/mc-cv.yaml index d3294abc34..2643c1fc5e 100644 --- a/etc/services/mc-cv.yaml +++ b/etc/services/mc-cv.yaml @@ -66,9 +66,9 @@ configuration: # variation: rga_fall2018_mc # dcMinistagger: "NOTONREFWIRE" # dcFeedthroughs: "OFF" -# io-services: -# writer: -# schema_dir: "absolute-path-to-schema-folder" + io-services: + writer: + schema_dir: mc-cv services: MAGFIELDS: magfieldSolenoidMap: Symm_solenoid_r601_phi1_z1201_13June2018.dat From 867f75273868d6f310603e5e53061e63b5b2ac86 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Fri, 10 Oct 2025 17:43:48 -0400 Subject: [PATCH 2/3] fix oops --- .github/workflows/ci.yml | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 07cbac1a73..b115ec2670 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -154,29 +154,6 @@ jobs: run: | ./coatjava/bin/decoder -n 10000 -o dog.hipo ./clas_005038.evio.00000 - test_clara: - needs: [ build ] - strategy: - fail-fast: true - steps: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v5 - - name: Set up JDK - uses: actions/setup-java@v5 - with: - java-version: ${{ env.java_version }} - distribution: ${{ env.java_distribution }} - - uses: actions/download-artifact@v5 - with: - name: build_${{ matrix.runner }} - - name: untar build - run: tar xzvf coatjava.tar.gz - - name: run test - run: | - cd validation/advanced-tests - ls -lhtr - test_coatjava: needs: [ build ] strategy: From 68b0c994e5fc042047590789338a31646029144a Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Sat, 11 Oct 2025 21:40:09 -0400 Subject: [PATCH 3/3] bugfix --- .../src/main/java/org/jlab/io/clara/HipoFrameWriter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common-tools/clara-io/src/main/java/org/jlab/io/clara/HipoFrameWriter.java b/common-tools/clara-io/src/main/java/org/jlab/io/clara/HipoFrameWriter.java index f07fe1eac0..de91e0a42a 100644 --- a/common-tools/clara-io/src/main/java/org/jlab/io/clara/HipoFrameWriter.java +++ b/common-tools/clara-io/src/main/java/org/jlab/io/clara/HipoFrameWriter.java @@ -53,7 +53,7 @@ private String getSchemaDirectory(JSONObject opts) { s = opts.getString(CONF_SCHEMA).trim(); // If it's not already an absolute path, assume it's the name of a // stock schema that comes with COATJAVA and get the full path to it: - if (!s.startsWith("/")) s = ClaraYaml.getStockSchemaDirectory(opts.getString(s)); + if (!s.startsWith("/")) s = ClaraYaml.getStockSchemaDirectory(s); } return s; }