From 57f20fa7c8d8a4ba2644a6b8f0842939eee865a8 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Fri, 9 Oct 2026 13:42:06 -0400 Subject: [PATCH 1/3] use lambdas for logging --- .../org/jlab/rec/dc/track/TrackCandListFinder.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/reconstruction/dc/src/main/java/org/jlab/rec/dc/track/TrackCandListFinder.java b/reconstruction/dc/src/main/java/org/jlab/rec/dc/track/TrackCandListFinder.java index 4138b01f35..da56a64044 100644 --- a/reconstruction/dc/src/main/java/org/jlab/rec/dc/track/TrackCandListFinder.java +++ b/reconstruction/dc/src/main/java/org/jlab/rec/dc/track/TrackCandListFinder.java @@ -969,7 +969,7 @@ private List findStraightTracks(CrossList crossList, DCGeant4Factory DcDe startTime = System.currentTimeMillis(); } Trajectory traj = trjFind.findTrajectory(aCrossList, DcDetector, dcSwim); - LOGGER.log(Level.FINEST, "Trajectory finding = " + (System.currentTimeMillis() - startTime)); + LOGGER.log(Level.FINEST, () -> "Trajectory finding = " + (System.currentTimeMillis() - startTime)); if (traj == null) { @@ -991,7 +991,7 @@ private List findStraightTracks(CrossList crossList, DCGeant4Factory DcDe cand.get(0).get_Dir().y() / cand.get(0).get_Dir().z()); cand.set_StateVecAtReg1MiddlePlane(VecAtReg1MiddlePlane); - LOGGER.log(Level.FINEST, "Kalman fitter - 2 = " + (System.currentTimeMillis() - startTime)); + LOGGER.log(Level.FINEST, () -> "Kalman fitter - 2 = " + (System.currentTimeMillis() - startTime)); KFitterStraight kFZRef = new KFitterStraight(true, 1, 1, dcSwim, Constants.getInstance().Z, Libr.JNP); List measSurfaces = getMeasSurfaces(cand, DcDetector); @@ -1070,7 +1070,7 @@ private List findCurvedTracks(CrossList crossList, DCGeant4Factory DcDete } Trajectory traj = trjFind.findTrajectory(aCrossList, DcDetector, dcSwim); - LOGGER.log(Level.FINEST, "Trajectory finding = " + (System.currentTimeMillis() - startTime)); + LOGGER.log(Level.FINEST, () -> "Trajectory finding = " + (System.currentTimeMillis() - startTime)); if (traj == null) { @@ -1138,7 +1138,7 @@ private List findCurvedTracks(CrossList crossList, DCGeant4Factory DcDete } int q = this.calcInitTrkQ(traj.getA(), TORSCALE); - LOGGER.log(Level.FINEST, "calcInitTrkQ = " + (System.currentTimeMillis() - startTime)); + LOGGER.log(Level.FINEST, () -> "calcInitTrkQ = " + (System.currentTimeMillis() - startTime)); if (p > 11) { p = 11; @@ -1161,7 +1161,7 @@ private List findCurvedTracks(CrossList crossList, DCGeant4Factory DcDete final int crossIdxinList = cand.get(1).isPseudoCross ? 0 : 1; - LOGGER.log(Level.FINEST, "Kalman fitter - 2 = " + (System.currentTimeMillis() - startTime)); + LOGGER.log(Level.FINEST, () -> "Kalman fitter - 2 = " + (System.currentTimeMillis() - startTime)); KFitter kFZRef = new KFitter(true, 10, 1, dcSwim, Constants.getInstance().Z, Libr.JNP); List measSurfaces = getMeasSurfaces(cand, DcDetector); From 05dfcd33b78de9ad4ebd4654fa8f2c2725df106e Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Fri, 9 Oct 2026 18:44:06 -0400 Subject: [PATCH 2/3] use labmdas for logging --- .../java/org/jlab/rec/dc/banks/HitReader.java | 10 +++++----- .../org/jlab/rec/dc/cluster/ClusterFinder.java | 1 - .../main/java/org/jlab/rec/dc/cross/Cross.java | 14 ++++++-------- .../main/java/org/jlab/rec/dc/hit/FittedHit.java | 1 - .../main/java/org/jlab/rec/dc/nn/PatternRec.java | 4 +--- .../java/org/jlab/rec/dc/segment/Segment.java | 4 ---- .../org/jlab/rec/dc/segment/SegmentFinder.java | 1 - .../jlab/rec/dc/timetodistance/T2DFunctions.java | 5 ----- .../jlab/rec/dc/timetodistance/TableLoader.java | 3 --- .../timetodistance/TimeToDistanceEstimator.java | 2 -- .../jlab/rec/dc/track/TrackCandListFinder.java | 12 ++++++------ .../java/org/jlab/rec/dc/trajectory/Surface.java | 1 - .../java/org/jlab/rec/dc/trajectory/TrackVec.java | 1 - .../org/jlab/rec/dc/trajectory/Trajectory.java | 3 --- .../rec/dc/trajectory/TrajectorySurfaces.java | 3 --- .../java/org/jlab/rec/dc/trajectory/Vertex.java | 1 - .../main/java/org/jlab/service/dc/DCEngine.java | 5 ++--- .../org/jlab/service/dc/DCHBPostClusterAI.java | 4 ++-- .../org/jlab/service/dc/DCHBPostClusterConv.java | 6 +++--- .../java/org/jlab/service/dc/DCHBTrackingAI.java | 4 ++-- .../main/java/org/jlab/service/dc/DCTBEngine.java | 15 ++++++--------- 21 files changed, 33 insertions(+), 67 deletions(-) diff --git a/reconstruction/dc/src/main/java/org/jlab/rec/dc/banks/HitReader.java b/reconstruction/dc/src/main/java/org/jlab/rec/dc/banks/HitReader.java index 6fca3cdab2..46c4ee7d76 100644 --- a/reconstruction/dc/src/main/java/org/jlab/rec/dc/banks/HitReader.java +++ b/reconstruction/dc/src/main/java/org/jlab/rec/dc/banks/HitReader.java @@ -148,11 +148,11 @@ private int getDCRBJitter(int sector, int layer, int wire, int order) { if(dcrbjitters!=null && reverseTT!=null) { long hash = IndexedTable.DEFAULT_GENERATOR.hashCode(sector, layer, wire, order); if(!reverseTT.hasEntryByHash(hash)) - LOGGER.log(Level.SEVERE, "Missing TT entry for slco = " + sector + " " + layer + " " + wire + " " + order); + LOGGER.log(Level.SEVERE, () -> "Missing TT entry for slco = " + sector + " " + layer + " " + wire + " " + order); int crate = reverseTT.getIntValueByHash("crate", hash); int slot = reverseTT.getIntValueByHash("slot", hash); if(!dcrbjitters.hasEntry(crate, slot)) - LOGGER.log(Level.SEVERE, "Missing DC::jitter entry for crate/slot = " + crate + "/" + slot); + LOGGER.log(Level.SEVERE, () -> "Missing DC::jitter entry for crate/slot = " + crate + "/" + slot); jitter = dcrbjitters.getIntValue("jitter", crate, slot); } return jitter; @@ -315,7 +315,7 @@ private void read_HBHits(TimeToDistanceEstimator tde) { String pointName = bankNames.getInputIdsBank(); String recBankName = bankNames.getRecEventBank(); - LOGGER.log(Level.FINEST,"Reading hb banks for "+ bankName + ", " + pointName + " " + recBankName); + LOGGER.log(Level.FINEST, () -> "Reading hb banks for "+ bankName + ", " + pointName + " " + recBankName); _HBHits = new ArrayList<>(); @@ -439,7 +439,7 @@ private void read_HBHits(TimeToDistanceEstimator tde) { //if(hit.betaFlag == 0) if(passHit(hit.betaFlag)) { this._HBHits.add(hit); - LOGGER.log(Level.FINEST, "Passing "+hit.printInfo()+" for "+ bankNames.getHitsBank()); + LOGGER.log(Level.FINEST, () -> "Passing "+hit.printInfo()+" for "+ bankNames.getHitsBank()); } } } @@ -512,7 +512,7 @@ private void read_NNHits() { hit.NNTrkP = this.aimatch.get(clusterID)[0]; hit.NNTrkTheta = this.aimatch.get(clusterID)[1]; hit.NNTrkPhi = this.aimatch.get(clusterID)[2]; - LOGGER.log(Level.FINEST, "NN"+hit.printInfo()); + LOGGER.log(Level.FINEST, () -> "NN"+hit.printInfo()); this._DCHits.add(hit); } } diff --git a/reconstruction/dc/src/main/java/org/jlab/rec/dc/cluster/ClusterFinder.java b/reconstruction/dc/src/main/java/org/jlab/rec/dc/cluster/ClusterFinder.java index 9887337d42..593db28aea 100644 --- a/reconstruction/dc/src/main/java/org/jlab/rec/dc/cluster/ClusterFinder.java +++ b/reconstruction/dc/src/main/java/org/jlab/rec/dc/cluster/ClusterFinder.java @@ -41,7 +41,6 @@ public class ClusterFinder { public ClusterFinder() { } - private static final Logger LOGGER = Logger.getLogger(ClusterFinder.class.getName()); // cluster finding algorithm // the loop is done over sector and superlayers diff --git a/reconstruction/dc/src/main/java/org/jlab/rec/dc/cross/Cross.java b/reconstruction/dc/src/main/java/org/jlab/rec/dc/cross/Cross.java index 7cf6263e99..5349aaefb8 100644 --- a/reconstruction/dc/src/main/java/org/jlab/rec/dc/cross/Cross.java +++ b/reconstruction/dc/src/main/java/org/jlab/rec/dc/cross/Cross.java @@ -407,9 +407,8 @@ public void set_CrossDirIntersSegWires() { double val_it1 = this._seg1.get_fittedCluster().get_clusterLineFitIntercept(); double val_it2 = this._seg2.get_fittedCluster().get_clusterLineFitIntercept(); - LOGGER.log(Level.FINEST, this._seg1.printInfo()+this._seg2.printInfo()+" insterWire: seg1 "+new Point3D(val_sl1, val_it1,999).toString()+ - " seg2 "+new Point3D(val_sl2, val_it2,999).toString() - ); + LOGGER.log(Level.FINEST, () -> this._seg1.printInfo()+this._seg2.printInfo()+" insterWire: seg1 "+new Point3D(val_sl1, val_it1,999).toString()+ + " seg2 "+new Point3D(val_sl2, val_it2,999).toString()); for(int i =0; i " .....insterWire: seg1 "+new Point3D(val_sl1, val_it1,z).toString()+ + " seg2 "+new Point3D(val_sl2, val_it2,z).toString()); double x = 0.5 * (val_it1 + val_it2) + 0.5 * z * (val_sl1 + val_sl2); double y = 0.5 * wy_over_wx * (val_it2 - val_it1) + 0.5 * wy_over_wx * z * (val_sl2 - val_sl1); if(hit.getCrossDirIntersWire()!=null && hit.getCrossDirIntersWire().x()!=x) - LOGGER.log(Level.FINEST, "Already exists "+hit.getCrossDirIntersWire().toString()+" for " - +hit.printInfo() +"new "+new Point3D(x,y,z).toString()); + LOGGER.log(Level.FINEST, () -> "Already exists "+hit.getCrossDirIntersWire().toString()+" for " + +hit.printInfo() +"new "+new Point3D(x,y,z).toString()); hit.setCrossDirIntersWire(new Point3D(x,y,z)); } diff --git a/reconstruction/dc/src/main/java/org/jlab/rec/dc/hit/FittedHit.java b/reconstruction/dc/src/main/java/org/jlab/rec/dc/hit/FittedHit.java index 08c35c3422..c9dec90771 100644 --- a/reconstruction/dc/src/main/java/org/jlab/rec/dc/hit/FittedHit.java +++ b/reconstruction/dc/src/main/java/org/jlab/rec/dc/hit/FittedHit.java @@ -1,7 +1,6 @@ package org.jlab.rec.dc.hit; import eu.mihosoft.vrl.v3d.Vector3d; -import org.jlab.clas.clas.math.FastMath; import org.jlab.clas.swimtools.Swimmer; import org.jlab.detector.geant4.v2.DCGeant4Factory; import org.jlab.geom.prim.Line3D; diff --git a/reconstruction/dc/src/main/java/org/jlab/rec/dc/nn/PatternRec.java b/reconstruction/dc/src/main/java/org/jlab/rec/dc/nn/PatternRec.java index bde2e522b5..8ba3813030 100644 --- a/reconstruction/dc/src/main/java/org/jlab/rec/dc/nn/PatternRec.java +++ b/reconstruction/dc/src/main/java/org/jlab/rec/dc/nn/PatternRec.java @@ -12,7 +12,6 @@ import org.jlab.rec.dc.Constants; import org.jlab.rec.dc.cluster.Cluster; import org.jlab.rec.dc.cluster.ClusterCleanerUtilities; -import org.jlab.rec.dc.cluster.ClusterFinder; import org.jlab.rec.dc.cluster.ClusterFitter; import org.jlab.rec.dc.cluster.ClusterFitter.CoordSys; import org.jlab.rec.dc.cluster.FittedCluster; @@ -32,7 +31,6 @@ public class PatternRec { private static final Logger LOGGER = Logger.getLogger(PatternRec.class.getName()); - private final ClusterFinder clf = new ClusterFinder(); private final ClusterCleanerUtilities ct = new ClusterCleanerUtilities(); private final ClusterFitter cf = new ClusterFitter(); private final CrossMaker crf = new CrossMaker(); @@ -114,7 +112,7 @@ public CrossList RecomposeCrossList(List clusters, if(entry.getValue().size()==3) crossList.add(entry.getValue()); for(Cross c : entry.getValue()) - LOGGER.log(Level.FINEST, "AI"+c.printInfo()+c.get_Segment1().printInfo()+c.get_Segment2().printInfo()); + LOGGER.log(Level.FINEST, () -> "AI"+c.printInfo()+c.get_Segment1().printInfo()+c.get_Segment2().printInfo()); } return crossList; } diff --git a/reconstruction/dc/src/main/java/org/jlab/rec/dc/segment/Segment.java b/reconstruction/dc/src/main/java/org/jlab/rec/dc/segment/Segment.java index 83f85af139..ea5124663f 100644 --- a/reconstruction/dc/src/main/java/org/jlab/rec/dc/segment/Segment.java +++ b/reconstruction/dc/src/main/java/org/jlab/rec/dc/segment/Segment.java @@ -2,12 +2,10 @@ import java.util.ArrayList; import java.util.List; -import java.util.logging.Logger; import org.jlab.detector.geant4.v2.DCGeant4Factory; import org.jlab.geom.prim.Plane3D; import org.jlab.geom.prim.Point3D; import org.jlab.geom.prim.Vector3D; -import org.jlab.clas.clas.math.FastMath; import org.jlab.rec.dc.Constants; import org.jlab.rec.dc.cluster.FittedCluster; import org.jlab.rec.dc.hit.FittedHit; @@ -23,8 +21,6 @@ public class Segment extends ArrayList implements Comparable, Cloneable { - private static final Logger LOGGER = Logger.getLogger(Segment.class.getName()); - private static final long serialVersionUID = -997960312423538455L; private FittedCluster _fittedCluster; public boolean isOnTrack = false; diff --git a/reconstruction/dc/src/main/java/org/jlab/rec/dc/segment/SegmentFinder.java b/reconstruction/dc/src/main/java/org/jlab/rec/dc/segment/SegmentFinder.java index ddb8b3091e..8b3fb311c0 100644 --- a/reconstruction/dc/src/main/java/org/jlab/rec/dc/segment/SegmentFinder.java +++ b/reconstruction/dc/src/main/java/org/jlab/rec/dc/segment/SegmentFinder.java @@ -2,7 +2,6 @@ import java.util.ArrayList; import java.util.List; -import org.jlab.clas.clas.math.FastMath; import org.jlab.detector.geant4.v2.DCGeant4Factory; import org.jlab.io.base.DataBank; import org.jlab.io.base.DataEvent; diff --git a/reconstruction/dc/src/main/java/org/jlab/rec/dc/timetodistance/T2DFunctions.java b/reconstruction/dc/src/main/java/org/jlab/rec/dc/timetodistance/T2DFunctions.java index 4892d5ceb8..f41c6026b6 100644 --- a/reconstruction/dc/src/main/java/org/jlab/rec/dc/timetodistance/T2DFunctions.java +++ b/reconstruction/dc/src/main/java/org/jlab/rec/dc/timetodistance/T2DFunctions.java @@ -1,8 +1,3 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package org.jlab.rec.dc.timetodistance; /** diff --git a/reconstruction/dc/src/main/java/org/jlab/rec/dc/timetodistance/TableLoader.java b/reconstruction/dc/src/main/java/org/jlab/rec/dc/timetodistance/TableLoader.java index c73a539019..d21bd960c0 100644 --- a/reconstruction/dc/src/main/java/org/jlab/rec/dc/timetodistance/TableLoader.java +++ b/reconstruction/dc/src/main/java/org/jlab/rec/dc/timetodistance/TableLoader.java @@ -4,7 +4,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.logging.Logger; import org.jlab.detector.base.DetectorType; import org.jlab.detector.base.GeometryFactory; import org.jlab.geom.base.ConstantProvider; @@ -23,8 +22,6 @@ public class TableLoader { public TableLoader() { } - public static final Logger LOGGER = Logger.getLogger(TableLoader.class.getName()); - private static boolean T2DLOADED = false; public static final int NBINST=2000; diff --git a/reconstruction/dc/src/main/java/org/jlab/rec/dc/timetodistance/TimeToDistanceEstimator.java b/reconstruction/dc/src/main/java/org/jlab/rec/dc/timetodistance/TimeToDistanceEstimator.java index 998541d165..3c249a38dd 100644 --- a/reconstruction/dc/src/main/java/org/jlab/rec/dc/timetodistance/TimeToDistanceEstimator.java +++ b/reconstruction/dc/src/main/java/org/jlab/rec/dc/timetodistance/TimeToDistanceEstimator.java @@ -1,7 +1,5 @@ package org.jlab.rec.dc.timetodistance; -import java.util.logging.Level; -import java.util.logging.Logger; import org.jlab.rec.dc.Constants; import static org.jlab.rec.dc.timetodistance.TableLoader.BfieldValues; import static org.jlab.rec.dc.timetodistance.TableLoader.calc_Time; diff --git a/reconstruction/dc/src/main/java/org/jlab/rec/dc/track/TrackCandListFinder.java b/reconstruction/dc/src/main/java/org/jlab/rec/dc/track/TrackCandListFinder.java index da56a64044..28a72a416e 100644 --- a/reconstruction/dc/src/main/java/org/jlab/rec/dc/track/TrackCandListFinder.java +++ b/reconstruction/dc/src/main/java/org/jlab/rec/dc/track/TrackCandListFinder.java @@ -719,9 +719,9 @@ private Integer getKey(Track trk) { public void removeOverlappingTracksOld(List trkcands) { if(Constants.DEBUG) { - LOGGER.log(Level.FINEST, "Found "+trkcands.size()+" HB seeds "); + LOGGER.log(Level.FINEST, () -> "Found "+trkcands.size()+" HB seeds "); for(int i = 0; i< trkcands.size(); i++) { - LOGGER.log(Level.FINEST, "cand "+i); + LOGGER.log(Level.FINEST, "cand {0}", i); for(Cross c : trkcands.get(i)) { LOGGER.log(Level.FINEST, c.printInfo()); } @@ -747,9 +747,9 @@ public void removeOverlappingTracksOld(List trkcands) { trkcands.add(entry.getValue()); }); if(Constants.DEBUG) { - LOGGER.log(Level.FINEST, "After Overlap Remvr "+trkcands.size()+" HB seeds "); + LOGGER.log(Level.FINEST, () -> "After Overlap Remvr "+trkcands.size()+" HB seeds "); for(int i = 0; i< trkcands.size(); i++) { - LOGGER.log(Level.FINEST, "cand "+i); + LOGGER.log(Level.FINEST, "cand {0}", i); for(Cross c : trkcands.get(i)) { LOGGER.log(Level.FINEST, c.printInfo()); } @@ -760,9 +760,9 @@ public void removeOverlappingTracksOld(List trkcands) { public void removeOverlappingTracks(List trkcands) { if(Constants.DEBUG) { - LOGGER.log(Level.FINEST, "Found "+trkcands.size()+" HB seeds "); + LOGGER.log(Level.FINEST, () -> "Found "+trkcands.size()+" HB seeds "); for(int i = 0; i< trkcands.size(); i++) { - LOGGER.log(Level.FINEST, "cand "+i); + LOGGER.log(Level.FINEST, "cand {0}", i); for(Cross c : trkcands.get(i)) { LOGGER.log(Level.FINEST, c.printInfo()); } diff --git a/reconstruction/dc/src/main/java/org/jlab/rec/dc/trajectory/Surface.java b/reconstruction/dc/src/main/java/org/jlab/rec/dc/trajectory/Surface.java index 542dab5405..474494a3bf 100644 --- a/reconstruction/dc/src/main/java/org/jlab/rec/dc/trajectory/Surface.java +++ b/reconstruction/dc/src/main/java/org/jlab/rec/dc/trajectory/Surface.java @@ -1,7 +1,6 @@ package org.jlab.rec.dc.trajectory; import org.jlab.detector.base.DetectorType; -import org.jlab.geom.prim.Arc3D; import org.jlab.geom.prim.Line3D; import org.jlab.geom.prim.Plane3D; import org.jlab.geom.prim.Point3D; diff --git a/reconstruction/dc/src/main/java/org/jlab/rec/dc/trajectory/TrackVec.java b/reconstruction/dc/src/main/java/org/jlab/rec/dc/trajectory/TrackVec.java index 656562eafa..5093a0c8e3 100644 --- a/reconstruction/dc/src/main/java/org/jlab/rec/dc/trajectory/TrackVec.java +++ b/reconstruction/dc/src/main/java/org/jlab/rec/dc/trajectory/TrackVec.java @@ -1,7 +1,6 @@ package org.jlab.rec.dc.trajectory; import Jama.*; -import org.jlab.clas.clas.math.FastMath; import org.jlab.rec.dc.Constants; /** * Describes a track pars in the DC. diff --git a/reconstruction/dc/src/main/java/org/jlab/rec/dc/trajectory/Trajectory.java b/reconstruction/dc/src/main/java/org/jlab/rec/dc/trajectory/Trajectory.java index ddb69ebf94..f2b82f3e9e 100644 --- a/reconstruction/dc/src/main/java/org/jlab/rec/dc/trajectory/Trajectory.java +++ b/reconstruction/dc/src/main/java/org/jlab/rec/dc/trajectory/Trajectory.java @@ -2,7 +2,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.logging.Logger; import org.jlab.clas.swimtools.Swim; import org.jlab.detector.base.DetectorType; import org.jlab.geom.prim.Point3D; @@ -23,8 +22,6 @@ public class Trajectory extends ArrayList { public Trajectory() { } - private static final Logger LOGGER = Logger.getLogger(Trajectory.class.getName()); - private int id; private int sector; private double integratedBdL; diff --git a/reconstruction/dc/src/main/java/org/jlab/rec/dc/trajectory/TrajectorySurfaces.java b/reconstruction/dc/src/main/java/org/jlab/rec/dc/trajectory/TrajectorySurfaces.java index 06241218dc..278922ff1b 100644 --- a/reconstruction/dc/src/main/java/org/jlab/rec/dc/trajectory/TrajectorySurfaces.java +++ b/reconstruction/dc/src/main/java/org/jlab/rec/dc/trajectory/TrajectorySurfaces.java @@ -16,7 +16,6 @@ import org.jlab.rec.dc.Constants; import java.io.PrintWriter; -import java.util.logging.Logger; import org.jlab.geom.detector.ec.ECLayer; import org.jlab.geom.detector.ec.ECSuperlayer; import org.jlab.geom.detector.fmt.FMTLayer; @@ -33,8 +32,6 @@ */ public class TrajectorySurfaces { - public static Logger LOGGER = Logger.getLogger(TrajectorySurfaces.class.getName()); - private List> detectorPlanes = new ArrayList<>(); public List> getDetectorPlanes() { diff --git a/reconstruction/dc/src/main/java/org/jlab/rec/dc/trajectory/Vertex.java b/reconstruction/dc/src/main/java/org/jlab/rec/dc/trajectory/Vertex.java index 3d862eec1a..1f3e89883b 100644 --- a/reconstruction/dc/src/main/java/org/jlab/rec/dc/trajectory/Vertex.java +++ b/reconstruction/dc/src/main/java/org/jlab/rec/dc/trajectory/Vertex.java @@ -1,7 +1,6 @@ package org.jlab.rec.dc.trajectory; import java.util.Random; -//import org.apache.commons.math3.util.FastMath; import org.jlab.clas.clas.math.FastMath; import org.jlab.clas.swimtools.Swim; import org.jlab.geom.prim.Line3D; diff --git a/reconstruction/dc/src/main/java/org/jlab/service/dc/DCEngine.java b/reconstruction/dc/src/main/java/org/jlab/service/dc/DCEngine.java index cd1eaddaf6..9e00490f75 100644 --- a/reconstruction/dc/src/main/java/org/jlab/service/dc/DCEngine.java +++ b/reconstruction/dc/src/main/java/org/jlab/service/dc/DCEngine.java @@ -12,7 +12,6 @@ import org.jlab.rec.dc.banks.Banks; import org.jlab.clas.tracking.kalmanfilter.zReference.KFitter; import org.jlab.clas.tracking.kalmanfilter.zReference.DAFilter; -import org.jlab.rec.ai.dcHBTrackState.HBTrackStateEstimator; public class DCEngine extends ReconstructionEngine { @@ -218,7 +217,7 @@ private void initBanks() { this.getBanks().init(outBankPrefix); if(inBankPrefix!=null && outBankPrefix!=null) this.getBanks().init(inBankPrefix, outBankPrefix); - LOGGER.log(Level.INFO,"["+this.getName()+"] bank names set for " + this.getBanks().toString()); + LOGGER.log(Level.INFO, () -> "["+this.getName()+"] bank names set for " + this.getBanks().toString()); } public Banks getBanks() { @@ -238,7 +237,7 @@ public int getRun(DataEvent event) { return 0; } DataBank bank = event.getBank("RUN::config"); - LOGGER.log(Level.FINEST,"["+this.getName()+"] EVENT "+bank.getInt("event", 0)); + LOGGER.log(Level.FINEST, () -> "["+this.getName()+"] EVENT "+bank.getInt("event", 0)); int run = bank.getInt("run", 0); return run; diff --git a/reconstruction/dc/src/main/java/org/jlab/service/dc/DCHBPostClusterAI.java b/reconstruction/dc/src/main/java/org/jlab/service/dc/DCHBPostClusterAI.java index 75998a1325..4d5099e431 100644 --- a/reconstruction/dc/src/main/java/org/jlab/service/dc/DCHBPostClusterAI.java +++ b/reconstruction/dc/src/main/java/org/jlab/service/dc/DCHBPostClusterAI.java @@ -100,11 +100,11 @@ public boolean processDataEventUser(DataEvent event) { CrossList crosslist = pr.RecomposeCrossList(segments, Constants.getInstance().dcDetector); crosses = new ArrayList<>(); - LOGGER.log(Level.FINEST, "num cands = "+crosslist.size()); + LOGGER.log(Level.FINEST, () -> "num cands = "+crosslist.size()); for (List clist : crosslist) { crosses.addAll(clist); for(Cross c : clist) - LOGGER.log(Level.FINEST, "Pass Cross"+c.printInfo()); + LOGGER.log(Level.FINEST, () -> "Pass Cross"+c.printInfo()); } if (crosses.isEmpty()) { for(Segment seg : segments) { diff --git a/reconstruction/dc/src/main/java/org/jlab/service/dc/DCHBPostClusterConv.java b/reconstruction/dc/src/main/java/org/jlab/service/dc/DCHBPostClusterConv.java index df442203c9..52acb25796 100644 --- a/reconstruction/dc/src/main/java/org/jlab/service/dc/DCHBPostClusterConv.java +++ b/reconstruction/dc/src/main/java/org/jlab/service/dc/DCHBPostClusterConv.java @@ -228,11 +228,11 @@ public boolean processDataEventUser(DataEvent event) { trkcands.addAll(mistrkcands); - LOGGER.log(Level.FINEST, "Found after 5STg "+mistrkcands.size()+" HB seeds "); + LOGGER.log(Level.FINEST, () -> "Found after 5STg "+mistrkcands.size()+" HB seeds "); for(int i = 0; i< trkcands.size(); i++) { - LOGGER.log(Level.FINEST, "cand "+i); + LOGGER.log(Level.FINEST, "cand {0}", i); for(Cross c : trkcands.get(i)) { - LOGGER.log(Level.FINEST, c.printInfo()); + LOGGER.log(Level.FINEST, () -> c.printInfo()); } LOGGER.log(Level.FINEST, "------------------------------------------------------------------ "); } diff --git a/reconstruction/dc/src/main/java/org/jlab/service/dc/DCHBTrackingAI.java b/reconstruction/dc/src/main/java/org/jlab/service/dc/DCHBTrackingAI.java index 80651c3c42..38f4db4dfe 100644 --- a/reconstruction/dc/src/main/java/org/jlab/service/dc/DCHBTrackingAI.java +++ b/reconstruction/dc/src/main/java/org/jlab/service/dc/DCHBTrackingAI.java @@ -122,11 +122,11 @@ else if(Swimmer.getTorScale() > 0) CrossList crosslist = pr.RecomposeCrossList(segments, Constants.getInstance().dcDetector); crosses = new ArrayList<>(); - LOGGER.log(Level.FINEST, "num cands = "+crosslist.size()); + LOGGER.log(Level.FINEST, () -> "num cands = "+crosslist.size()); for (List clist : crosslist) { crosses.addAll(clist); for(Cross c : clist) - LOGGER.log(Level.FINEST, "Pass Cross"+c.printInfo()); + LOGGER.log(Level.FINEST, () -> "Pass Cross"+c.printInfo()); } if (crosses.isEmpty()) { for(Segment seg : segments) { diff --git a/reconstruction/dc/src/main/java/org/jlab/service/dc/DCTBEngine.java b/reconstruction/dc/src/main/java/org/jlab/service/dc/DCTBEngine.java index a483d218e2..2d99bf11fa 100644 --- a/reconstruction/dc/src/main/java/org/jlab/service/dc/DCTBEngine.java +++ b/reconstruction/dc/src/main/java/org/jlab/service/dc/DCTBEngine.java @@ -103,12 +103,10 @@ public boolean processDataEventUser(DataEvent event) { ClusterCleanerUtilities ct = new ClusterCleanerUtilities(); List fhits = new ArrayList<>(); - List clusters = new ArrayList<>(); - List segments = new ArrayList<>(); List crosses = new ArrayList<>(); List trkcands = new ArrayList<>(); - LOGGER.log(Level.FINEST, "TB AI "+ this.getName()); + LOGGER.log(Level.FINEST, () -> "TB AI "+ this.getName()); //instantiate bank writer RecoBankWriter rbc = new RecoBankWriter(this.getBanks()); @@ -125,7 +123,7 @@ public boolean processDataEventUser(DataEvent event) { //2) find the clusters from these hits ClusterFinder clusFinder = new ClusterFinder(); - clusters = clusFinder.FindTimeBasedClusters(event, hits, cf, ct, + List clusters = clusFinder.FindTimeBasedClusters(event, hits, cf, ct, this.getConstantsManager().getConstants(run, Constants.TIME2DIST), Constants.getInstance().dcDetector, tde); for(FittedCluster c : clusters) { c.set_Id(c.get(0).get_AssociatedClusterID()); @@ -140,7 +138,7 @@ public boolean processDataEventUser(DataEvent event) { List pclusters = segFinder.selectTimeBasedSegments(clusters); - segments = segFinder.get_Segments(pclusters, event, Constants.getInstance().dcDetector, false); + List segments = segFinder.get_Segments(pclusters, event, Constants.getInstance().dcDetector, false); if(segments.isEmpty()) { // need 6 segments to make a trajectory for(FittedCluster c : clusters) { @@ -353,7 +351,7 @@ public boolean processDataEventUser(DataEvent event) { //trk.set_Id(trkId); trkcandFinder.matchHits(trk.getStateVecs(), trk, Constants.getInstance().dcDetector, dcSwim); trk.calcTrajectory(trkId, dcSwim, trk.get_Vtx0(), trk.get_pAtOrig(), trk.get_Q()); - LOGGER.log(Level.FINEST, trk.toString()); + LOGGER.log(Level.FINEST,() -> trk.toString()); for(Cross c : trk) { c.set_CrossDirIntersSegWires(); @@ -596,7 +594,6 @@ public List getMeasSurfaces(Track trk, DCGeant4Factory DcDetector) { double LR = Math.signum(trk.get_ListOfHBSegments().get(s).get(h).get_XWire()-trk.get_ListOfHBSegments().get(s).get(h).get_X()); hot._doca[0]*=-LR; hot._hitError = trk.get_ListOfHBSegments().get(s).get(h).get_DocaErr()*trk.get_ListOfHBSegments().get(s).get(h).get_DocaErr(); - //LOGGER.log(Level.FINEST, " Z "+Z+" ferr "+(float)(hot._Unc /(hot._hitError/4.))); hot._Unc[0] = hot._hitError; hot.region = trk.get_ListOfHBSegments().get(s).get(h).get_Region(); hot.sector = trk.get_ListOfHBSegments().get(s).get(h).get_Sector(); @@ -693,11 +690,11 @@ private int get_Status(Track track) { miss=l+1; if(miss%2==0 && SegMap.containsKey(l)) { //missing sl in 2,4,6 track.setSingleSuperlayer(SegMap.get(l)); //isolated sl in 1,3,5 - LOGGER.log(Level.FINEST, "Missing superlayer "+miss+" seg "+SegMap.get(l).printInfo()); + LOGGER.log(Level.FINEST, "Missing superlayer {0} seg {1}", new Object[]{miss, SegMap.get(l).printInfo()}); } else if(miss%2==1 && SegMap.containsKey(l+2)) { //missing sl in 1,3,5 track.setSingleSuperlayer(SegMap.get(l+2)); //isolated sl in 2,4,6 - LOGGER.log(Level.FINEST, "Missing superlayer "+miss+" seg "+track.getSingleSuperlayer().printInfo()); + LOGGER.log(Level.FINEST, "Missing superlayer {0} seg {1}", new Object[]{miss, track.getSingleSuperlayer().printInfo()}); } } } From 900617fec32ce93b3be32eb1d16d95ce78b3bd01 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Fri, 9 Oct 2026 18:50:30 -0400 Subject: [PATCH 3/3] disable printout --- .../dc/src/main/java/org/jlab/service/dc/DCTBEngine.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/reconstruction/dc/src/main/java/org/jlab/service/dc/DCTBEngine.java b/reconstruction/dc/src/main/java/org/jlab/service/dc/DCTBEngine.java index 2d99bf11fa..4bf0281c17 100644 --- a/reconstruction/dc/src/main/java/org/jlab/service/dc/DCTBEngine.java +++ b/reconstruction/dc/src/main/java/org/jlab/service/dc/DCTBEngine.java @@ -690,11 +690,11 @@ private int get_Status(Track track) { miss=l+1; if(miss%2==0 && SegMap.containsKey(l)) { //missing sl in 2,4,6 track.setSingleSuperlayer(SegMap.get(l)); //isolated sl in 1,3,5 - LOGGER.log(Level.FINEST, "Missing superlayer {0} seg {1}", new Object[]{miss, SegMap.get(l).printInfo()}); + //LOGGER.log(Level.FINEST, "Missing superlayer {0} seg {1}", new Object[]{miss, SegMap.get(l).printInfo()}); } else if(miss%2==1 && SegMap.containsKey(l+2)) { //missing sl in 1,3,5 track.setSingleSuperlayer(SegMap.get(l+2)); //isolated sl in 2,4,6 - LOGGER.log(Level.FINEST, "Missing superlayer {0} seg {1}", new Object[]{miss, track.getSingleSuperlayer().printInfo()}); + //LOGGER.log(Level.FINEST, "Missing superlayer {0} seg {1}", new Object[]{miss, track.getSingleSuperlayer().printInfo()}); } } }