Skip to content

Commit e696b84

Browse files
update YAMLs and uber engine for DC AI 2026 (#1393)
* update uber engines for DC AI 2026 * rename yamls * completing the transition to the new DC AI engines in yamls and uber services * adding denoising to aicv yamls * Adding the functionality to choose the input/output bank names to new AI-assisted tracking service. Used by denoise.yaml * update pom version --------- Co-authored-by: Raffaella De Vita <devita@ge.infn.it>
1 parent 945f5cb commit e696b84

11 files changed

Lines changed: 92 additions & 52 deletions

File tree

‎etc/services/README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
* Real Data
33
* Warning, these must be set appropriately for the data in question:
44
* the CCDB variation
5-
* the run number for MLTD/MLTAI network
65
* [`data-ai.yaml`](data-ai.yaml)
76
* AI track finding
87
* [`data-cv.yaml`](data-cv.yaml)
Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,15 @@ services:
2020
name: FTEB
2121
- class: org.jlab.service.raster.RasterEngine
2222
name: RASTER
23-
# DC denoising
24-
- class: org.jlab.service.ai.DCDenoiseEngine
25-
name: DCDN
2623
# DC clustering: nominal algoritm, filled the cluster bank for ai and conventional tracking
2724
- class: org.jlab.service.dc.DCHBClustering
2825
name: DCCR
2926
# This is where the AI plugin would go. THe AI code reads the HB clusters.
30-
- class: org.jlab.service.ai.DCClsComboEngine
31-
name: DCCC
27+
- class: org.jlab.service.mltn.MLTDEngine
28+
name: MLTD
3229
# DC using clustering on AI hits: NN assisted HB tracking
33-
- class: org.jlab.service.dc.DCHBTrackingAI
34-
name: DCHTAI
30+
- class: org.jlab.service.dc.DCHBPostClusterAI
31+
name: DCHAI
3532
- class: org.jlab.service.ftof.FTOFHBEngine
3633
name: FTOFHB
3734
- class: org.jlab.service.ec.ECEngine
@@ -82,7 +79,9 @@ configuration:
8279
MAGFIELDS:
8380
magfieldSolenoidMap: Symm_solenoid_r601_phi1_z1201_13June2018.dat
8481
magfieldTorusMap: Full_torus_r251_phi181_z251_25Jan2021.dat
85-
DCHTAI:
82+
MLTD:
83+
run: "6302"
84+
DCHAI:
8685
outputBankPrefix: "HB"
8786

8887
mime-types:

‎etc/services/data-ai.yaml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,18 @@ services:
2020
name: FTEB
2121
- class: org.jlab.service.raster.RasterEngine
2222
name: RASTER
23+
# DC denoising
24+
- class: org.jlab.service.ai.DCDenoiseEngine
25+
name: DCDN
2326
# DC clustering: nominal algoritm, filled the cluster bank for ai and conventional tracking
2427
- class: org.jlab.service.dc.DCHBClustering
2528
name: DCCR
2629
# This is where the AI plugin would go. THe AI code reads the HB clusters.
27-
- class: org.jlab.service.mltn.MLTDEngine
28-
name: MLTD
30+
- class: org.jlab.service.ai.DCClsComboEngine
31+
name: DCCC
2932
# DC using clustering on AI hits: NN assisted HB tracking
30-
- class: org.jlab.service.dc.DCHBPostClusterAI
31-
name: DCHAI
33+
- class: org.jlab.service.dc.DCHBTrackingAI
34+
name: DCHTAI
3235
- class: org.jlab.service.ftof.FTOFHBEngine
3336
name: FTOFHB
3437
- class: org.jlab.service.ec.ECEngine
@@ -79,9 +82,7 @@ configuration:
7982
MAGFIELDS:
8083
magfieldSolenoidMap: Symm_solenoid_r601_phi1_z1201_13June2018.dat
8184
magfieldTorusMap: Full_torus_r251_phi181_z251_25Jan2021.dat
82-
MLTD:
83-
run: "6302"
84-
DCHAI:
85+
DCHTAI:
8586
outputBankPrefix: "HB"
8687

8788
mime-types:

‎etc/services/data-aicv-uber.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ configuration:
1111
magfieldSolenoidMap: Symm_solenoid_r601_phi1_z1201_13June2018.dat
1212
magfieldTorusMap: Full_torus_r251_phi181_z251_25Jan2021.dat
1313
HB:
14-
run: "19000"
14+
rawBankGroup: "NODENOISE"
1515
io-services:
1616
reader:
1717
class: org.jlab.io.clara.Clas12Reader

‎etc/services/data-aicv.yaml‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,16 @@ services:
2020
name: FTEB
2121
- class: org.jlab.service.raster.RasterEngine
2222
name: RASTER
23-
# DC clustering: nominal algoritm, filled the cluster bank for ai and conventional tracking
23+
- class: org.jlab.service.ai.DCDenoiseEngine
24+
name: DCDN
2425
- class: org.jlab.service.dc.DCHBClustering
2526
name: DCCR
26-
# This is where the AI plugin would go. THe AI code reads the HB clusters.
27-
- class: org.jlab.service.mltn.MLTDEngine
28-
name: MLTD
29-
# DC using clustering: regular HB tracking
27+
- class: org.jlab.service.ai.DCClsComboEngine
28+
name: DCCC
3029
- class: org.jlab.service.dc.DCHBPostClusterConv
3130
name: DCHB
32-
# DC using clustering on AI hits: NN assisted HB tracking
33-
- class: org.jlab.service.dc.DCHBPostClusterAI
34-
name: DCHAI
31+
- class: org.jlab.service.dc.DCHBTrackingAI
32+
name: DCHTAI
3533
- class: org.jlab.service.ftof.FTOFHBEngine
3634
name: FTOFHB
3735
- class: org.jlab.service.ec.ECEngine
@@ -91,12 +89,12 @@ configuration:
9189
MAGFIELDS:
9290
magfieldSolenoidMap: Symm_solenoid_r601_phi1_z1201_13June2018.dat
9391
magfieldTorusMap: Full_torus_r251_phi181_z251_25Jan2021.dat
94-
DCHAI:
92+
DCCR:
93+
rawBankGroup: "NODENOISE"
94+
DCHTAI:
9595
outputBankPrefix: "AI"
9696
DCTAI:
9797
outputBankPrefix: "AI"
98-
MLTD:
99-
run: "6302"
10098
EBTAI:
10199
outputBankPrefix: "RECAI"
102100

‎etc/services/denoise.yaml‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,19 @@ services:
2020
name: FTEB
2121
- class: org.jlab.service.raster.RasterEngine
2222
name: RASTER
23-
# DC clustering: nominal algoritm, filled the cluster bank for ai and conventional tracking
23+
- class: org.jlab.service.ai.DCDenoiseEngine
24+
name: DCDN
2425
- class: org.jlab.service.dc.DCHBClustering
2526
name: DCCR
2627
- class: org.jlab.service.dc.DCHBClustering
2728
name: DCRAI
28-
# This is where the AI plugin would go. THe AI code reads the HB clusters.
29-
- class: org.jlab.service.mltn.MLTDEngine
30-
name: MLTD
31-
- class: org.jlab.service.mltn.MLTDEngine
32-
name: MLTAI
33-
# DC using clustering: regular HB tracking
34-
- class: org.jlab.service.dc.DCHBPostClusterAI
29+
- class: org.jlab.service.ai.DCClsComboEngine
30+
name: DCCC
31+
- class: org.jlab.service.ai.DCClsComboEngine
32+
name: DCCAI
33+
- class: org.jlab.service.dc.DCHBTrackingAI
3534
name: DCHB
36-
# DC using clustering on AI hits: NN assisted HB tracking
37-
- class: org.jlab.service.dc.DCHBPostClusterAI
35+
- class: org.jlab.service.dc.DCHBTrackingAI
3836
name: DCHAI
3937
- class: org.jlab.service.ftof.FTOFHBEngine
4038
name: FTOFHB
@@ -99,10 +97,7 @@ configuration:
9997
#rawBankGroup: "DEFAULT"
10098
rawBankGroup: "NOISE1"
10199
outputBankPrefix: "DN"
102-
MLTD:
103-
run: "6302"
104-
MLTAI:
105-
run: "6302"
100+
DCCAI:
106101
inputBankPrefix: "DN"
107102
outputBankPrefix: "aidn"
108103
DCHB:

‎etc/services/eb.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ io-services:
66
class: org.jlab.io.clara.Clas12Writer
77
name: Clas12Writer
88
services:
9-
- class: org.jlab.clas.reco.DecoderEngine
10-
name: DECO
119
- class: org.jlab.service.eb.EBTBEngine
1210
name: EBTB
1311
configuration:

‎etc/services/mc-aicv.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ services:
1818
name: FTEB
1919
- class: org.jlab.service.raster.RasterEngine
2020
name: RASTER
21-
# - class: org.jlab.service.ai.DCDenoiseEngine
22-
# name: DCDN
21+
- class: org.jlab.service.ai.DCDenoiseEngine
22+
name: DCDN
2323
- class: org.jlab.service.dc.DCHBClustering
2424
name: DCCR
2525
- class: org.jlab.service.ai.DCClsComboEngine
@@ -84,6 +84,8 @@ configuration:
8484
MAGFIELDS:
8585
magfieldSolenoidMap: Symm_solenoid_r601_phi1_z1201_13June2018.dat
8686
magfieldTorusMap: Symm_torus_r2501_phi16_z251_24Apr2018.dat
87+
DCCR:
88+
rawBankGroup: "NODENOISE"
8789
RTPC:
8890
rtpcSimulation: "true"
8991

‎reconstruction/ai/src/main/java/org/jlab/service/ai/DCClsComboEngine.java‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import ai.djl.translate.TranslatorContext;
2222
import java.io.IOException;
2323
import java.nio.file.Paths;
24+
import java.util.Optional;
2425
import java.util.logging.Level;
2526
import java.util.logging.Logger;
2627
import org.jlab.clas.reco.ReconstructionEngine;
@@ -31,8 +32,8 @@
3132
import org.jlab.rec.ai.dcCluster.DCClusterCombo;
3233

3334
public class DCClsComboEngine extends ReconstructionEngine {
34-
final String inputBank = "HitBasedTrkg::Clusters";
35-
final String outputBank = "ai::tracks";
35+
String inputBank = "HitBasedTrkg::Clusters";
36+
String outputBank = "ai::tracks";
3637

3738
final static String CONF_THREADS = "threads";
3839

@@ -124,6 +125,11 @@ public boolean init() {
124125
LOGGER.log(Level.SEVERE, null, ex);
125126
return false;
126127
}
128+
129+
String inputBankPrefix = Optional.ofNullable(this.getEngineConfigString("inputBankPrefix")).orElse("");
130+
String outputBankPrefix = Optional.ofNullable(this.getEngineConfigString("outputBankPrefix")).orElse("ai");
131+
inputBank = "HitBasedTrkg::"+inputBankPrefix+"Clusters";
132+
outputBank = outputBankPrefix+"::tracks";
127133

128134
return true;
129135
}

‎reconstruction/uber/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@
2424
<artifactId>swim-tools</artifactId>
2525
<version>14.2.0-SNAPSHOT</version>
2626
</dependency>
27+
<dependency>
28+
<groupId>org.jlab.clas12.detector</groupId>
29+
<artifactId>clas12detector-ai</artifactId>
30+
<version>14.2.0-SNAPSHOT</version>
31+
</dependency>
2732
<dependency>
2833
<groupId>org.jlab.clas12.detector</groupId>
2934
<artifactId>clas12detector-dc</artifactId>

0 commit comments

Comments
 (0)