diff --git a/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/ml/CVTFilter.java b/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/ml/CVTFilter.java index 8e18ec2a59..f7068085e3 100644 --- a/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/ml/CVTFilter.java +++ b/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/ml/CVTFilter.java @@ -30,6 +30,8 @@ */ public class CVTFilter extends ReconstructionEngine { + @Override + public void detectorChanged(int run) {} /** * @param docacutsum the docacutsum to set @@ -38,8 +40,6 @@ public void setDocacutsum(double docacutsum) { this.docacutsum = docacutsum; } - private int Run = -1; - private String svtHitBank; private String svtClusterBank; private String svtCrossBank; @@ -277,7 +277,7 @@ public void setBmtzmaxclussize(int bmtzmaxclussize) { } @Override - public boolean processDataEvent(DataEvent event) { + public boolean processDataEventUser(DataEvent event) { Swim swimmer = new Swim(); @@ -463,7 +463,6 @@ public void loadConfiguration() { } - public void initConstantsTables() { String[] tables = new String[]{ "/calibration/svt/status", @@ -583,7 +582,6 @@ public String getCovMat() { return cvtCovMatBank; } - public void printConfiguration() { System.out.println("["+this.getName()+"] run with cosmics setting set to "+Constants.getInstance().isCosmics); @@ -613,10 +611,6 @@ public void printConfiguration() { System.out.println("["+this.getName()+"] max btm-z cluster size "+this.getBmtzmaxclussize()); System.out.println("["+this.getName()+"] helix radius cut (mm) "+this.rcut); System.out.println("["+this.getName()+"] z0 cut (mm from target edges) "+this.z0cut); - - } - - } diff --git a/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/ml/SampleMaker.java b/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/ml/SampleMaker.java index a600b58e67..391c0392e7 100644 --- a/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/ml/SampleMaker.java +++ b/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/ml/SampleMaker.java @@ -29,7 +29,9 @@ */ public class SampleMaker extends ReconstructionEngine { - + @Override + public void detectorChanged(int run) {} + /** * @param docacutsum the docacutsum to set */ @@ -101,7 +103,6 @@ public SampleMaker() { super("CVTEngine", "ziegler", "6.0"); } - @Override public boolean init() { this.loadConfiguration(); @@ -285,7 +286,7 @@ public void setBmtzmaxclussize(int bmtzmaxclussize) { } @Override - public boolean processDataEvent(DataEvent event) { + public boolean processDataEventUser(DataEvent event) { Swim swimmer = new Swim(); @@ -693,6 +694,4 @@ public void printConfiguration() { } - - } diff --git a/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/ml/qcddat/SampleMaker.java b/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/ml/qcddat/SampleMaker.java index 588473489b..11179b2af2 100644 --- a/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/ml/qcddat/SampleMaker.java +++ b/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/ml/qcddat/SampleMaker.java @@ -29,9 +29,6 @@ */ public class SampleMaker extends ReconstructionEngine { - - private int Run = -1; - private String svtHitBank; public SampleMaker(String name) { @@ -42,7 +39,9 @@ public SampleMaker() { super("CVTQCDDATEngine", "ziegler", "6.0"); } - + @Override + public void detectorChanged(int run) {} + @Override public boolean init() { this.initConstantsTables(); @@ -70,10 +69,8 @@ public int getRun(DataEvent event) { return run; } - - @Override - public boolean processDataEvent(DataEvent event) { + public boolean processDataEventUser(DataEvent event) { int run = this.getRun(event); Swim swimmer = new Swim(); @@ -195,8 +192,4 @@ public void setSvtHitBank(String bstHitBank) { public String getSvtHitBank() { return this.svtHitBank; } - - - - }