Skip to content

Commit 0c55600

Browse files
baltzellbaltzell
committed
Merge branch 'development' into occupancy
2 parents e93a9f4 + 2252c31 commit 0c55600

61 files changed

Lines changed: 464 additions & 451 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: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
runs-on: macos-latest
6262
steps:
6363
- uses: actions/checkout@v7
64-
- uses: actions/setup-java@v6.0.0
64+
- uses: actions/setup-java@v6.0.1
6565
with:
6666
java-version: ${{ env.JAVA_VERSION }}
6767
distribution: ${{ env.java_distribution }}
@@ -72,7 +72,7 @@ jobs:
7272
- name: build
7373
run: |
7474
./build-coatjava.sh --lfs --no-progress -T${{ env.nthreads }}
75-
./bin/install-clara -b -c ./coatjava ./clara
75+
./bin/install-clara -c ./coatjava ./clara
7676
- name: tar # tarball to preserve permissions
7777
run: |
7878
tar czvf coatjava.tar.gz coatjava
@@ -91,7 +91,7 @@ jobs:
9191
runs-on: ubuntu-latest
9292
steps:
9393
- uses: actions/checkout@v7
94-
- uses: actions/setup-java@v6.0.0
94+
- uses: actions/setup-java@v6.0.1
9595
with:
9696
java-version: ${{ env.JAVA_VERSION }}
9797
distribution: ${{ env.java_distribution }}
@@ -102,7 +102,7 @@ jobs:
102102
- name: build
103103
run: |
104104
./build-coatjava.sh --lfs --no-progress -T${{ env.nthreads }}
105-
./bin/install-clara -b -c ./coatjava ./clara
105+
./bin/install-clara -c ./coatjava ./clara
106106
- name: tar # tarball to preserve permissions
107107
run: |
108108
tar czvf coatjava.tar.gz coatjava
@@ -137,7 +137,7 @@ jobs:
137137
runs-on: ubuntu-latest
138138
steps:
139139
- uses: actions/checkout@v7
140-
- uses: actions/setup-java@v6.0.0
140+
- uses: actions/setup-java@v6.0.1
141141
with:
142142
java-version: ${{ matrix.JAVA_VERSION }}
143143
distribution: ${{ env.java_distribution }}
@@ -161,7 +161,7 @@ jobs:
161161
steps:
162162
- uses: actions/checkout@v7
163163
- name: Set up JDK
164-
uses: actions/setup-java@v6.0.0
164+
uses: actions/setup-java@v6.0.1
165165
with:
166166
java-version: ${{ env.JAVA_VERSION }}
167167
distribution: ${{ env.java_distribution }}
@@ -180,7 +180,7 @@ jobs:
180180
steps:
181181
- uses: actions/checkout@v7
182182
- name: Set up JDK
183-
uses: actions/setup-java@v6.0.0
183+
uses: actions/setup-java@v6.0.1
184184
with:
185185
java-version: ${{ env.JAVA_VERSION }}
186186
distribution: ${{ env.java_distribution }}
@@ -209,7 +209,7 @@ jobs:
209209
steps:
210210
- uses: actions/checkout@v7
211211
- name: Set up JDK
212-
uses: actions/setup-java@v6.0.0
212+
uses: actions/setup-java@v6.0.1
213213
with:
214214
java-version: ${{ env.JAVA_VERSION }}
215215
distribution: ${{ env.java_distribution }}
@@ -267,7 +267,7 @@ jobs:
267267
steps:
268268
- uses: actions/checkout@v7
269269
- name: Set up JDK
270-
uses: actions/setup-java@v6.0.0
270+
uses: actions/setup-java@v6.0.1
271271
with:
272272
java-version: ${{ env.JAVA_VERSION }}
273273
distribution: ${{ env.java_distribution }}
@@ -295,7 +295,7 @@ jobs:
295295
steps:
296296
- uses: actions/checkout@v7
297297
- name: Set up JDK
298-
uses: actions/setup-java@v6.0.0
298+
uses: actions/setup-java@v6.0.1
299299
with:
300300
java-version: ${{ env.JAVA_VERSION }}
301301
distribution: ${{ env.java_distribution }}
@@ -320,7 +320,7 @@ jobs:
320320
steps:
321321
- uses: actions/checkout@v7
322322
- name: Set up JDK
323-
uses: actions/setup-java@v6.0.0
323+
uses: actions/setup-java@v6.0.1
324324
with:
325325
java-version: ${{ env.JAVA_VERSION }}
326326
distribution: ${{ env.java_distribution }}
@@ -343,7 +343,7 @@ jobs:
343343
steps:
344344
- uses: actions/checkout@v7
345345
- name: Set up JDK
346-
uses: actions/setup-java@v6.0.0
346+
uses: actions/setup-java@v6.0.1
347347
with:
348348
java-version: ${{ env.JAVA_VERSION }}
349349
distribution: ${{ env.java_distribution }}
@@ -384,7 +384,7 @@ jobs:
384384
path: pages/jacoco
385385
### javadoc
386386
- name: set up JDK
387-
uses: actions/setup-java@v6.0.0
387+
uses: actions/setup-java@v6.0.1
388388
with:
389389
java-version: ${{ env.JAVA_VERSION }}
390390
distribution: ${{ env.java_distribution }}

‎bin/install-clara‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,12 @@ trap cleanup EXIT
7171
# Configure:
7272
debug=0
7373
args=()
74-
usage="Usage: install-clara [-v] [-b] [-c COATJAVA] [-f CLARA] [-g GRAPES] PATH"
74+
usage="Usage: install-clara [-v] [-c COATJAVA] [-f CLARA] [-g GRAPES] PATH"
7575
info="""
7676
- The default CLARA / GRAPES versions are $clara / $grapes
7777
- COATJAVA can also be specified as a local installation directory
7878
- If the COATJAVA version is not specified, it will try to auto-detect it.
79-
- [-v adds verbosity and disables cleanup]
80-
- [-b builds clara from source]"""
79+
- [-v adds verbosity and disables cleanup]"""
8180

8281
while [[ $# -gt 0 ]]
8382
do
@@ -86,7 +85,6 @@ do
8685
-f) clara="$2" && shift && shift ;;
8786
-c) coatjava="$2" && shift && shift ;;
8887
-g) grapes="$2" && shift && shift ;;
89-
-b) build=1 && shift ;;
9088
-v) let debug=$debug+1 && shift ;;
9189
-*|--*) echo -e "$usage\n\nUnknown option: $1" && exit 1 ;;
9290
*) args+=("$1") && shift ;;
@@ -126,14 +124,8 @@ tmp_dir=$(cd $tmp_dir && pwd)
126124
cd $tmp_dir
127125

128126
# CLARA:
129-
if ! [ -z ${build+x} ]
130-
then
131-
echo -e "\nBuilding CLARA from source ..."
132-
build_clara $PWD/clara-cre
133-
else
134-
echo -e "\nRetrieving CLARA version $clara ..."
135-
get https://clasweb.jlab.org/clas12offline/distribution/clara/clara-cre-$clara.tar.gz
136-
fi
127+
echo -e "\nBuilding CLARA from source ..."
128+
build_clara $PWD/clara-cre
137129

138130
# COATJAVA:
139131
if ! compgen -G "$coatjava/lib/clas/coat-libs-*.jar" > /dev/null

‎bin/run-groovy‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
11
#!/bin/bash
22

33
. `dirname $0`/../libexec/env.sh groovy
4-
5-
echo """
6-
****************************************
7-
* Running COATJAVA Groovy Script *
8-
****************************************
9-
"""
10-
114
groovy -cp "$JYPATH" "$@"

‎build-coatjava.sh‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ do
8080
--https) auxRetrieval=https ;;
8181
--wipe) auxRetrieval=wipe ;;
8282
--no-aux|--noaux)
83+
auxRetrieval=noaux
8384
auxDownloadMaps=false
8485
auxDownloadNets=false
8586
auxDownloadSqlites=false
@@ -107,7 +108,7 @@ do
107108
esac
108109
done
109110

110-
echo "---------------------- ARGUMENTS ----------------------"
111+
echo "------------------ Configuration ----------------------"
111112
print_arg() {
112113
printf " %30s = " "$1"
113114
shift
@@ -206,6 +207,8 @@ case $auxRetrieval in
206207
;;
207208
https)
208209
;;
210+
noaux)
211+
;;
209212
*)
210213
echo "ERROR: data retrieval option \`--$auxRetrieval\` is not supported" >&2
211214
exit 1
@@ -354,7 +357,7 @@ $python etc/bankdefs/util/bankSplit.py $prefix_dir/etc/bankdefs/hipo4 || exit 1
354357

355358
# use maven to copy a CLARA jar to a separate directory:
356359
mvn org.apache.maven.plugins:maven-dependency-plugin:3.10.0:copy \
357-
-Dartifact=org.jlab.coda:jclara:4.3:jar -DoutputDirectory=$prefix_dir/lib/utils -DstripVersion=false
360+
-Dartifact=org.jlab.coda:jclara:6.0-SNAPSHOT:jar -DoutputDirectory=$prefix_dir/lib/utils -DstripVersion=false
358361

359362
# build (and test)
360363
unset CLAS12DIR

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

Lines changed: 5 additions & 5 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>14.2.0-SNAPSHOT</version>
7+
<version>14.2.1-SNAPSHOT</version>
88
<packaging>jar</packaging>
99

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

1616
<dependencies>
@@ -39,19 +39,19 @@
3939
<dependency>
4040
<groupId>org.jlab.clas</groupId>
4141
<artifactId>clas-io</artifactId>
42-
<version>14.2.0-SNAPSHOT</version>
42+
<version>14.2.1-SNAPSHOT</version>
4343
</dependency>
4444

4545
<dependency>
4646
<groupId>org.jlab.clas</groupId>
4747
<artifactId>clas-detector</artifactId>
48-
<version>14.2.0-SNAPSHOT</version>
48+
<version>14.2.1-SNAPSHOT</version>
4949
</dependency>
5050

5151
<dependency>
5252
<groupId>org.jlab.clas</groupId>
5353
<artifactId>clas-utils</artifactId>
54-
<version>14.2.0-SNAPSHOT</version>
54+
<version>14.2.1-SNAPSHOT</version>
5555
</dependency>
5656

5757
<dependency>

‎common-tools/clara-io/src/main/java/org/jlab/io/clara/Clas12Writer.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
import java.io.File;
44
import java.nio.file.Path;
55
import java.util.List;
6-
import java.util.TreeMap;
7-
import java.util.TreeSet;
86
import org.jlab.clara.std.services.EventWriterException;
97
import org.jlab.detector.calib.utils.ConstantsManager;
108
import org.jlab.detector.helicity.HelicitySequenceDelayed;

‎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>14.2.0-SNAPSHOT</version>
7+
<version>14.2.1-SNAPSHOT</version>
88
<packaging>jar</packaging>
99

1010
<parent>
1111
<groupId>org.jlab.clas</groupId>
1212
<artifactId>common-tools</artifactId>
13-
<version>14.2.0-SNAPSHOT</version>
13+
<version>14.2.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>14.2.0-SNAPSHOT</version>
41+
<version>14.2.1-SNAPSHOT</version>
4242
</dependency>
4343

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

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

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

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

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

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

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

8686
</dependencies>

0 commit comments

Comments
 (0)