Skip to content

Commit bc57ce1

Browse files
baltzelltongtongcao
baltzell
authored and
tongtongcao
committed
switch to rg-d (#891)
1 parent eba60c1 commit bc57ce1

File tree

4 files changed

+98
-5
lines changed

4 files changed

+98
-5
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ jobs:
4242
path: |
4343
clas_005038.evio.00000
4444
clas_021559.evio.00001
45+
clas_018779.evio.00001
4546
lookup-only: true
4647
- name: install xrootd-client
4748
if: ${{ steps.cache.outputs.cache-hit != 'true' }}
@@ -53,6 +54,7 @@ jobs:
5354
run: |
5455
xrdcp xroot://sci-xrootd.jlab.org///osgpool/hallb/clas12/validation/clas_005038.evio.00000 ./
5556
xrdcp xroot://sci-xrootd.jlab.org///osgpool/hallb/clas12/validation/raw/rg-l/clas_021559.evio.00001 ./
57+
xrdcp xroot://sci-xrootd.jlab.org///osgpool/hallb/clas12/validation/raw/rg-d/clas_018779.evio.00001 ./
5658
5759
# build
5860
#############################################################################
@@ -157,6 +159,7 @@ jobs:
157159
path: |
158160
clas_005038.evio.00000
159161
clas_021559.evio.00001
162+
clas_018779.evio.00001
160163
- name: untar build
161164
run: tar xzvf coatjava.tar.gz
162165
- name: run test
@@ -189,13 +192,14 @@ jobs:
189192
path: |
190193
clas_005038.evio.00000
191194
clas_021559.evio.00001
195+
clas_018779.evio.00001
192196
- name: untar build
193197
run: |
194198
tar xzvf clara.tar.gz
195199
- name: run test
196200
run: |
197201
ls -lhtr
198-
./clara/plugins/clas12/bin/run-clara -y ./etc/services/rgl-clarode.yml -t ${{ env.nthreads }} -n 200 -c ./clara -o ./tmp ./clas_021559.evio.00001
202+
./bin/run-clara -y ./etc/services/rgd-clarode.yml -t 4 -n 500 -c ./clara -o ./tmp ./clas_018779.evio.00001
199203
ls -lhtr
200204
201205
test_coatjava:

‎.gitlab-ci.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,14 @@ download:
4545
script:
4646
- xrdcp xroot://sci-xrootd.jlab.org///osgpool/hallb/clas12/validation/clas_005038.evio.00000 ./
4747
- xrdcp xroot://sci-xrootd.jlab.org///osgpool/hallb/clas12/validation/raw/rg-l/clas_021559.evio.00001 ./
48+
- xrdcp xroot://sci-xrootd.jlab.org///osgpool/hallb/clas12/validation/raw/rg-d/clas_018779.evio.00001 ./
4849
artifacts:
4950
when: always
5051
expire_in: 1 day
5152
paths:
5253
- clas_005038.evio.00000
53-
- clas_021559.evio.00000
54+
- clas_021559.evio.00001
55+
- clas_018779.evio.00001
5456

5557
spotbugs:
5658
stage: test
@@ -123,8 +125,8 @@ clara:
123125
- >
124126
tar -xzf clara.tar.gz &&
125127
./clara/plugins/clas12/bin/run-clara -c ./clara
126-
-t $JL_RUNNER_AVAIL_CPU -y ./etc/services/rgl-clarode.yml
127-
-n 100 -o ./out clas_021*.hipo
128+
-t $JL_RUNNER_AVAIL_CPU -y ./etc/services/rgd-clarode.yml
129+
-n 100 -o ./out clas_018779.evio.00001
128130
129131
profile:
130132
stage: test

‎bin/run-clara‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ do
3434
c) CLARA_HOME=$OPTARG ;;
3535
t) threads=$OPTARG && echo $threads | grep -q -E '^[0-9]+$' || error "-t must be an integer, threads" ;;
3636
n) nevents="-e $OPTARG" && echo "$nevents" | grep -q -E '^-e [0-9]+$' || error "-n must be an integer, events" ;;
37+
g) memory_gb="-e $OPTARG" && echo "$memory_gb" | grep -q -E '^-e [0-9]+$' || error "-g must be an integer, GB of memory" ;;
3738
m) merge=1 ;;
3839
q) quiet=1 ;;
3940
h) echo -e "\n$usage" && echo -e $info && exit 0 ;;
@@ -42,6 +43,9 @@ done
4243
shift $((OPTIND-1))
4344
inputs=$@
4445

46+
# Configure JVM -Xmx memory setting:
47+
[ -z ${memory_gb+x} ] && memory_gb=$((threads+2))
48+
4549
# Check configuration:
4650
[ $# -lt 1 ] && error "Input data files are required"
4751
[ -z ${yaml+x} ] && error "-y YAML is required"
@@ -72,7 +76,7 @@ done
7276
[ $(cat $CLARA_USER_DATA/filelist.txt | wc -l) -gt 0 ] || error "Found no input files"
7377

7478
# Set some JVM options:
75-
export JAVA_OPTS="$JAVA_OPTS -Xmx${threads}g -XX:+IgnoreUnrecognizedVMOptions"
79+
export JAVA_OPTS="$JAVA_OPTS -Xmx${memory_gb}g -XX:+IgnoreUnrecognizedVMOptions"
7680
export JAVA_OPTS="$JAVA_OPTS -Djava.io.tmpdir=$CLARA_USER_DATA -Dorg.sqlite.tmpdir=$CLARA_USER_DATA"
7781
# Set verbosity:
7882
[ -z ${quiet+x} ] && stub=fine || stub=info

‎etc/services/rgd-clarode.yml‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
mime-types:
2+
- binary/data-hipo
3+
configuration:
4+
global:
5+
dcrbJitter: "true"
6+
variation: rgd_fall2023
7+
io-services:
8+
writer:
9+
schema_dir: dst
10+
services:
11+
MAGFIELDS:
12+
magfieldSolenoidMap: Symm_solenoid_r601_phi1_z1201_13June2018.dat
13+
magfieldTorusMap: Full_torus_r251_phi181_z251_25Jan2021.dat
14+
DCCR:
15+
rawBankGroup: "NOISE1"
16+
MLTD:
17+
run: "18305"
18+
DCHAI:
19+
outputBankPrefix: "HB"
20+
io-services:
21+
reader:
22+
class: org.jlab.io.clara.DecoderReader
23+
name: DecoderReader
24+
writer:
25+
class: org.jlab.io.clara.DecoderWriter
26+
name: DecoderWriter
27+
services:
28+
- class: org.jlab.service.ai.DCDenoiseEngine
29+
name: DCDN
30+
- class: org.jlab.clas.swimtools.MagFieldsEngine
31+
name: MAGFIELDS
32+
- class: org.jlab.rec.ft.cal.FTCALEngine
33+
name: FTCAL
34+
- class: org.jlab.rec.ft.hodo.FTHODOEngine
35+
name: FTHODO
36+
- class: org.jlab.rec.ft.trk.FTTRKEngine
37+
name: FTTRK
38+
- class: org.jlab.rec.ft.FTEBEngine
39+
name: FTEB
40+
- class: org.jlab.service.raster.RasterEngine
41+
name: RASTER
42+
- class: org.jlab.service.dc.DCHBClustering
43+
name: DCCR
44+
- class: org.jlab.service.mltn.MLTDEngine
45+
name: MLTD
46+
- class: org.jlab.service.dc.DCHBPostClusterAI
47+
name: DCHAI
48+
- class: org.jlab.service.ftof.FTOFHBEngine
49+
name: FTOFHB
50+
- class: org.jlab.service.ec.ECEngine
51+
name: EC
52+
- class: org.jlab.rec.cvt.services.CVTEngine
53+
name: CVTFP
54+
- class: org.jlab.service.ctof.CTOFEngine
55+
name: CTOF
56+
- class: org.jlab.service.cnd.CNDCalibrationEngine
57+
name: CND
58+
- class: org.jlab.service.band.BANDEngine
59+
name: BAND
60+
- class: org.jlab.service.htcc.HTCCReconstructionService
61+
name: HTCC
62+
- class: org.jlab.service.ltcc.LTCCEngine
63+
name: LTCC
64+
- class: org.jlab.service.eb.EBHBEngine
65+
name: EBHB
66+
- class: org.jlab.service.dc.DCTBEngine
67+
name: DCTB
68+
- class: org.jlab.service.fmt.FMTEngine
69+
name: FMT
70+
- class: org.jlab.rec.cvt.services.CVTSecondPassEngine
71+
name: CVTSP
72+
- class: org.jlab.service.ftof.FTOFTBEngine
73+
name: FTOFTB
74+
- class: org.jlab.service.eb.EBTBEngine
75+
name: EBTB
76+
- class: org.jlab.rec.rich.RICHEBEngine
77+
name: RICH
78+
- class: org.jlab.service.rtpc.RTPCEngine
79+
name: RTPC
80+
- class: org.jlab.rec.service.vtx.VTXEngine
81+
name: VTX
82+
- class: org.jlab.calibration.service.CalibBanksEngine
83+
name: CALIB

0 commit comments

Comments
 (0)