Skip to content

Automatically publish build tarball to release assets #450

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
baltzell merged 2 commits into from
Feb 1, 2025
Merged

Automatically publish build tarball to release assets #450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0771ed3
add markdown table
baltzell Jan 31, 2025
c708324
automatically publish coatjava build to github release assets
baltzell Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
77 changes: 46 additions & 31 deletions common-tools/clas-analysis/src/main/java/org/jlab/analysis/efficiency/Truth.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}

/**
Expand Down Expand Up @@ -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() {
Expand All @@ -152,13 +128,12 @@ public String toTable() {
if (validPids.size()==i+1) s.append("\n");
}
for (int i=0; i<validPids.size(); ++i) {
s.append(String.format("%6d",validPids.get(i)));
s.append(String.format("\n%6d",validPids.get(i)));
for (int j=0; j<validPids.size(); ++j) {
if (mcTallies[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();
Expand Down Expand Up @@ -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<validPids.size(); ++i) {
s.append(String.format("%d|",validPids.get(i)));
if (validPids.size()==i+1) s.append("\n");
}
s.append("|");
for (int i=0; i<validPids.size(); ++i) s.append(" --- |");
s.append("\n");
for (int i=0; i<validPids.size(); ++i) {
s.append(String.format("|%d|",validPids.get(i)));
for (int j=0; j<validPids.size(); ++j) {
if (mcTallies[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());
}

}