From 0771ed355242e1e7fad09aad2c9fe29cb39be868 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Fri, 31 Jan 2025 10:25:06 -0500 Subject: [PATCH 1/2] add markdown table --- .../org/jlab/analysis/efficiency/Truth.java | 77 +++++++++++-------- 1 file changed, 46 insertions(+), 31 deletions(-) diff --git a/common-tools/clas-analysis/src/main/java/org/jlab/analysis/efficiency/Truth.java b/common-tools/clas-analysis/src/main/java/org/jlab/analysis/efficiency/Truth.java index a99865570c..51a9cf559b 100644 --- a/common-tools/clas-analysis/src/main/java/org/jlab/analysis/efficiency/Truth.java +++ b/common-tools/clas-analysis/src/main/java/org/jlab/analysis/efficiency/Truth.java @@ -34,40 +34,16 @@ public class Truth { long[][] recTallies; long[] mcTallies; - public static void main(String[] args) { - OptionParser o = new OptionParser("trutheff"); - o.setRequiresInputList(true); - o.parse(args); - Truth t = new Truth(o.getInputList().get(0)); - t.add(o.getInputList()); - System.out.println(t.toTable()); - System.out.println(t.toJson()); - } - public Truth(SchemaFactory s) { - init(s); - } - - public Truth(HipoReader r) { - init(r.getSchemaFactory()); - } - - public Truth(String filename) { - HipoReader r = new HipoReader(); - r.open(filename); - init(r.getSchemaFactory()); - } - - private void init(SchemaFactory schema) { validPids = new ArrayList(NEGATIVES); validPids.addAll(POSITIVES); validPids.addAll(NEUTRALS); validPids.add(UDF); mcTallies = new long[validPids.size()]; recTallies = new long[validPids.size()][validPids.size()]; - mcGenMatch = schema.getSchema("MC::GenMatch"); - mcParticle = schema.getSchema("MC::Particle"); - recParticle = schema.getSchema("REC::Particle"); + mcGenMatch = s.getSchema("MC::GenMatch"); + mcParticle = s.getSchema("MC::Particle"); + recParticle = s.getSchema("REC::Particle"); } /** @@ -141,7 +117,7 @@ private TreeMap getMapping(Event e) { } /** - * Get efficiencies as a human-readable table. + * Get efficiencies as a plain, human-readable table. * @return */ public String toTable() { @@ -152,13 +128,12 @@ public String toTable() { if (validPids.size()==i+1) s.append("\n"); } for (int i=0; i 0) s.append(String.format("%7.4f",get(validPids.get(i),validPids.get(j)))); else s.append(String.format("%7s","-")); - if (validPids.size()==j+1) s.append("\n"); } } return s.toString(); @@ -186,4 +161,44 @@ public JsonObject toJson() { ret.add("gens", gens); return ret; } -} + + /** + * Get efficiencies as a Markdown table. + * @return + */ + public String toMarkdown() { + StringBuilder s = new StringBuilder(); + s.append("|"); + for (int i=0; i 0) + s.append(String.format("%f|",get(validPids.get(i),validPids.get(j)))); + else + s.append("|"); + } + } + return s.toString(); + } + + public static void main(String[] args) { + OptionParser o = new OptionParser("trutheff"); + o.setRequiresInputList(true); + o.parse(args); + HipoReader r = new HipoReader(); + r.open(o.getInputList().get(0)); + Truth t = new Truth(r.getSchemaFactory()); + t.add(o.getInputList()); + System.out.println(t.toTable()); + System.out.println(t.toJson()); + System.out.println(t.toMarkdown()); + } + +} \ No newline at end of file From c708324768ad0d03cf8cb737f967c63659df0169 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Fri, 31 Jan 2025 16:19:22 -0500 Subject: [PATCH 2/2] automatically publish coatjava build to github release assets --- .github/workflows/maven.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 5fa3267f7a..5ec80c4110 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -133,11 +133,28 @@ jobs: - name: test run-groovy run: coatjava/bin/run-groovy validation/advanced-tests/test-run-groovy.groovy + release: + needs: [ build ] + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/download-artifact@v4 + with: + name: build_ubuntu-latest + - name: Release + uses: softprops/action-gh-release@v2 + if: startsWith(github.ref, 'refs/tags/') + with: + files: coatjava.tar.gz + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + final: needs: - build - test_coatjava - test_run-groovy + - release runs-on: ubuntu-latest steps: - name: pass