Skip to content

switch test to rg-d #891

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
merged 5 commits into from
Oct 17, 2025
Merged

switch test to rg-d #891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
de80fbb
switch to rg-d
baltzell Oct 15, 2025
51984b9
add denoising
baltzell Oct 16, 2025
4a474d4
use all 4 available threads
baltzell Oct 16, 2025
5ddfe63
improve jvm memory settings
baltzell Oct 16, 2025
907086c
add missing services
baltzell Oct 17, 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
6 changes: 5 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ jobs:
path: |
clas_005038.evio.00000
clas_021559.evio.00001
clas_018779.evio.00001
lookup-only: true
- name: install xrootd-client
if: ${{ steps.cache.outputs.cache-hit != 'true' }}
Expand All @@ -53,6 +54,7 @@ jobs:
run: |
xrdcp xroot://sci-xrootd.jlab.org///osgpool/hallb/clas12/validation/clas_005038.evio.00000 ./
xrdcp xroot://sci-xrootd.jlab.org///osgpool/hallb/clas12/validation/raw/rg-l/clas_021559.evio.00001 ./
xrdcp xroot://sci-xrootd.jlab.org///osgpool/hallb/clas12/validation/raw/rg-d/clas_018779.evio.00001 ./

# build
#############################################################################
Expand Down Expand Up @@ -157,6 +159,7 @@ jobs:
path: |
clas_005038.evio.00000
clas_021559.evio.00001
clas_018779.evio.00001
- name: untar build
run: tar xzvf coatjava.tar.gz
- name: run test
Expand Down Expand Up @@ -189,13 +192,14 @@ jobs:
path: |
clas_005038.evio.00000
clas_021559.evio.00001
clas_018779.evio.00001
- name: untar build
run: |
tar xzvf clara.tar.gz
- name: run test
run: |
ls -lhtr
./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
./bin/run-clara -y ./etc/services/rgd-clarode.yml -t 4 -n 500 -c ./clara -o ./tmp ./clas_018779.evio.00001
ls -lhtr

test_coatjava:
Expand Down
8 changes: 5 additions & 3 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,14 @@ download:
script:
- xrdcp xroot://sci-xrootd.jlab.org///osgpool/hallb/clas12/validation/clas_005038.evio.00000 ./
- xrdcp xroot://sci-xrootd.jlab.org///osgpool/hallb/clas12/validation/raw/rg-l/clas_021559.evio.00001 ./
- xrdcp xroot://sci-xrootd.jlab.org///osgpool/hallb/clas12/validation/raw/rg-d/clas_018779.evio.00001 ./
artifacts:
when: always
expire_in: 1 day
paths:
- clas_005038.evio.00000
- clas_021559.evio.00000
- clas_021559.evio.00001
- clas_018779.evio.00001

spotbugs:
stage: test
Expand Down Expand Up @@ -123,8 +125,8 @@ clara:
- >
tar -xzf clara.tar.gz &&
./clara/plugins/clas12/bin/run-clara -c ./clara
-t $JL_RUNNER_AVAIL_CPU -y ./etc/services/rgl-clarode.yml
-n 100 -o ./out clas_021*.hipo
-t $JL_RUNNER_AVAIL_CPU -y ./etc/services/rgd-clarode.yml
-n 100 -o ./out clas_018779.evio.00001

profile:
stage: test
Expand Down
6 changes: 5 additions & 1 deletion bin/run-clara
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ do
c) CLARA_HOME=$OPTARG ;;
t) threads=$OPTARG && echo $threads | grep -q -E '^[0-9]+$' || error "-t must be an integer, threads" ;;
n) nevents="-e $OPTARG" && echo "$nevents" | grep -q -E '^-e [0-9]+$' || error "-n must be an integer, events" ;;
g) memory_gb="-e $OPTARG" && echo "$memory_gb" | grep -q -E '^-e [0-9]+$' || error "-g must be an integer, GB of memory" ;;
m) merge=1 ;;
q) quiet=1 ;;
h) echo -e "\n$usage" && echo -e $info && exit 0 ;;
Expand All @@ -42,6 +43,9 @@ done
shift $((OPTIND-1))
inputs=$@

# Configure JVM -Xmx memory setting:
[ -z ${memory_gb+x} ] && memory_gb=$((threads+2))

# Check configuration:
[ $# -lt 1 ] && error "Input data files are required"
[ -z ${yaml+x} ] && error "-y YAML is required"
Expand Down Expand Up @@ -72,7 +76,7 @@ done
[ $(cat $CLARA_USER_DATA/filelist.txt | wc -l) -gt 0 ] || error "Found no input files"

# Set some JVM options:
export JAVA_OPTS="$JAVA_OPTS -Xmx${threads}g -XX:+IgnoreUnrecognizedVMOptions"
export JAVA_OPTS="$JAVA_OPTS -Xmx${memory_gb}g -XX:+IgnoreUnrecognizedVMOptions"
export JAVA_OPTS="$JAVA_OPTS -Djava.io.tmpdir=$CLARA_USER_DATA -Dorg.sqlite.tmpdir=$CLARA_USER_DATA"
# Set verbosity:
[ -z ${quiet+x} ] && stub=fine || stub=info
Expand Down
83 changes: 83 additions & 0 deletions etc/services/rgd-clarode.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
mime-types:
- binary/data-hipo
configuration:
global:
dcrbJitter: "true"
variation: rgd_fall2023
io-services:
writer:
schema_dir: dst
services:
MAGFIELDS:
magfieldSolenoidMap: Symm_solenoid_r601_phi1_z1201_13June2018.dat
magfieldTorusMap: Full_torus_r251_phi181_z251_25Jan2021.dat
DCCR:
rawBankGroup: "NOISE1"
MLTD:
run: "18305"
DCHAI:
outputBankPrefix: "HB"
io-services:
reader:
class: org.jlab.io.clara.DecoderReader
name: DecoderReader
writer:
class: org.jlab.io.clara.DecoderWriter
name: DecoderWriter
services:
- class: org.jlab.service.ai.DCDenoiseEngine
name: DCDN
- class: org.jlab.clas.swimtools.MagFieldsEngine
name: MAGFIELDS
- class: org.jlab.rec.ft.cal.FTCALEngine
name: FTCAL
- class: org.jlab.rec.ft.hodo.FTHODOEngine
name: FTHODO
- class: org.jlab.rec.ft.trk.FTTRKEngine
name: FTTRK
- class: org.jlab.rec.ft.FTEBEngine
name: FTEB
- class: org.jlab.service.raster.RasterEngine
name: RASTER
- class: org.jlab.service.dc.DCHBClustering
name: DCCR
- class: org.jlab.service.mltn.MLTDEngine
name: MLTD
- class: org.jlab.service.dc.DCHBPostClusterAI
name: DCHAI
- class: org.jlab.service.ftof.FTOFHBEngine
name: FTOFHB
- class: org.jlab.service.ec.ECEngine
name: EC
- class: org.jlab.rec.cvt.services.CVTEngine
name: CVTFP
- class: org.jlab.service.ctof.CTOFEngine
name: CTOF
- class: org.jlab.service.cnd.CNDCalibrationEngine
name: CND
- class: org.jlab.service.band.BANDEngine
name: BAND
- class: org.jlab.service.htcc.HTCCReconstructionService
name: HTCC
- class: org.jlab.service.ltcc.LTCCEngine
name: LTCC
- class: org.jlab.service.eb.EBHBEngine
name: EBHB
- class: org.jlab.service.dc.DCTBEngine
name: DCTB
- class: org.jlab.service.fmt.FMTEngine
name: FMT
- class: org.jlab.rec.cvt.services.CVTSecondPassEngine
name: CVTSP
- class: org.jlab.service.ftof.FTOFTBEngine
name: FTOFTB
- class: org.jlab.service.eb.EBTBEngine
name: EBTB
- class: org.jlab.rec.rich.RICHEBEngine
name: RICH
- class: org.jlab.service.rtpc.RTPCEngine
name: RTPC
- class: org.jlab.rec.service.vtx.VTXEngine
name: VTX
- class: org.jlab.calibration.service.CalibBanksEngine
name: CALIB