From 3711f63517cf8c2d8865ddbb58f0259437c585ad Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Thu, 8 Oct 2026 17:40:26 -0400 Subject: [PATCH 1/4] kpp -> data-aivc --- etc/services/kpp.yaml | 72 +++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 37 deletions(-) diff --git a/etc/services/kpp.yaml b/etc/services/kpp.yaml index f0a37eac5f..3712d65748 100644 --- a/etc/services/kpp.yaml +++ b/etc/services/kpp.yaml @@ -1,3 +1,27 @@ + +configuration: + services: + MAGFIELDS: + magfieldSolenoidMap: Symm_solenoid_r601_phi1_z1201_13June2018.dat + magfieldTorusMap: Symm_torus_r2501_phi16_z251_24Apr2018.dat + DCCR: + dcT2DFunc: "Exponential" + rawBankGroup: "NODENOISE" + DCHB: + dcT2DFunc: "Exponential" + DCTB: + dcT2DFunc: "Exponential" + DCTAI: + dcT2DFunc: "Exponential" + outputBankPrefix: "AI" + DCHTAI: + outputBankPrefix: "AI" + EBTAI: + outputBankPrefix: "RECAI" + +mime-types: + - binary/data-hipo + io-services: reader: class: org.jlab.io.clara.Clas12Reader @@ -5,6 +29,8 @@ io-services: writer: class: org.jlab.io.clara.Clas12Writer name: Clas12Writer + + services: - class: org.jlab.clas.reco.DecoderEngine name: DECO @@ -20,18 +46,16 @@ services: name: FTEB - class: org.jlab.service.raster.RasterEngine name: RASTER -# DC clustering: nominal algoritm, filled the cluster bank for ai and conventional tracking + - class: org.jlab.service.ai.DCDenoiseEngine + name: DCDN - class: org.jlab.service.dc.DCHBClustering name: DCCR -# This is where the AI plugin would go. THe AI code reads the HB clusters. - - class: org.jlab.service.mltn.MLTDEngine - name: MLTD -# DC using clustering: regular HB tracking + - class: org.jlab.service.ai.DCClsComboEngine + name: DCCC - class: org.jlab.service.dc.DCHBPostClusterConv name: DCHB -# DC using clustering on AI hits: NN assisted HB tracking - - class: org.jlab.service.dc.DCHBPostClusterAI - name: DCHAI + - class: org.jlab.service.dc.DCHBTrackingAI + name: DCHTAI - class: org.jlab.service.ftof.FTOFHBEngine name: FTOFHB - class: org.jlab.service.ec.ECEngine @@ -72,36 +96,10 @@ 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 -configuration: - services: - MAGFIELDS: - magfieldSolenoidMap: Symm_solenoid_r601_phi1_z1201_13June2018.dat - magfieldTorusMap: Symm_torus_r2501_phi16_z251_24Apr2018.dat -# examples of yaml settings for magfields -# magfieldSolenoidShift: "0.0" -# magfieldTorusXShift: "0.0" -# magfieldTorusYShift: "0.0" -# magfieldTorusZShift: "0.0" -# examples of yaml settings for DC services -# DCRC: -# dcGeometryVariation: rga_spring2018 -# dcT2DFunc: "Polynomial" -# dcWireDistortion: "true" -# example of how to set variation and timestamp for a service, uncomment to use -# EBTB: -# variation: default -# timestamp: 08/22/2018 - DCCR: - dcT2DFunc: "Exponential" - DCHB: - dcT2DFunc: "Exponential" - DCHAI: - dcT2DFunc: "Exponential" - DCTB: - dcT2DFunc: "Exponential" - DCTAI: - dcT2DFunc: "Exponential" + mime-types: - binary/data-hipo From 35549af849c2dd09c4cf98360dd6dd89a6569bf7 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Thu, 8 Oct 2026 17:48:55 -0400 Subject: [PATCH 2/4] cleanup kpp script --- validation/advanced-tests/run-advanced-tests.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/validation/advanced-tests/run-advanced-tests.sh b/validation/advanced-tests/run-advanced-tests.sh index c96599669a..c375c64f06 100755 --- a/validation/advanced-tests/run-advanced-tests.sh +++ b/validation/advanced-tests/run-advanced-tests.sh @@ -11,12 +11,8 @@ COAT=$CLARA_HOME/plugins/clas12/ source $COAT/libexec/env.sh classPath="${COATJAVA_CLASSPATH}:../lib/*:src/" -# download test files -#wget --no-check-certificate http://clasweb.jlab.org/clas12offline/distribution/coatjava/validation_files/twoTrackEvents_809_raw.evio.tar.gz -#[ $? -ne 0 ] && echo "wget validation files failure" && exit 2 -#tar -zxvf twoTrackEvents_809_raw.evio.tar.gz - # run decoder +rm -f twoTrackEvents_809.hipo $COAT/bin/decoder -t -0.5 -s 0.0 -i ./data/twoTrackEvents_809_raw.evio -o ./twoTrackEvents_809.hipo -c 2 [ $? -ne 0 ] && echo "decoder failure" && exit 3 @@ -24,6 +20,7 @@ $COAT/bin/decoder -t -0.5 -s 0.0 -i ./data/twoTrackEvents_809_raw.evio -o ./twoT $COAT/bin/hipo-utils -stats ./twoTrackEvents_809.hipo # run clara +rm -f rec_twoTrackEvents_809.hipo $COAT/bin/run-clara -y $COAT/etc/services/kpp.yaml ./twoTrackEvents_809.hipo [ $? -ne 0 ] && echo "reconstruction with clara failure" && exit 4 From 9d8f27e89beaffb84fb804df56f69eb2dbed2391 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Thu, 8 Oct 2026 17:50:39 -0400 Subject: [PATCH 3/4] cleanup --- etc/services/kpp.yaml | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/etc/services/kpp.yaml b/etc/services/kpp.yaml index 3712d65748..0c650f1f5c 100644 --- a/etc/services/kpp.yaml +++ b/etc/services/kpp.yaml @@ -1,4 +1,3 @@ - configuration: services: MAGFIELDS: @@ -18,18 +17,6 @@ configuration: outputBankPrefix: "AI" EBTAI: outputBankPrefix: "RECAI" - -mime-types: - - binary/data-hipo - -io-services: - reader: - class: org.jlab.io.clara.Clas12Reader - name: Clas12Reader - writer: - class: org.jlab.io.clara.Clas12Writer - name: Clas12Writer - services: - class: org.jlab.clas.reco.DecoderEngine @@ -101,5 +88,13 @@ services: - class: org.jlab.calibration.service.CalibBanksEngine name: CALIB +io-services: + reader: + class: org.jlab.io.clara.Clas12Reader + name: Clas12Reader + writer: + class: org.jlab.io.clara.Clas12Writer + name: Clas12Writer + mime-types: - binary/data-hipo From a2ad89cec94e01191da59192200e164e2b95922a Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Thu, 8 Oct 2026 17:54:48 -0400 Subject: [PATCH 4/4] try cv-only --- etc/services/kpp.yaml | 30 ++++--------------- .../src/kpptracking/KppTrackingTest.java | 2 +- 2 files changed, 7 insertions(+), 25 deletions(-) diff --git a/etc/services/kpp.yaml b/etc/services/kpp.yaml index 0c650f1f5c..edc415b654 100644 --- a/etc/services/kpp.yaml +++ b/etc/services/kpp.yaml @@ -4,19 +4,12 @@ configuration: magfieldSolenoidMap: Symm_solenoid_r601_phi1_z1201_13June2018.dat magfieldTorusMap: Symm_torus_r2501_phi16_z251_24Apr2018.dat DCCR: - dcT2DFunc: "Exponential" + dcT2DFunc: "Exponential" rawBankGroup: "NODENOISE" DCHB: - dcT2DFunc: "Exponential" + dcT2DFunc: "Exponential" DCTB: - dcT2DFunc: "Exponential" - DCTAI: dcT2DFunc: "Exponential" - outputBankPrefix: "AI" - DCHTAI: - outputBankPrefix: "AI" - EBTAI: - outputBankPrefix: "RECAI" services: - class: org.jlab.clas.reco.DecoderEngine @@ -33,16 +26,12 @@ services: name: FTEB - class: org.jlab.service.raster.RasterEngine name: RASTER - - class: org.jlab.service.ai.DCDenoiseEngine - name: DCDN +# DC clustering: nominal algoritm, filled the cluster bank for ai and conventional tracking - class: org.jlab.service.dc.DCHBClustering name: DCCR - - class: org.jlab.service.ai.DCClsComboEngine - name: DCCC +# DC using clustering: regular HB tracking - class: org.jlab.service.dc.DCHBPostClusterConv name: DCHB - - class: org.jlab.service.dc.DCHBTrackingAI - name: DCHTAI - class: org.jlab.service.ftof.FTOFHBEngine name: FTOFHB - class: org.jlab.service.ec.ECEngine @@ -61,14 +50,9 @@ services: name: LTCC - class: org.jlab.service.eb.EBHBEngine name: EBHB - - class: org.jlab.service.eb.EBHBAIEngine - name: EBHAI -# DC regular TB tracking +# DC regular TB tracking - class: org.jlab.service.dc.DCTBEngine name: DCTB -# DC AI assisted TB tracking - - class: org.jlab.service.dc.DCTBEngineAI - name: DCTAI - class: org.jlab.service.fmt.FMTEngine name: FMT - class: org.jlab.rec.cvt.services.CVTSecondPassEngine @@ -77,8 +61,6 @@ services: name: FTOFTB - class: org.jlab.service.eb.EBTBEngine name: EBTB - - class: org.jlab.service.eb.EBTBAIEngine - name: EBTAI - class: org.jlab.rec.rich.RICHEBEngine name: RICH - class: org.jlab.service.rtpc.RTPCEngine @@ -86,7 +68,7 @@ services: - class: org.jlab.rec.service.vtx.VTXEngine name: VTX - class: org.jlab.calibration.service.CalibBanksEngine - name: CALIB + name: CALIB io-services: reader: diff --git a/validation/advanced-tests/src/kpptracking/KppTrackingTest.java b/validation/advanced-tests/src/kpptracking/KppTrackingTest.java index cfdbdff198..3c6e4abb3c 100644 --- a/validation/advanced-tests/src/kpptracking/KppTrackingTest.java +++ b/validation/advanced-tests/src/kpptracking/KppTrackingTest.java @@ -36,7 +36,7 @@ public void testKppTracking() { System.out.println("\tTotal count: " + totalCount + "\n\t2-track count: " + twoTrackCountAI); assertEquals(twoTrackCountCV > 30, true); // this should be stricter! - assertEquals(twoTrackCountAI > 30, true); // this should be stricter! + //assertEquals(twoTrackCountAI > 30, true); // this should be stricter! }