Skip to content

Commit b368694

Browse files
baltzelltongtongcao
authored andcommitted
feat: use "stock" schema in yamls (#875)
* use stock schema in yamls * fix oops
1 parent b585fc3 commit b368694

File tree

11 files changed

+32
-39
lines changed

11 files changed

+32
-39
lines changed

common-tools/clara-io/src/main/java/org/jlab/io/clara/HipoFrameWriter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ private String getSchemaDirectory(JSONObject opts) {
5353
s = opts.getString(CONF_SCHEMA).trim();
5454
// If it's not already an absolute path, assume it's the name of a
5555
// stock schema that comes with COATJAVA and get the full path to it:
56-
if (!s.startsWith("/")) s = ClaraYaml.getStockSchemaDirectory(opts.getString(s));
56+
if (!s.startsWith("/")) s = ClaraYaml.getStockSchemaDirectory(s);
5757
}
5858
return s;
5959
}

etc/services/data-ai.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,9 @@ configuration:
7070
## uncomment the following two lines for compatibility with alignments before the DC fixes
7171
# dcMinistagger: "NOTONREFWIRE"
7272
# dcFeedthroughs: "OFF"
73-
# io-services:
74-
# writer:
75-
# schema_dir: "absolute-path-to-schema-folder"
76-
# for example:
77-
# schema_dir: "/home/clas12-1/chef/myClara/plugins/clas12/etc/bankdefs/dst"
73+
io-services:
74+
writer:
75+
schema_dir: data-ai
7876
services:
7977
MAGFIELDS:
8078
magfieldSolenoidMap: Symm_solenoid_r601_phi1_z1201_13June2018.dat

etc/services/data-aicv.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,10 @@ configuration:
8181
## uncomment the following two lines for compatibility with alignments before the DC fixes
8282
# dcMinistagger: "NOTONREFWIRE"
8383
# dcFeedthroughs: "OFF"
84-
# io-services:
85-
# writer:
86-
# schema_dir: "absolute-path-to-schema-folder"
87-
# for example:
88-
# schema_dir: "/home/clas12-1/chef/myClara/plugins/clas12/etc/bankdefs/dst"
84+
io-services:
85+
writer:
86+
schema_dir: data-aicv
87+
#schema_dir: "/home/clas12-1/chef/myClara/plugins/clas12/etc/bankdefs/dst"
8988
services:
9089
MAGFIELDS:
9190
magfieldSolenoidMap: Symm_solenoid_r601_phi1_z1201_13June2018.dat

etc/services/data-cv.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,9 @@ configuration:
6969
## uncomment the following two lines for compatibility with alignments before the DC fixes
7070
# dcMinistagger: "NOTONREFWIRE"
7171
# dcFeedthroughs: "OFF"
72-
# io-services:
73-
# writer:
74-
# schema_dir: "absolute-path-to-schema-folder"
75-
# for example:
76-
# schema_dir: "/home/clas12-1/chef/myClara/plugins/clas12/etc/bankdefs/dst"
72+
io-services:
73+
writer:
74+
schema_dir: data-cv
7775
services:
7876
MAGFIELDS:
7977
magfieldSolenoidMap: Symm_solenoid_r601_phi1_z1201_13June2018.dat

etc/services/dcalign.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ configuration:
5757
global:
5858
variation: rgb_spring2019
5959
# timestamp: 12/31/2020-00:00:00
60-
# io-services:
61-
# writer:
62-
# schema_dir: "absolute-path-to-distribution/etc/bankdefs/hipo4/singles/dcalign"
60+
io-services:
61+
writer:
62+
schema_dir: dcalign
6363
services:
6464
MAGFIELDS:
6565
magfieldSolenoidMap: Symm_solenoid_r601_phi1_z1201_13June2018.dat

etc/services/decode.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ configuration:
1515
variation: default
1616
timestamp: 05/11/2025-00:00:00
1717
writer:
18-
schema_dir: /farm/home/baltzell/sw/coatjava/io-dev-2/coatjava/etc/bankdefs/hipo4/singles/dst
18+
schema_dir: full
1919
mime-types:
2020
- binary/data-hipo

etc/services/denoise.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,10 @@ configuration:
8383
## uncomment the following two lines for compatibility with alignments before the DC fixes
8484
# dcMinistagger: "NOTONREFWIRE"
8585
# dcFeedthroughs: "OFF"
86-
# io-services:
87-
# writer:
88-
# schema_dir: "absolute-path-to-schema-folder"
89-
# for example:
90-
# schema_dir: "/home/clas12-1/chef/myClara/plugins/clas12/etc/bankdefs/dst"
86+
io-services:
87+
writer:
88+
schema_dir: dst
89+
#schema_dir: "/home/clas12-1/chef/myClara/plugins/clas12/etc/bankdefs/dst"
9190
services:
9291
MAGFIELDS:
9392
magfieldSolenoidMap: Symm_solenoid_r601_phi1_z1201_13June2018.dat

etc/services/eb.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ services:
99
- class: org.jlab.service.eb.EBTBEngine
1010
name: EBTB
1111
configuration:
12-
# io-services:
13-
# writer:
14-
# schema_dir: "absolute-path-to-schema-folder"
12+
io-services:
13+
writer:
14+
schema_dir: dst
1515
services:
1616
EBTB:
1717
dropBanks: 'true'

etc/services/mc-ai.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,10 @@ configuration:
6969
# timestamp: 12/31/2020-00:00:00
7070
# dcMinistagger: "NOTONREFWIRE"
7171
# dcFeedthroughs: "OFF"
72-
# io-services:
73-
# writer:
74-
# schema_dir: "absolute-path-to-schema-folder"
75-
# for example:
76-
# schema_dir: "/home/clas12-1/chef/myClara/plugins/clas12/etc/bankdefs/dst"
72+
io-services:
73+
writer:
74+
schema_dir: mc-ai
75+
#schema_dir: "/home/clas12-1/chef/myClara/plugins/clas12/etc/bankdefs/dst"
7776
services:
7877
MAGFIELDS:
7978
magfieldSolenoidMap: Symm_solenoid_r601_phi1_z1201_13June2018.dat

etc/services/mc-aicv.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ configuration:
7979
# variation: rga_fall2018_mc
8080
# dcMinistagger: "NOTONREFWIRE"
8181
# dcFeedthroughs: "OFF"
82-
# io-services:
83-
# writer:
84-
# schema_dir: "absolute-path-to-schema-folder"
82+
io-services:
83+
writer:
84+
schema_dir: mc-aicv
8585
services:
8686
MAGFIELDS:
8787
magfieldSolenoidMap: Symm_solenoid_r601_phi1_z1201_13June2018.dat

0 commit comments

Comments
 (0)