Skip to content

make recon-util YAML initialization a little more reusable #1390

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

Open
baltzell wants to merge 1 commit into
base: development
Choose a base branch
from
+16 −12
Open

make recon-util YAML initialization a little more reusable #1390

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 16 additions & 12 deletions common-tools/clas-reco/src/main/java/org/jlab/clas/reco/EngineProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,21 @@ private ReconstructionEngine findEngine(String clazz) {
return null;
}

public void parseYaml(String filename) {
ClaraYaml yaml = new ClaraYaml(filename);
if (yaml.schemaDirectory() != null) {
setBanksToKeep(yaml.schemaDirectory());
}
for (JSONObject service : yaml.services()) {
JSONObject cfg = yaml.filter(service.getString("name"));
if (cfg.length() > 0) {
addEngine(service.getString("name"),service.getString("class"),cfg.toString());
} else {
addEngine(service.getString("name"),service.getString("class"));
}
}
}

private void setBackgroundFiles(String filenames) {
if (findEngine(ENGINE_CLASS_BG) == null) {
LOGGER.info("Adding BackgroundEngine for -B option.");
Expand Down Expand Up @@ -406,18 +421,7 @@ public static void main(String[] args){
if(update.contains("false")==true) proc.updateDictionary = false;

if(!yamlFileName.equals("0")) {
ClaraYaml yaml = new ClaraYaml(yamlFileName);
if (yaml.schemaDirectory() != null) {
proc.setBanksToKeep(yaml.schemaDirectory());
}
for (JSONObject service : yaml.services()) {
JSONObject cfg = yaml.filter(service.getString("name"));
if (cfg.length() > 0) {
proc.addEngine(service.getString("name"),service.getString("class"),cfg.toString());
} else {
proc.addEngine(service.getString("name"),service.getString("class"));
}
}
proc.parseYaml(yamlFileName);
}
else if (config>0){
if(config>2){
Expand Down
Loading