Skip to content

Commit 1294708

Browse files
ftouchteftouchte
authored
Merge branch 'development' into clean/hits
2 parents df36e4c + d965c49 commit 1294708

95 files changed

Lines changed: 5549 additions & 605 deletions

File tree

Some content is hidden

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

‎.github/workflows/ci.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ jobs:
9393
run: |
9494
tar czvf coatjava.tar.gz coatjava
9595
tar czvf clara.tar.gz clara
96-
- uses: actions/upload-artifact@v6
96+
- uses: actions/upload-artifact@v7
9797
with:
9898
name: build_${{ matrix.runner }}
9999
retention-days: 1
@@ -138,7 +138,7 @@ jobs:
138138
run: validation/jacoco-aggregate.sh
139139
- name: publish jacoco report
140140
if: ${{ matrix.JAVA_VERSION == env.JAVA_VERSION }}
141-
uses: actions/upload-artifact@v6
141+
uses: actions/upload-artifact@v7
142142
with:
143143
name: jacoco_report
144144
path: publish/
@@ -158,7 +158,7 @@ jobs:
158158
- uses: cvmfs-contrib/github-action-cvmfs@v5
159159
with:
160160
cvmfs_repositories: 'oasis.opensciencegrid.org'
161-
- uses: actions/download-artifact@v7
161+
- uses: actions/download-artifact@v8
162162
with:
163163
name: build_ubuntu-latest
164164
- name: untar build
@@ -180,7 +180,7 @@ jobs:
180180
- uses: cvmfs-contrib/github-action-cvmfs@v5
181181
with:
182182
cvmfs_repositories: 'oasis.opensciencegrid.org'
183-
- uses: actions/download-artifact@v7
183+
- uses: actions/download-artifact@v8
184184
with:
185185
name: build_ubuntu-latest
186186
- uses: actions/cache/restore@v5
@@ -212,7 +212,7 @@ jobs:
212212
uses: cvmfs-contrib/github-action-cvmfs@v5
213213
with:
214214
cvmfs_repositories: 'oasis.opensciencegrid.org'
215-
- uses: actions/download-artifact@v7
215+
- uses: actions/download-artifact@v8
216216
with:
217217
name: build_ubuntu-latest
218218
- uses: actions/cache/restore@v5
@@ -262,7 +262,7 @@ jobs:
262262
java-version: ${{ env.JAVA_VERSION }}
263263
distribution: ${{ env.java_distribution }}
264264
cache: maven
265-
- uses: actions/download-artifact@v7
265+
- uses: actions/download-artifact@v8
266266
with:
267267
name: build_${{ matrix.runner }}
268268
- uses: cvmfs-contrib/github-action-cvmfs@v5
@@ -295,7 +295,7 @@ jobs:
295295
uses: wtfjoke/setup-groovy@v3
296296
with:
297297
groovy-version: ${{ env.groovy_version }}
298-
- uses: actions/download-artifact@v7
298+
- uses: actions/download-artifact@v8
299299
with:
300300
name: build_ubuntu-latest
301301
- name: untar build
@@ -318,7 +318,7 @@ jobs:
318318
run: docs/mkdocs/generate.sh pages
319319
### jacoco
320320
- name: download jacoco report artifact
321-
uses: actions/download-artifact@v7
321+
uses: actions/download-artifact@v8
322322
with:
323323
name: jacoco_report
324324
path: pages/jacoco
@@ -371,7 +371,7 @@ jobs:
371371
TAG_NAME: ${{ github.ref_name }}
372372
steps:
373373
- uses: actions/checkout@v6
374-
- uses: actions/download-artifact@v7
374+
- uses: actions/download-artifact@v8
375375
with:
376376
name: build_ubuntu-latest
377377
- name: rename artifact

‎bin/install-clara‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
set -e
44

55
# Default versions:
6-
grapes=2.21
6+
grapes=2.24
77
clara=5.0.2
88

99
function error() {
@@ -62,8 +62,7 @@ function build_clara {
6262
}
6363

6464
function build_grapes {
65-
#git clone --branch $grapes --depth 1 https://code.jlab.org/hallb/clas12/coatjava/grapes
66-
git clone --depth 1 https://code.jlab.org/hallb/clas12/coatjava/grapes
65+
git clone --depth 1 --branch $grapes https://github.com/jeffersonlab/grapes
6766
cd grapes && mvn package && cd -
6867
}
6968

‎build-coatjava.sh‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -311,10 +311,6 @@ cp -r libexec $prefix_dir/
311311
which python3 >& /dev/null && python=python3 || python=python
312312
$python etc/bankdefs/util/bankSplit.py $prefix_dir/etc/bankdefs/hipo4 || exit 1
313313

314-
# FIXME: this is still needed by one of the tests
315-
mkdir -p $prefix_dir/lib/utils
316-
cp external-dependencies/jclara-4.3-SNAPSHOT.jar $prefix_dir/lib/utils
317-
318314
# build (and test)
319315
unset CLAS12DIR
320316
if $runUnitTests; then
@@ -359,6 +355,11 @@ for pom in $(find common-tools -name pom.xml); do
359355
# install_jars $pom $prefix_dir/lib/services
360356
fi
361357
done
358+
359+
# install CLARA jar in separate directory:
360+
mvn org.apache.maven.plugins:maven-dependency-plugin:3.10.0:copy \
361+
-Dartifact=org.jlab.coda:jclara:4.3:jar -DoutputDirectory=$prefix_dir/lib/utils -DstripVersion=false
362+
362363
echo "installed coatjava to: $prefix_dir"
363364

364365
# install clara

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44

55
<groupId>org.jlab.clas</groupId>
66
<artifactId>clara-io</artifactId>
7-
<version>13.7.1-SNAPSHOT</version>
7+
<version>13.8.1-SNAPSHOT</version>
88
<packaging>jar</packaging>
99

1010
<parent>
1111
<groupId>org.jlab.clas</groupId>
1212
<artifactId>common-tools</artifactId>
13-
<version>13.7.1-SNAPSHOT</version>
13+
<version>13.8.1-SNAPSHOT</version>
1414
</parent>
1515

1616
<dependencies>
@@ -44,25 +44,25 @@
4444
<dependency>
4545
<groupId>org.jlab.clas</groupId>
4646
<artifactId>clas-io</artifactId>
47-
<version>13.7.1-SNAPSHOT</version>
47+
<version>13.8.1-SNAPSHOT</version>
4848
</dependency>
4949

5050
<dependency>
5151
<groupId>org.jlab.clas</groupId>
5252
<artifactId>clas-detector</artifactId>
53-
<version>13.7.1-SNAPSHOT</version>
53+
<version>13.8.1-SNAPSHOT</version>
5454
</dependency>
5555

5656
<dependency>
5757
<groupId>org.jlab.clas</groupId>
5858
<artifactId>clas-analysis</artifactId>
59-
<version>13.7.1-SNAPSHOT</version>
59+
<version>13.8.1-SNAPSHOT</version>
6060
</dependency>
6161

6262
<dependency>
6363
<groupId>org.jlab.clas</groupId>
6464
<artifactId>clas-utils</artifactId>
65-
<version>13.7.1-SNAPSHOT</version>
65+
<version>13.8.1-SNAPSHOT</version>
6666
</dependency>
6767

6868
<dependency>

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44

55
<groupId>org.jlab.clas</groupId>
66
<artifactId>clas-analysis</artifactId>
7-
<version>13.7.1-SNAPSHOT</version>
7+
<version>13.8.1-SNAPSHOT</version>
88
<packaging>jar</packaging>
99

1010
<parent>
1111
<groupId>org.jlab.clas</groupId>
1212
<artifactId>common-tools</artifactId>
13-
<version>13.7.1-SNAPSHOT</version>
13+
<version>13.8.1-SNAPSHOT</version>
1414
</parent>
1515

1616
<dependencies>
@@ -38,49 +38,49 @@
3838
<dependency>
3939
<groupId>org.jlab.clas</groupId>
4040
<artifactId>clas-utils</artifactId>
41-
<version>13.7.1-SNAPSHOT</version>
41+
<version>13.8.1-SNAPSHOT</version>
4242
</dependency>
4343

4444
<dependency>
4545
<groupId>org.jlab.clas</groupId>
4646
<artifactId>clas-physics</artifactId>
47-
<version>13.7.1-SNAPSHOT</version>
47+
<version>13.8.1-SNAPSHOT</version>
4848
</dependency>
4949

5050
<dependency>
5151
<groupId>org.jlab.clas</groupId>
5252
<artifactId>clas-io</artifactId>
53-
<version>13.7.1-SNAPSHOT</version>
53+
<version>13.8.1-SNAPSHOT</version>
5454
</dependency>
5555

5656
<dependency>
5757
<groupId>org.jlab.clas</groupId>
5858
<artifactId>clas-geometry</artifactId>
59-
<version>13.7.1-SNAPSHOT</version>
59+
<version>13.8.1-SNAPSHOT</version>
6060
</dependency>
6161

6262
<dependency>
6363
<groupId>org.jlab.clas</groupId>
6464
<artifactId>clas-jcsg</artifactId>
65-
<version>13.7.1-SNAPSHOT</version>
65+
<version>13.8.1-SNAPSHOT</version>
6666
</dependency>
6767

6868
<dependency>
6969
<groupId>org.jlab.clas</groupId>
7070
<artifactId>clas-detector</artifactId>
71-
<version>13.7.1-SNAPSHOT</version>
71+
<version>13.8.1-SNAPSHOT</version>
7272
</dependency>
7373

7474
<dependency>
7575
<groupId>org.jlab.clas</groupId>
7676
<artifactId>clas-reco</artifactId>
77-
<version>13.7.1-SNAPSHOT</version>
77+
<version>13.8.1-SNAPSHOT</version>
7878
</dependency>
7979

8080
<dependency>
8181
<groupId>org.jlab.clas</groupId>
8282
<artifactId>swim-tools</artifactId>
83-
<version>13.7.1-SNAPSHOT</version>
83+
<version>13.8.1-SNAPSHOT</version>
8484
</dependency>
8585

8686
</dependencies>

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44

55
<groupId>org.jlab.clas</groupId>
66
<artifactId>clas-decay-tools</artifactId>
7-
<version>13.7.1-SNAPSHOT</version>
7+
<version>13.8.1-SNAPSHOT</version>
88
<packaging>jar</packaging>
99

1010
<parent>
1111
<groupId>org.jlab.clas</groupId>
1212
<artifactId>common-tools</artifactId>
13-
<version>13.7.1-SNAPSHOT</version>
13+
<version>13.8.1-SNAPSHOT</version>
1414
</parent>
1515

1616
<dependencies>
@@ -21,54 +21,54 @@
2121
<dependency>
2222
<groupId>org.jlab.clas</groupId>
2323
<artifactId>swim-tools</artifactId>
24-
<version>13.7.1-SNAPSHOT</version>
24+
<version>13.8.1-SNAPSHOT</version>
2525
<type>jar</type>
2626
</dependency>
2727
<dependency>
2828
<groupId>cnuphys</groupId>
2929
<artifactId>swimmer</artifactId>
30-
<version>13.7.1-SNAPSHOT</version>
30+
<version>13.8.1-SNAPSHOT</version>
3131
</dependency>
3232
<dependency>
3333
<groupId>cnuphys</groupId>
3434
<artifactId>magfield</artifactId>
35-
<version>13.7.1-SNAPSHOT</version>
35+
<version>13.8.1-SNAPSHOT</version>
3636
</dependency>
3737
<dependency>
3838
<groupId>org.jlab.clas12.detector</groupId>
3939
<artifactId>clas12detector-vtx</artifactId>
40-
<version>13.7.1-SNAPSHOT</version>
40+
<version>13.8.1-SNAPSHOT</version>
4141
<type>jar</type>
4242
</dependency>
4343
<dependency>
4444
<groupId>org.jlab.clas</groupId>
4545
<artifactId>clas-reco</artifactId>
46-
<version>13.7.1-SNAPSHOT</version>
46+
<version>13.8.1-SNAPSHOT</version>
4747
</dependency>
4848
<dependency>
4949
<groupId>org.jlab.clas</groupId>
5050
<artifactId>clas-utils</artifactId>
51-
<version>13.7.1-SNAPSHOT</version>
51+
<version>13.8.1-SNAPSHOT</version>
5252
</dependency>
5353
<dependency>
5454
<groupId>org.jlab.clas</groupId>
5555
<artifactId>clas-detector</artifactId>
56-
<version>13.7.1-SNAPSHOT</version>
56+
<version>13.8.1-SNAPSHOT</version>
5757
</dependency>
5858
<dependency>
5959
<groupId>org.jlab.clas</groupId>
6060
<artifactId>clas-io</artifactId>
61-
<version>13.7.1-SNAPSHOT</version>
61+
<version>13.8.1-SNAPSHOT</version>
6262
</dependency>
6363
<dependency>
6464
<groupId>org.jlab.clas</groupId>
6565
<artifactId>clas-physics</artifactId>
66-
<version>13.7.1-SNAPSHOT</version>
66+
<version>13.8.1-SNAPSHOT</version>
6767
</dependency>
6868
<dependency>
6969
<groupId>org.jlab.clas</groupId>
7070
<artifactId>clas-geometry</artifactId>
71-
<version>13.7.1-SNAPSHOT</version>
71+
<version>13.8.1-SNAPSHOT</version>
7272
</dependency>
7373
</dependencies>
7474
</project>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44

55
<groupId>org.jlab.clas</groupId>
66
<artifactId>clas-detector</artifactId>
7-
<version>13.7.1-SNAPSHOT</version>
7+
<version>13.8.1-SNAPSHOT</version>
88
<packaging>jar</packaging>
99

1010
<parent>
1111
<groupId>org.jlab.clas</groupId>
1212
<artifactId>common-tools</artifactId>
13-
<version>13.7.1-SNAPSHOT</version>
13+
<version>13.8.1-SNAPSHOT</version>
1414
</parent>
1515

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

2323
<dependency>
@@ -43,19 +43,19 @@
4343
<dependency>
4444
<groupId>org.jlab.clas</groupId>
4545
<artifactId>clas-io</artifactId>
46-
<version>13.7.1-SNAPSHOT</version>
46+
<version>13.8.1-SNAPSHOT</version>
4747
</dependency>
4848

4949
<dependency>
5050
<groupId>org.jlab.clas</groupId>
5151
<artifactId>clas-geometry</artifactId>
52-
<version>13.7.1-SNAPSHOT</version>
52+
<version>13.8.1-SNAPSHOT</version>
5353
</dependency>
5454

5555
<dependency>
5656
<groupId>org.jlab.clas</groupId>
5757
<artifactId>clas-logging</artifactId>
58-
<version>13.7.1-SNAPSHOT</version>
58+
<version>13.8.1-SNAPSHOT</version>
5959
</dependency>
6060

6161
<dependency>

‎common-tools/clas-detector/src/main/java/org/jlab/detector/base/DetectorType.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ public enum DetectorType {
3434
AHDC (24, "AHDC"),
3535
ATOF (25, "ATOF"),
3636
RECOIL (26, "RECOIL"),
37+
MUCAL (28, "MUCAL"),
38+
MUVT (29, "MUVT"),
39+
MURT (30, "MURT"),
40+
MURH (31, "MURH"),
3741
TARGET (100, "TARGET"),
3842
MAGNETS (101, "MAGNETS");
3943

0 commit comments

Comments
 (0)