Skip to content

Commit 9c4b215

Browse files
committed
fix: some build fixes
1 parent b8bbbc6 commit 9c4b215

File tree

1 file changed

+13
-33
lines changed

1 file changed

+13
-33
lines changed

reconstruction/cvt/src/main/java/org/jlab/rec/cvt/alignment/AlignmentBankReader.java

Lines changed: 13 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.util.ArrayList;
44
import java.util.List;
5+
import java.util.Collections;
56

67
import org.jlab.detector.base.DetectorType;
78
import org.jlab.geom.prim.Line3D;
@@ -25,16 +26,11 @@
2526
*/
2627
public class AlignmentBankReader {
2728

28-
private List<Cross> _SVTcrosses;
29-
private List<Cluster> _SVTclusters;
30-
private List<Cross> _BMTcrosses;
31-
private List<Cluster> _BMTclusters;
32-
3329
public List<StraightTrack> getCosmics(DataEvent event) {
3430

3531

36-
SVThits = RecoBankReader.readBSTHitBank(event, "BST::Hits");
37-
BMThits = RecoBankReader.readBMTHitBank(event, "BMT::Hits");
32+
var SVThits = RecoBankReader.readBSTHitBank(event, "BST::Hits");
33+
var BMThits = RecoBankReader.readBMTHitBank(event, "BMT::Hits");
3834
if(SVThits!= null) {
3935
Collections.sort(SVThits);
4036
}
@@ -45,12 +41,12 @@ public List<StraightTrack> getCosmics(DataEvent event) {
4541
Collections.sort(BMThits);
4642
}
4743

48-
_SVTclusters = RecoBankReader.readBSTClusterBank(event, SVThits, "BSTRec::Clusters");
49-
_BMTclusters = RecoBankReader.readBMTClusterBank(event, BMThits, "BMTRec::Clusters");
44+
var _SVTclusters = RecoBankReader.readBSTClusterBank(event, SVThits, "BSTRec::Clusters");
45+
var _BMTclusters = RecoBankReader.readBMTClusterBank(event, BMThits, "BMTRec::Clusters");
5046

5147

52-
_SVTcrosses = RecoBankReader.readBSTCrossBank(event, _SVTclusters, "BSTRec::Crosses");
53-
_BMTcrosses = RecoBankReader.readBMTCrossBank(event, _BMTclusters, "BMTRec::Crosses");
48+
var _SVTcrosses = RecoBankReader.readBSTCrossBank(event, _SVTclusters, "BSTRec::Crosses");
49+
var _BMTcrosses = RecoBankReader.readBMTCrossBank(event, _BMTclusters, "BMTRec::Crosses");
5450
if(_SVTcrosses!=null) {
5551
for(Cross cross : _SVTcrosses) {
5652
cross.setCluster1(_SVTclusters.get(cross.getCluster1().getId()-1));
@@ -94,8 +90,8 @@ public List<StraightTrack> getCosmics(DataEvent event) {
9490
public List<Track> getTracks(DataEvent event) {
9591

9692

97-
SVThits = RecoBankReader.readBSTHitBank(event, "BST::Hits");
98-
BMThits = RecoBankReader.readBMTHitBank(event, "BMT::Hits");
93+
var SVThits = RecoBankReader.readBSTHitBank(event, "BST::Hits");
94+
var BMThits = RecoBankReader.readBMTHitBank(event, "BMT::Hits");
9995
if(SVThits!= null) {
10096
Collections.sort(SVThits);
10197
}
@@ -106,12 +102,12 @@ public List<Track> getTracks(DataEvent event) {
106102
Collections.sort(BMThits);
107103
}
108104

109-
_SVTclusters = RecoBankReader.readBSTClusterBank(event, SVThits, "BSTRec::Clusters");
110-
_BMTclusters = RecoBankReader.readBMTClusterBank(event, BMThits, "BMT::Clusters");
105+
var _SVTclusters = RecoBankReader.readBSTClusterBank(event, SVThits, "BSTRec::Clusters");
106+
var _BMTclusters = RecoBankReader.readBMTClusterBank(event, BMThits, "BMT::Clusters");
111107

112108

113-
_SVTcrosses = RecoBankReader.readBSTCrossBank(event, _SVTclusters, "BSTRec::Crosses");
114-
_BMTcrosses = RecoBankReader.readBMTCrossBank(event, _BMTclusters, "BMTRec::Crosses");
109+
var _SVTcrosses = RecoBankReader.readBSTCrossBank(event, _SVTclusters, "BSTRec::Crosses");
110+
var _BMTcrosses = RecoBankReader.readBMTCrossBank(event, _BMTclusters, "BMTRec::Crosses");
115111
if(_SVTcrosses!=null) {
116112
for(Cross cross : _SVTcrosses) {
117113
cross.setCluster1(_SVTclusters.get(cross.getCluster1().getId()-1));
@@ -157,20 +153,4 @@ public List<Track> getTracks(DataEvent event) {
157153
}
158154

159155

160-
public List<Cluster> get_ClustersSVT() {
161-
return _SVTclusters;
162-
}
163-
164-
public List<Cluster> get_ClustersBMT() {
165-
return _BMTclusters;
166-
}
167-
168-
public List<Cross> get_CrossesSVT() {
169-
return _SVTcrosses;
170-
}
171-
172-
public List<Cross> get_CrossesBMT() {
173-
return _BMTcrosses;
174-
}
175-
176156
}

0 commit comments

Comments
 (0)