diff --git a/common-tools/clara-io/src/main/java/org/jlab/io/clara/Clas12Writer.java b/common-tools/clara-io/src/main/java/org/jlab/io/clara/Clas12Writer.java index 405046e395..7fe4af36d1 100644 --- a/common-tools/clara-io/src/main/java/org/jlab/io/clara/Clas12Writer.java +++ b/common-tools/clara-io/src/main/java/org/jlab/io/clara/Clas12Writer.java @@ -9,7 +9,7 @@ import org.jlab.jnp.hipo4.data.Event; import org.jlab.jnp.hipo4.data.SchemaFactory; import org.jlab.jnp.hipo4.io.HipoWriterSorted; -import org.jlab.jnp.utils.file.FileUtils; +import org.jlab.utils.CLASResources; import org.json.JSONObject; /** @@ -28,7 +28,7 @@ public class Clas12Writer extends HipoToHipoWriter { SerialHoncho serial; Bank runConfig; ConstantsManager conman; - SchemaFactory fullSchema; + SchemaFactory fullSchema = CLASResources.getFullSchema(); HipoWriterSorted paraWriter; long paraCount; long paraTriggerMask; @@ -36,9 +36,7 @@ public class Clas12Writer extends HipoToHipoWriter { private void init(JSONObject opts) { occupancer = new Occupancer(opts.optLong("occTriggerMask",(long)1<<39),opts.optInt("occEvents",100)); - fullSchema = new SchemaFactory(); - fullSchema.initFromDirectory(FileUtils.getEnvironmentPath("CLAS12DIR","etc/bankdefs/hipo4")); - serial = new SerialHoncho(fullSchema); + serial = new SerialHoncho(); runConfig = new Bank(fullSchema.getSchema("RUN::config")); conman = new ConstantsManager(); conman.init("/runcontrol/hwp","/runcontrol/helicity"); diff --git a/common-tools/clas-detector/src/main/java/org/jlab/detector/serial/SerialHoncho.java b/common-tools/clas-detector/src/main/java/org/jlab/detector/serial/SerialHoncho.java index aae18cd75a..cdd3fb7faa 100644 --- a/common-tools/clas-detector/src/main/java/org/jlab/detector/serial/SerialHoncho.java +++ b/common-tools/clas-detector/src/main/java/org/jlab/detector/serial/SerialHoncho.java @@ -19,6 +19,7 @@ import org.jlab.jnp.hipo4.data.Schema; import org.jlab.jnp.hipo4.data.SchemaFactory; import org.jlab.jnp.hipo4.io.HipoWriterSorted; +import org.jlab.utils.CLASResources; /** * @@ -27,7 +28,7 @@ public class SerialHoncho { static final String[] TAG1BANKS = {"RUN::scaler","HEL::scaler","RAW::scaler","RAW::epics","HEL::flip","COAT::config"}; - SchemaFactory schema; + static final SchemaFactory SCHEMA = CLASResources.getFullSchema(); Schema[] tag1banks; Schema runConfig; Schema recEvent; @@ -40,20 +41,19 @@ public class SerialHoncho { volatile DaqScalersSequence scalers; int run = 0; - public SerialHoncho(SchemaFactory schema) { - this.schema = schema; + public SerialHoncho() { conman = new ConstantsManager(); conman.init("/runcontrol/hwp","/runcontrol/helicity"); - runConfig = schema.getSchema("RUN::config"); - recEvent = schema.getSchema("REC::Event"); - helicityAdc = schema.getSchema("HEL::adc"); - helScaler = schema.getSchema("HEL::scaler"); - scalers = new DaqScalersSequence(schema); + runConfig = SCHEMA.getSchema("RUN::config"); + recEvent = SCHEMA.getSchema("REC::Event"); + helicityAdc = SCHEMA.getSchema("HEL::adc"); + helScaler = SCHEMA.getSchema("HEL::scaler"); + scalers = new DaqScalersSequence(SCHEMA); helicities = new TreeSet<>(); eventUnix = new TreeMap<>(); tag1banks = new Schema[TAG1BANKS.length]; for (int i=0; i