Skip to content

Commit 5ad4bd7

Browse files
efucheyefuchey
authored
Merge branch 'JeffersonLab:development' into development
2 parents 7e07223 + 93b8651 commit 5ad4bd7

File tree

67 files changed

+610
-283
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+610
-283
lines changed

‎.github/dependabot.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,21 @@
11
version: 2
2+
3+
registries:
4+
clas12maven:
5+
type: maven-repository
6+
url: https://clasweb.jlab.org/clas12maven
7+
jhep:
8+
type: maven-repository
9+
url: https://clasweb.jlab.org/jhep/maven
10+
211
updates:
312
- package-ecosystem: "maven"
413
directory: "/"
514
schedule:
615
interval: "weekly"
16+
registries:
17+
- clas12maven
18+
- jhep
719
ignore:
820
- dependency-name: "org.jlab:groot" # since version numbers are not in order
921
- package-ecosystem: "github-actions"

‎.github/workflows/maven.yml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,28 @@ jobs:
133133
- name: test run-groovy
134134
run: coatjava/bin/run-groovy validation/advanced-tests/test-run-groovy.groovy
135135

136+
release:
137+
needs: [ build ]
138+
runs-on: ubuntu-latest
139+
steps:
140+
- uses: actions/checkout@v4
141+
- uses: actions/download-artifact@v4
142+
with:
143+
name: build_ubuntu-latest
144+
- name: Release
145+
uses: softprops/action-gh-release@v2
146+
if: startsWith(github.ref, 'refs/tags/')
147+
with:
148+
files: coatjava.tar.gz
149+
env:
150+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
151+
136152
final:
137153
needs:
138154
- build
139155
- test_coatjava
140156
- test_run-groovy
157+
- release
141158
runs-on: ubuntu-latest
142159
steps:
143160
- name: pass

‎common-tools/clara-io/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>org.jlab.clas</groupId>
55
<artifactId>clara-io</artifactId>
6-
<version>11.1.0-SNAPSHOT</version>
6+
<version>11.1.2-SNAPSHOT</version>
77
<packaging>jar</packaging>
88

99
<parent>
1010
<groupId>org.jlab.clas</groupId>
1111
<artifactId>clas12rec</artifactId>
1212
<relativePath>../../parent/pom.xml</relativePath>
13-
<version>11.1.0-SNAPSHOT</version>
13+
<version>11.1.2-SNAPSHOT</version>
1414
</parent>
1515

1616
<dependencies>

‎common-tools/clas-analysis/pom.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,63 +3,63 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>org.jlab.clas</groupId>
55
<artifactId>clas-analysis</artifactId>
6-
<version>11.1.0-SNAPSHOT</version>
6+
<version>11.1.2-SNAPSHOT</version>
77
<packaging>jar</packaging>
88

99
<parent>
1010
<groupId>org.jlab.clas</groupId>
1111
<artifactId>clas12rec</artifactId>
1212
<relativePath>../../parent/pom.xml</relativePath>
13-
<version>11.1.0-SNAPSHOT</version>
13+
<version>11.1.2-SNAPSHOT</version>
1414
</parent>
1515

1616
<dependencies>
1717
<dependency>
1818
<groupId>org.jlab.clas</groupId>
1919
<artifactId>clas-utils</artifactId>
20-
<version>11.1.0-SNAPSHOT</version>
20+
<version>11.1.2-SNAPSHOT</version>
2121
</dependency>
2222

2323
<dependency>
2424
<groupId>org.jlab.clas</groupId>
2525
<artifactId>clas-physics</artifactId>
26-
<version>11.1.0-SNAPSHOT</version>
26+
<version>11.1.2-SNAPSHOT</version>
2727
</dependency>
2828

2929
<dependency>
3030
<groupId>org.jlab.clas</groupId>
3131
<artifactId>clas-io</artifactId>
32-
<version>11.1.0-SNAPSHOT</version>
32+
<version>11.1.2-SNAPSHOT</version>
3333
</dependency>
3434

3535
<dependency>
3636
<groupId>org.jlab.clas</groupId>
3737
<artifactId>clas-geometry</artifactId>
38-
<version>11.1.0-SNAPSHOT</version>
38+
<version>11.1.2-SNAPSHOT</version>
3939
</dependency>
4040

4141
<dependency>
4242
<groupId>org.jlab.clas</groupId>
4343
<artifactId>clas-jcsg</artifactId>
44-
<version>11.1.0-SNAPSHOT</version>
44+
<version>11.1.2-SNAPSHOT</version>
4545
</dependency>
4646

4747
<dependency>
4848
<groupId>org.jlab.clas</groupId>
4949
<artifactId>swim-tools</artifactId>
50-
<version>11.1.0-SNAPSHOT</version>
50+
<version>11.1.2-SNAPSHOT</version>
5151
</dependency>
5252

5353
<dependency>
5454
<groupId>org.jlab.clas</groupId>
5555
<artifactId>clas-detector</artifactId>
56-
<version>11.1.0-SNAPSHOT</version>
56+
<version>11.1.2-SNAPSHOT</version>
5757
</dependency>
5858

5959
<dependency>
6060
<groupId>org.jlab.clas</groupId>
6161
<artifactId>clas-reco</artifactId>
62-
<version>11.1.0-SNAPSHOT</version>
62+
<version>11.1.2-SNAPSHOT</version>
6363
</dependency>
6464
</dependencies>
6565

‎common-tools/clas-analysis/src/main/java/org/jlab/analysis/efficiency/Truth.java‎

Lines changed: 46 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -34,40 +34,16 @@ public class Truth {
3434
long[][] recTallies;
3535
long[] mcTallies;
3636

37-
public static void main(String[] args) {
38-
OptionParser o = new OptionParser("trutheff");
39-
o.setRequiresInputList(true);
40-
o.parse(args);
41-
Truth t = new Truth(o.getInputList().get(0));
42-
t.add(o.getInputList());
43-
System.out.println(t.toTable());
44-
System.out.println(t.toJson());
45-
}
46-
4737
public Truth(SchemaFactory s) {
48-
init(s);
49-
}
50-
51-
public Truth(HipoReader r) {
52-
init(r.getSchemaFactory());
53-
}
54-
55-
public Truth(String filename) {
56-
HipoReader r = new HipoReader();
57-
r.open(filename);
58-
init(r.getSchemaFactory());
59-
}
60-
61-
private void init(SchemaFactory schema) {
6238
validPids = new ArrayList(NEGATIVES);
6339
validPids.addAll(POSITIVES);
6440
validPids.addAll(NEUTRALS);
6541
validPids.add(UDF);
6642
mcTallies = new long[validPids.size()];
6743
recTallies = new long[validPids.size()][validPids.size()];
68-
mcGenMatch = schema.getSchema("MC::GenMatch");
69-
mcParticle = schema.getSchema("MC::Particle");
70-
recParticle = schema.getSchema("REC::Particle");
44+
mcGenMatch = s.getSchema("MC::GenMatch");
45+
mcParticle = s.getSchema("MC::Particle");
46+
recParticle = s.getSchema("REC::Particle");
7147
}
7248

7349
/**
@@ -141,7 +117,7 @@ private TreeMap getMapping(Event e) {
141117
}
142118

143119
/**
144-
* Get efficiencies as a human-readable table.
120+
* Get efficiencies as a plain, human-readable table.
145121
* @return
146122
*/
147123
public String toTable() {
@@ -152,13 +128,12 @@ public String toTable() {
152128
if (validPids.size()==i+1) s.append("\n");
153129
}
154130
for (int i=0; i<validPids.size(); ++i) {
155-
s.append(String.format("%6d",validPids.get(i)));
131+
s.append(String.format("\n%6d",validPids.get(i)));
156132
for (int j=0; j<validPids.size(); ++j) {
157133
if (mcTallies[i] > 0)
158134
s.append(String.format("%7.4f",get(validPids.get(i),validPids.get(j))));
159135
else
160136
s.append(String.format("%7s","-"));
161-
if (validPids.size()==j+1) s.append("\n");
162137
}
163138
}
164139
return s.toString();
@@ -186,4 +161,44 @@ public JsonObject toJson() {
186161
ret.add("gens", gens);
187162
return ret;
188163
}
189-
}
164+
165+
/**
166+
* Get efficiencies as a Markdown table.
167+
* @return
168+
*/
169+
public String toMarkdown() {
170+
StringBuilder s = new StringBuilder();
171+
s.append("|");
172+
for (int i=0; i<validPids.size(); ++i) {
173+
s.append(String.format("%d|",validPids.get(i)));
174+
if (validPids.size()==i+1) s.append("\n");
175+
}
176+
s.append("|");
177+
for (int i=0; i<validPids.size(); ++i) s.append(" --- |");
178+
s.append("\n");
179+
for (int i=0; i<validPids.size(); ++i) {
180+
s.append(String.format("|%d|",validPids.get(i)));
181+
for (int j=0; j<validPids.size(); ++j) {
182+
if (mcTallies[i] > 0)
183+
s.append(String.format("%f|",get(validPids.get(i),validPids.get(j))));
184+
else
185+
s.append("|");
186+
}
187+
}
188+
return s.toString();
189+
}
190+
191+
public static void main(String[] args) {
192+
OptionParser o = new OptionParser("trutheff");
193+
o.setRequiresInputList(true);
194+
o.parse(args);
195+
HipoReader r = new HipoReader();
196+
r.open(o.getInputList().get(0));
197+
Truth t = new Truth(r.getSchemaFactory());
198+
t.add(o.getInputList());
199+
System.out.println(t.toTable());
200+
System.out.println(t.toJson());
201+
System.out.println(t.toMarkdown());
202+
}
203+
204+
}

‎common-tools/clas-detector/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>org.jlab.clas</groupId>
55
<artifactId>clas-detector</artifactId>
6-
<version>11.1.0-SNAPSHOT</version>
6+
<version>11.1.2-SNAPSHOT</version>
77
<packaging>jar</packaging>
88

99
<parent>
1010
<groupId>org.jlab.clas</groupId>
1111
<artifactId>clas12rec</artifactId>
1212
<relativePath>../../parent/pom.xml</relativePath>
13-
<version>11.1.0-SNAPSHOT</version>
13+
<version>11.1.2-SNAPSHOT</version>
1414
</parent>
1515

1616
<dependencies>
1717
<dependency>
1818
<groupId>org.jlab.clas</groupId>
1919
<artifactId>clas-utils</artifactId>
20-
<version>11.1.0-SNAPSHOT</version>
20+
<version>11.1.2-SNAPSHOT</version>
2121
</dependency>
2222

2323
<dependency>
@@ -29,13 +29,13 @@
2929
<dependency>
3030
<groupId>org.jlab.clas</groupId>
3131
<artifactId>clas-io</artifactId>
32-
<version>11.1.0-SNAPSHOT</version>
32+
<version>11.1.2-SNAPSHOT</version>
3333
</dependency>
3434

3535
<dependency>
3636
<groupId>org.jlab.clas</groupId>
3737
<artifactId>clas-geometry</artifactId>
38-
<version>11.1.0-SNAPSHOT</version>
38+
<version>11.1.2-SNAPSHOT</version>
3939
</dependency>
4040
</dependencies>
4141

‎common-tools/clas-geometry/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>org.jlab.clas</groupId>
55
<artifactId>clas-geometry</artifactId>
6-
<version>11.1.0-SNAPSHOT</version>
6+
<version>11.1.2-SNAPSHOT</version>
77
<packaging>jar</packaging>
88

99
<parent>
1010
<groupId>org.jlab.clas</groupId>
1111
<artifactId>clas12rec</artifactId>
1212
<relativePath>../../parent/pom.xml</relativePath>
13-
<version>11.1.0-SNAPSHOT</version>
13+
<version>11.1.2-SNAPSHOT</version>
1414
</parent>
1515

1616
<dependencies>

‎common-tools/clas-io/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>org.jlab.clas</groupId>
55
<artifactId>clas-io</artifactId>
6-
<version>11.1.0-SNAPSHOT</version>
6+
<version>11.1.2-SNAPSHOT</version>
77
<packaging>jar</packaging>
88

99
<parent>
1010
<groupId>org.jlab.clas</groupId>
1111
<artifactId>clas12rec</artifactId>
1212
<relativePath>../../parent/pom.xml</relativePath>
13-
<version>11.1.0-SNAPSHOT</version>
13+
<version>11.1.2-SNAPSHOT</version>
1414
</parent>
1515

1616
<dependencies>
@@ -90,13 +90,13 @@
9090
<dependency>
9191
<groupId>org.jlab.clas</groupId>
9292
<artifactId>clas-utils</artifactId>
93-
<version>11.1.0-SNAPSHOT</version>
93+
<version>11.1.2-SNAPSHOT</version>
9494
</dependency>
9595

9696
<dependency>
9797
<groupId>org.jlab.clas</groupId>
9898
<artifactId>clas-logging</artifactId>
99-
<version>11.1.0-SNAPSHOT</version>
99+
<version>11.1.2-SNAPSHOT</version>
100100
<scope>compile</scope>
101101
</dependency>
102102

‎common-tools/clas-jcsg/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>org.jlab.clas</groupId>
55
<artifactId>clas-jcsg</artifactId>
6-
<version>11.1.0-SNAPSHOT</version>
6+
<version>11.1.2-SNAPSHOT</version>
77
<packaging>jar</packaging>
88

99
<parent>
1010
<groupId>org.jlab.clas</groupId>
1111
<artifactId>clas12rec</artifactId>
1212
<relativePath>../../parent/pom.xml</relativePath>
13-
<version>11.1.0-SNAPSHOT</version>
13+
<version>11.1.2-SNAPSHOT</version>
1414
</parent>
1515

1616
<dependencies>
@@ -27,12 +27,12 @@
2727
<dependency>
2828
<groupId>org.jlab.clas</groupId>
2929
<artifactId>clas-geometry</artifactId>
30-
<version>11.1.0-SNAPSHOT</version>
30+
<version>11.1.2-SNAPSHOT</version>
3131
</dependency>
3232
<dependency>
3333
<groupId>org.jlab.clas</groupId>
3434
<artifactId>clas-detector</artifactId>
35-
<version>11.1.0-SNAPSHOT</version>
35+
<version>11.1.2-SNAPSHOT</version>
3636
</dependency>
3737
<dependency>
3838
<groupId>java3d</groupId>

‎common-tools/clas-logging/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>org.jlab.clas</groupId>
55
<artifactId>clas-logging</artifactId>
6-
<version>11.1.0-SNAPSHOT</version>
6+
<version>11.1.2-SNAPSHOT</version>
77
<packaging>jar</packaging>
88

99
<parent>
1010
<groupId>org.jlab.clas</groupId>
1111
<artifactId>clas12rec</artifactId>
1212
<relativePath>../../parent/pom.xml</relativePath>
13-
<version>11.1.0-SNAPSHOT</version>
13+
<version>11.1.2-SNAPSHOT</version>
1414
</parent>
1515

1616
</project>

0 commit comments

Comments
 (0)