From 9c4b2154368f7edaeb1b89135676ccf482cafb20 Mon Sep 17 00:00:00 2001 From: Christopher Dilks Date: Fri, 16 Feb 2024 17:45:55 -0500 Subject: [PATCH] fix: some build fixes --- .../cvt/alignment/AlignmentBankReader.java | 46 ++++++------------- 1 file changed, 13 insertions(+), 33 deletions(-) diff --git a/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/alignment/AlignmentBankReader.java b/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/alignment/AlignmentBankReader.java index 2b44d3594..858a1aac6 100644 --- a/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/alignment/AlignmentBankReader.java +++ b/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/alignment/AlignmentBankReader.java @@ -2,6 +2,7 @@ import java.util.ArrayList; import java.util.List; +import java.util.Collections; import org.jlab.detector.base.DetectorType; import org.jlab.geom.prim.Line3D; @@ -25,16 +26,11 @@ */ public class AlignmentBankReader { - private List _SVTcrosses; - private List _SVTclusters; - private List _BMTcrosses; - private List _BMTclusters; - public List getCosmics(DataEvent event) { - SVThits = RecoBankReader.readBSTHitBank(event, "BST::Hits"); - BMThits = RecoBankReader.readBMTHitBank(event, "BMT::Hits"); + var SVThits = RecoBankReader.readBSTHitBank(event, "BST::Hits"); + var BMThits = RecoBankReader.readBMTHitBank(event, "BMT::Hits"); if(SVThits!= null) { Collections.sort(SVThits); } @@ -45,12 +41,12 @@ public List getCosmics(DataEvent event) { Collections.sort(BMThits); } - _SVTclusters = RecoBankReader.readBSTClusterBank(event, SVThits, "BSTRec::Clusters"); - _BMTclusters = RecoBankReader.readBMTClusterBank(event, BMThits, "BMTRec::Clusters"); + var _SVTclusters = RecoBankReader.readBSTClusterBank(event, SVThits, "BSTRec::Clusters"); + var _BMTclusters = RecoBankReader.readBMTClusterBank(event, BMThits, "BMTRec::Clusters"); - _SVTcrosses = RecoBankReader.readBSTCrossBank(event, _SVTclusters, "BSTRec::Crosses"); - _BMTcrosses = RecoBankReader.readBMTCrossBank(event, _BMTclusters, "BMTRec::Crosses"); + var _SVTcrosses = RecoBankReader.readBSTCrossBank(event, _SVTclusters, "BSTRec::Crosses"); + var _BMTcrosses = RecoBankReader.readBMTCrossBank(event, _BMTclusters, "BMTRec::Crosses"); if(_SVTcrosses!=null) { for(Cross cross : _SVTcrosses) { cross.setCluster1(_SVTclusters.get(cross.getCluster1().getId()-1)); @@ -94,8 +90,8 @@ public List getCosmics(DataEvent event) { public List getTracks(DataEvent event) { - SVThits = RecoBankReader.readBSTHitBank(event, "BST::Hits"); - BMThits = RecoBankReader.readBMTHitBank(event, "BMT::Hits"); + var SVThits = RecoBankReader.readBSTHitBank(event, "BST::Hits"); + var BMThits = RecoBankReader.readBMTHitBank(event, "BMT::Hits"); if(SVThits!= null) { Collections.sort(SVThits); } @@ -106,12 +102,12 @@ public List getTracks(DataEvent event) { Collections.sort(BMThits); } - _SVTclusters = RecoBankReader.readBSTClusterBank(event, SVThits, "BSTRec::Clusters"); - _BMTclusters = RecoBankReader.readBMTClusterBank(event, BMThits, "BMT::Clusters"); + var _SVTclusters = RecoBankReader.readBSTClusterBank(event, SVThits, "BSTRec::Clusters"); + var _BMTclusters = RecoBankReader.readBMTClusterBank(event, BMThits, "BMT::Clusters"); - _SVTcrosses = RecoBankReader.readBSTCrossBank(event, _SVTclusters, "BSTRec::Crosses"); - _BMTcrosses = RecoBankReader.readBMTCrossBank(event, _BMTclusters, "BMTRec::Crosses"); + var _SVTcrosses = RecoBankReader.readBSTCrossBank(event, _SVTclusters, "BSTRec::Crosses"); + var _BMTcrosses = RecoBankReader.readBMTCrossBank(event, _BMTclusters, "BMTRec::Crosses"); if(_SVTcrosses!=null) { for(Cross cross : _SVTcrosses) { cross.setCluster1(_SVTclusters.get(cross.getCluster1().getId()-1)); @@ -157,20 +153,4 @@ public List getTracks(DataEvent event) { } - public List get_ClustersSVT() { - return _SVTclusters; - } - - public List get_ClustersBMT() { - return _BMTclusters; - } - - public List get_CrossesSVT() { - return _SVTcrosses; - } - - public List get_CrossesBMT() { - return _BMTcrosses; - } - }