Skip to content

Commit fe6e18d

Browse files
raffaelladevitaraffaelladevita
committed
update io engines in yaml, build only assenbly jar for ml services
1 parent a184bc4 commit fe6e18d

File tree

9 files changed

+334
-299
lines changed

9 files changed

+334
-299
lines changed

‎build-coatjava.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,6 @@ if [ $? != 0 ] ; then echo "mvn package failure" ; exit 1 ; fi
125125
cd -
126126

127127
cp common-tools/coat-lib/target/coat-libs-*-SNAPSHOT.jar coatjava/lib/clas/
128-
cp reconstruction/*/target/clas12detector-*-SNAPSHOT.jar coatjava/lib/services/
128+
cp reconstruction/*/target/clas12detector-*-SNAPSHOT*.jar coatjava/lib/services/
129129

130130
echo "COATJAVA SUCCESSFULLY BUILT !"

‎etc/services/data-ai.yaml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
io-services:
22
reader:
3-
class: org.jlab.clas.std.services.convertors.HipoToHipoReader
3+
class: org.jlab.io.clara.HipoToHipoReader
44
name: HipoToHipoReader
55
writer:
6-
class: org.jlab.clas.std.services.convertors.HipoToHipoWriter
6+
class: org.jlab.io.clara.HipoToHipoWriter
77
name: HipoToHipoWriter
88
services:
99
- class: org.jlab.clas.swimtools.MagFieldsEngine
@@ -52,7 +52,7 @@ services:
5252
# DC regular TB tracking
5353
- class: org.jlab.service.dc.DCTBEngineConv
5454
name: DCRTB
55-
# DC Ai assisted TB tracking
55+
# DC AI assisted TB tracking
5656
- class: org.jlab.service.dc.DCTBEngineAI
5757
name: DCATB
5858
- class: org.jlab.service.ftof.FTOFTBEngine
@@ -83,8 +83,6 @@ configuration:
8383
dcGeometryVariation: rga_fall2018
8484
dcT2DFunc: "Polynomial"
8585
dcWireDistortion: "true"
86-
# sectorSelect: "1"
87-
dcFOOST: "true"
8886
DCRC:
8987
dcGeometryVariation: rga_fall2018
9088
DCRPC:

‎etc/services/data.yaml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
io-services:
22
reader:
3-
class: org.jlab.clas.std.services.convertors.HipoToHipoReader
3+
class: org.jlab.io.clara.HipoToHipoReader
44
name: HipoToHipoReader
55
writer:
6-
class: org.jlab.clas.std.services.convertors.HipoToHipoWriter
6+
class: org.jlab.io.clara.HipoToHipoWriter
77
name: HipoToHipoWriter
88
services:
99
- class: org.jlab.clas.swimtools.MagFieldsEngine
@@ -41,17 +41,13 @@ services:
4141
name: LTCC
4242
- class: org.jlab.service.eb.EBHBEngine
4343
name: EBHB
44-
- class: org.jlab.service.eb.EBHBAIEngine
45-
name: EBHAI
4644
# DC regular TB tracking
4745
- class: org.jlab.service.dc.DCTBEngineConv
4846
name: DCRTB
4947
- class: org.jlab.service.ftof.FTOFTBEngine
5048
name: FTOFTB
5149
- class: org.jlab.service.eb.EBTBEngine
5250
name: EBTB
53-
- class: org.jlab.service.eb.EBTBAIEngine
54-
name: EBTAI
5551
- class: org.jlab.rec.rich.RICHEBEngine
5652
name: RICH
5753
- class: org.jlab.service.rtpc.RTPCEngine
@@ -74,8 +70,6 @@ configuration:
7470
dcGeometryVariation: rga_fall2018
7571
dcT2DFunc: "Polynomial"
7672
dcWireDistortion: "true"
77-
# sectorSelect: "1"
78-
dcFOOST: "true"
7973
DCRC:
8074
dcGeometryVariation: rga_fall2018
8175
DCRPC:

‎etc/services/eb.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
io-services:
22
reader:
3-
class: org.jlab.clas.std.services.convertors.HipoToHipoReader
3+
class: org.jlab.io.clara.HipoToHipoReader
44
name: HipoToHipoReader
55
writer:
6-
class: org.jlab.clas.std.services.convertors.HipoToHipoWriter
6+
class: org.jlab.io.clara.HipoToHipoWriter
77
name: HipoToHipoWriter
88
services:
99
- class: org.jlab.service.eb.EBTBEngine

‎etc/services/kpp.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
io-services:
22
reader:
3-
class: org.jlab.clas.std.services.convertors.HipoToHipoReader
3+
class: org.jlab.io.clara.HipoToHipoReader
44
name: HipoToHipoReader
55
writer:
6-
class: org.jlab.clas.std.services.convertors.HipoToHipoWriter
6+
class: org.jlab.io.clara.HipoToHipoWriter
77
name: HipoToHipoWriter
88
services:
99
- class: org.jlab.clas.swimtools.MagFieldsEngine
@@ -21,8 +21,8 @@ services:
2121
- class: org.jlab.service.dc.DCHBClustering
2222
name: DCRC
2323
# This is where the AI plugin would go. THe AI code reads the HB clusters.
24-
- class: org.jlab.service.mlt.MLTEngine
25-
name: MLT
24+
- class: org.jlab.service.mltn.MLTDEngine
25+
name: MLTD
2626
# DC using clustering: regular HB tracking
2727
- class: org.jlab.service.dc.DCHBPostClusterConv
2828
name: DCRPC

‎etc/services/mc.yaml‎

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
io-services:
22
reader:
3-
class: org.jlab.clas.std.services.convertors.HipoToHipoReader
3+
class: org.jlab.io.clara.HipoToHipoReader
44
name: HipoToHipoReader
55
writer:
6-
class: org.jlab.clas.std.services.convertors.HipoToHipoWriter
6+
class: org.jlab.io.clara.HipoToHipoWriter
77
name: HipoToHipoWriter
88
services:
99
- class: org.jlab.clas.swimtools.MagFieldsEngine
@@ -14,8 +14,21 @@ services:
1414
name: FTHODO
1515
- class: org.jlab.rec.ft.FTEBEngine
1616
name: FTEB
17-
- class: org.jlab.service.dc.DCHBEngine
18-
name: DCHB
17+
# DC initializer: passes geometry and constants to all DC services
18+
- class: org.jlab.service.dc.DCInit
19+
name: DCI
20+
# DC clustering: nominal algoritm, filled the cluster bank for ai and conventional tracking
21+
- class: org.jlab.service.dc.DCHBClustering
22+
name: DCRC
23+
# This is where the AI plugin would go. THe AI code reads the HB clusters.
24+
- class: org.jlab.service.mltn.MLTDEngine
25+
name: MLTD
26+
# DC using clustering: regular HB tracking
27+
- class: org.jlab.service.dc.DCHBPostClusterConv
28+
name: DCRPC
29+
# DC using clustering on AI hits: NN assisted HB tracking
30+
- class: org.jlab.service.dc.DCHBPostClusterAI
31+
name: DCAC
1932
- class: org.jlab.service.ftof.FTOFHBEngine
2033
name: FTOFHB
2134
- class: org.jlab.service.ec.ECEngine
@@ -34,12 +47,20 @@ services:
3447
name: LTCC
3548
- class: org.jlab.service.eb.EBHBEngine
3649
name: EBHB
37-
- class: org.jlab.service.dc.DCTBEngine
38-
name: DCTB
50+
- class: org.jlab.service.eb.EBHBAIEngine
51+
name: EBHAI
52+
# DC regular TB tracking
53+
- class: org.jlab.service.dc.DCTBEngineConv
54+
name: DCRTB
55+
# DC AI assisted TB tracking
56+
- class: org.jlab.service.dc.DCTBEngineAI
57+
name: DCATB
3958
- class: org.jlab.service.ftof.FTOFTBEngine
4059
name: FTOFTB
4160
- class: org.jlab.service.eb.EBTBEngine
4261
name: EBTB
62+
- class: org.jlab.service.eb.EBTBAIEngine
63+
name: EBTAI
4364
- class: org.jlab.rec.rich.RICHEBEngine
4465
name: RICH
4566
configuration:

‎etc/services/swaps.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
# Note, it must come before all other services.
33
io-services:
44
reader:
5-
class: org.jlab.clas.std.services.convertors.HipoToHipoReader
5+
class: org.jlab.io.clara.HipoToHipoReader
66
name: HipoToHipoReader
77
writer:
8-
class: org.jlab.clas.std.services.convertors.HipoToHipoWriter
8+
class: org.jlab.io.clara.HipoToHipoWriter
99
name: HipoToHipoWriter
1010
services:
1111
- class: org.jlab.service.swaps.SwapEngine

0 commit comments

Comments
 (0)