From de80fbba6680ac8919c03724ea836f23b07928eb Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Wed, 15 Oct 2025 17:31:03 -0400 Subject: [PATCH 1/5] switch to rg-d --- .github/workflows/ci.yml | 6 ++- .gitlab-ci.yml | 8 ++-- etc/services/rgd-clarode.yml | 77 ++++++++++++++++++++++++++++++++++++ 3 files changed, 87 insertions(+), 4 deletions(-) create mode 100644 etc/services/rgd-clarode.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dbc0480328..4d50d34cdd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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' }} @@ -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 ############################################################################# @@ -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 @@ -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 ${{ env.nthreads }} -n 200 -c ./clara -o ./tmp ./clas_018779.evio.00001 ls -lhtr test_coatjava: diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 69a6b73db0..d796ce2370 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 @@ -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 diff --git a/etc/services/rgd-clarode.yml b/etc/services/rgd-clarode.yml new file mode 100644 index 0000000000..9a0133b036 --- /dev/null +++ b/etc/services/rgd-clarode.yml @@ -0,0 +1,77 @@ +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.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 From 51984b98560e2cfcdee011767868bd5c58e00b45 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Thu, 16 Oct 2025 15:17:27 -0400 Subject: [PATCH 2/5] add denoising --- etc/services/rgd-clarode.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/etc/services/rgd-clarode.yml b/etc/services/rgd-clarode.yml index 9a0133b036..31764bd393 100644 --- a/etc/services/rgd-clarode.yml +++ b/etc/services/rgd-clarode.yml @@ -25,6 +25,8 @@ io-services: 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 From 4a474d4d2a7600798ee9e63f172c35c024549c35 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Thu, 16 Oct 2025 17:49:05 -0400 Subject: [PATCH 3/5] use all 4 available threads --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4d50d34cdd..5404e8b29e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -199,7 +199,7 @@ jobs: - name: run test run: | ls -lhtr - ./bin/run-clara -y ./etc/services/rgd-clarode.yml -t ${{ env.nthreads }} -n 200 -c ./clara -o ./tmp ./clas_018779.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: From 5ddfe63a887d13fc894da33137867c37314a07a5 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Thu, 16 Oct 2025 19:24:40 -0400 Subject: [PATCH 4/5] improve jvm memory settings --- bin/run-clara | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bin/run-clara b/bin/run-clara index 4d9260e16a..5ad061ba34 100755 --- a/bin/run-clara +++ b/bin/run-clara @@ -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 ;; @@ -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" @@ -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 From 907086cfd7ca2b1706240eebe08afd5eaf050b0b Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Fri, 17 Oct 2025 10:43:52 -0400 Subject: [PATCH 5/5] add missing services --- etc/services/rgd-clarode.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/etc/services/rgd-clarode.yml b/etc/services/rgd-clarode.yml index 31764bd393..b3612af29d 100644 --- a/etc/services/rgd-clarode.yml +++ b/etc/services/rgd-clarode.yml @@ -77,3 +77,7 @@ services: 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