Skip to content

Commit 590e950

Browse files
baltzellc-dilks
authored andcommitted
real-run-number changes (#1339)
1 parent 4da7978 commit 590e950

3 files changed

Lines changed: 11 additions & 25 deletions

File tree

reconstruction/cvt/src/main/java/org/jlab/rec/cvt/ml/CVTFilter.java

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
*/
3131
public class CVTFilter extends ReconstructionEngine {
3232

33+
@Override
34+
public void detectorChanged(int run) {}
3335

3436
/**
3537
* @param docacutsum the docacutsum to set
@@ -38,8 +40,6 @@ public void setDocacutsum(double docacutsum) {
3840
this.docacutsum = docacutsum;
3941
}
4042

41-
private int Run = -1;
42-
4343
private String svtHitBank;
4444
private String svtClusterBank;
4545
private String svtCrossBank;
@@ -277,7 +277,7 @@ public void setBmtzmaxclussize(int bmtzmaxclussize) {
277277
}
278278

279279
@Override
280-
public boolean processDataEvent(DataEvent event) {
280+
public boolean processDataEventUser(DataEvent event) {
281281

282282
Swim swimmer = new Swim();
283283

@@ -463,7 +463,6 @@ public void loadConfiguration() {
463463

464464
}
465465

466-
467466
public void initConstantsTables() {
468467
String[] tables = new String[]{
469468
"/calibration/svt/status",
@@ -583,7 +582,6 @@ public String getCovMat() {
583582
return cvtCovMatBank;
584583
}
585584

586-
587585
public void printConfiguration() {
588586

589587
System.out.println("["+this.getName()+"] run with cosmics setting set to "+Constants.getInstance().isCosmics);
@@ -613,10 +611,6 @@ public void printConfiguration() {
613611
System.out.println("["+this.getName()+"] max btm-z cluster size "+this.getBmtzmaxclussize());
614612
System.out.println("["+this.getName()+"] helix radius cut (mm) "+this.rcut);
615613
System.out.println("["+this.getName()+"] z0 cut (mm from target edges) "+this.z0cut);
616-
617-
618614
}
619615

620-
621-
622616
}

reconstruction/cvt/src/main/java/org/jlab/rec/cvt/ml/SampleMaker.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@
2929
*/
3030
public class SampleMaker extends ReconstructionEngine {
3131

32-
32+
@Override
33+
public void detectorChanged(int run) {}
34+
3335
/**
3436
* @param docacutsum the docacutsum to set
3537
*/
@@ -101,7 +103,6 @@ public SampleMaker() {
101103
super("CVTEngine", "ziegler", "6.0");
102104
}
103105

104-
105106
@Override
106107
public boolean init() {
107108
this.loadConfiguration();
@@ -285,7 +286,7 @@ public void setBmtzmaxclussize(int bmtzmaxclussize) {
285286
}
286287

287288
@Override
288-
public boolean processDataEvent(DataEvent event) {
289+
public boolean processDataEventUser(DataEvent event) {
289290

290291
Swim swimmer = new Swim();
291292

@@ -693,6 +694,4 @@ public void printConfiguration() {
693694

694695
}
695696

696-
697-
698697
}

reconstruction/cvt/src/main/java/org/jlab/rec/cvt/ml/qcddat/SampleMaker.java

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@
2929
*/
3030
public class SampleMaker extends ReconstructionEngine {
3131

32-
33-
private int Run = -1;
34-
3532
private String svtHitBank;
3633

3734
public SampleMaker(String name) {
@@ -42,7 +39,9 @@ public SampleMaker() {
4239
super("CVTQCDDATEngine", "ziegler", "6.0");
4340
}
4441

45-
42+
@Override
43+
public void detectorChanged(int run) {}
44+
4645
@Override
4746
public boolean init() {
4847
this.initConstantsTables();
@@ -70,10 +69,8 @@ public int getRun(DataEvent event) {
7069
return run;
7170
}
7271

73-
74-
7572
@Override
76-
public boolean processDataEvent(DataEvent event) {
73+
public boolean processDataEventUser(DataEvent event) {
7774

7875
int run = this.getRun(event);
7976
Swim swimmer = new Swim();
@@ -195,8 +192,4 @@ public void setSvtHitBank(String bstHitBank) {
195192
public String getSvtHitBank() {
196193
return this.svtHitBank;
197194
}
198-
199-
200-
201-
202195
}

0 commit comments

Comments
 (0)