Skip to content

feat: use "stock" schema in yamls #875

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 12, 2025
Merged

feat: use "stock" schema in yamls #875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fc79bf1
use stock schema in yamls
baltzell Oct 10, 2025
867f752
fix oops
baltzell Oct 10, 2025
68b0c99
bugfix
baltzell Oct 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common-tools/clara-io/src/main/java/org/jlab/io/clara/HipoFrameWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ private String getSchemaDirectory(JSONObject opts) {
s = opts.getString(CONF_SCHEMA).trim();
// If it's not already an absolute path, assume it's the name of a
// stock schema that comes with COATJAVA and get the full path to it:
if (!s.startsWith("/")) s = ClaraYaml.getStockSchemaDirectory(opts.getString(s));
if (!s.startsWith("/")) s = ClaraYaml.getStockSchemaDirectory(s);
}
return s;
}
Expand Down
8 changes: 3 additions & 5 deletions etc/services/data-ai.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,9 @@ configuration:
## uncomment the following two lines for compatibility with alignments before the DC fixes
# dcMinistagger: "NOTONREFWIRE"
# dcFeedthroughs: "OFF"
# io-services:
# writer:
# schema_dir: "absolute-path-to-schema-folder"
# for example:
# schema_dir: "/home/clas12-1/chef/myClara/plugins/clas12/etc/bankdefs/dst"
io-services:
writer:
schema_dir: data-ai
services:
MAGFIELDS:
magfieldSolenoidMap: Symm_solenoid_r601_phi1_z1201_13June2018.dat
Expand Down
9 changes: 4 additions & 5 deletions etc/services/data-aicv.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,10 @@ configuration:
## uncomment the following two lines for compatibility with alignments before the DC fixes
# dcMinistagger: "NOTONREFWIRE"
# dcFeedthroughs: "OFF"
# io-services:
# writer:
# schema_dir: "absolute-path-to-schema-folder"
# for example:
# schema_dir: "/home/clas12-1/chef/myClara/plugins/clas12/etc/bankdefs/dst"
io-services:
writer:
schema_dir: data-aicv
#schema_dir: "/home/clas12-1/chef/myClara/plugins/clas12/etc/bankdefs/dst"
services:
MAGFIELDS:
magfieldSolenoidMap: Symm_solenoid_r601_phi1_z1201_13June2018.dat
Expand Down
8 changes: 3 additions & 5 deletions etc/services/data-cv.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,9 @@ configuration:
## uncomment the following two lines for compatibility with alignments before the DC fixes
# dcMinistagger: "NOTONREFWIRE"
# dcFeedthroughs: "OFF"
# io-services:
# writer:
# schema_dir: "absolute-path-to-schema-folder"
# for example:
# schema_dir: "/home/clas12-1/chef/myClara/plugins/clas12/etc/bankdefs/dst"
io-services:
writer:
schema_dir: data-cv
services:
MAGFIELDS:
magfieldSolenoidMap: Symm_solenoid_r601_phi1_z1201_13June2018.dat
Expand Down
6 changes: 3 additions & 3 deletions etc/services/dcalign.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ configuration:
global:
variation: rgb_spring2019
# timestamp: 12/31/2020-00:00:00
# io-services:
# writer:
# schema_dir: "absolute-path-to-distribution/etc/bankdefs/hipo4/singles/dcalign"
io-services:
writer:
schema_dir: dcalign
services:
MAGFIELDS:
magfieldSolenoidMap: Symm_solenoid_r601_phi1_z1201_13June2018.dat
Expand Down
2 changes: 1 addition & 1 deletion etc/services/decode.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ configuration:
variation: default
timestamp: 05/11/2025-00:00:00
writer:
schema_dir: /farm/home/baltzell/sw/coatjava/io-dev-2/coatjava/etc/bankdefs/hipo4/singles/dst
schema_dir: full
mime-types:
- binary/data-hipo
9 changes: 4 additions & 5 deletions etc/services/denoise.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,10 @@ configuration:
## uncomment the following two lines for compatibility with alignments before the DC fixes
# dcMinistagger: "NOTONREFWIRE"
# dcFeedthroughs: "OFF"
# io-services:
# writer:
# schema_dir: "absolute-path-to-schema-folder"
# for example:
# schema_dir: "/home/clas12-1/chef/myClara/plugins/clas12/etc/bankdefs/dst"
io-services:
writer:
schema_dir: dst
#schema_dir: "/home/clas12-1/chef/myClara/plugins/clas12/etc/bankdefs/dst"
services:
MAGFIELDS:
magfieldSolenoidMap: Symm_solenoid_r601_phi1_z1201_13June2018.dat
Expand Down
6 changes: 3 additions & 3 deletions etc/services/eb.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ services:
- class: org.jlab.service.eb.EBTBEngine
name: EBTB
configuration:
# io-services:
# writer:
# schema_dir: "absolute-path-to-schema-folder"
io-services:
writer:
schema_dir: dst
services:
EBTB:
dropBanks: 'true'
Expand Down
9 changes: 4 additions & 5 deletions etc/services/mc-ai.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,10 @@ configuration:
# timestamp: 12/31/2020-00:00:00
# dcMinistagger: "NOTONREFWIRE"
# dcFeedthroughs: "OFF"
# io-services:
# writer:
# schema_dir: "absolute-path-to-schema-folder"
# for example:
# schema_dir: "/home/clas12-1/chef/myClara/plugins/clas12/etc/bankdefs/dst"
io-services:
writer:
schema_dir: mc-ai
#schema_dir: "/home/clas12-1/chef/myClara/plugins/clas12/etc/bankdefs/dst"
services:
MAGFIELDS:
magfieldSolenoidMap: Symm_solenoid_r601_phi1_z1201_13June2018.dat
Expand Down
6 changes: 3 additions & 3 deletions etc/services/mc-aicv.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@ configuration:
# variation: rga_fall2018_mc
# dcMinistagger: "NOTONREFWIRE"
# dcFeedthroughs: "OFF"
# io-services:
# writer:
# schema_dir: "absolute-path-to-schema-folder"
io-services:
writer:
schema_dir: mc-aicv
services:
MAGFIELDS:
magfieldSolenoidMap: Symm_solenoid_r601_phi1_z1201_13June2018.dat
Expand Down
6 changes: 3 additions & 3 deletions etc/services/mc-cv.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ configuration:
# variation: rga_fall2018_mc
# dcMinistagger: "NOTONREFWIRE"
# dcFeedthroughs: "OFF"
# io-services:
# writer:
# schema_dir: "absolute-path-to-schema-folder"
io-services:
writer:
schema_dir: mc-cv
services:
MAGFIELDS:
magfieldSolenoidMap: Symm_solenoid_r601_phi1_z1201_13June2018.dat
Expand Down