From cde7ab67648995c5c6cb04241ac9b24c15ff482c Mon Sep 17 00:00:00 2001 From: Christopher Dilks Date: Mon, 17 Nov 2025 17:20:38 -0500 Subject: [PATCH] fix: use `SplitLogger` for all loggers This PR extends #951 by replacing all `Logger.getLogger` patterns with `SplitLogger.create`. --- .../src/main/java/org/jlab/io/evio/EvioDataDictionary.java | 3 ++- .../clas-io/src/main/java/org/jlab/io/evio/EvioSource.java | 3 ++- .../clas-io/src/main/java/org/jlab/io/hipo/HipoDataSync.java | 3 ++- .../java/org/jlab/detector/geant4/v2/DCGeant4Factory.java | 3 ++- .../java/org/jlab/detector/geant4/v2/SVT/SVTConstants.java | 3 ++- .../main/java/org/jlab/clas/reco/ReconstructionEngine.java | 3 ++- .../clas/tracking/kalmanfilter/zReference/Constants.java | 5 +++-- .../src/main/java/cnuphys/magfield/MagneticField.java | 3 ++- .../src/main/java/cnuphys/magfield/MagneticFields.java | 3 ++- .../magfield/src/main/java/cnuphys/magfield/Torus.java | 3 ++- .../cnuphys/swimmer/src/main/java/cnuphys/swim/Swimmer.java | 3 ++- .../main/java/org/jlab/clas/swimtools/MagFieldsEngine.java | 3 ++- .../src/main/java/org/jlab/clas/swimtools/Swimmer.java | 3 ++- .../main/java/org/jlab/rec/ahdc/HelixFit/HelixFitJava.java | 3 ++- .../alert/src/main/java/org/jlab/rec/atof/hit/ATOFHit.java | 3 ++- .../src/main/java/org/jlab/service/atof/ATOFEngine.java | 3 ++- .../src/main/java/org/jlab/service/bg/BackgroundEngine.java | 3 ++- .../java/org/jlab/calibration/service/CalibBanksEngine.java | 3 ++- .../cvt/src/main/java/org/jlab/rec/cvt/Constants.java | 3 ++- .../main/java/org/jlab/rec/cvt/bmt/CCDBConstantsLoader.java | 3 ++- .../dc/src/main/java/org/jlab/rec/dc/Constants.java | 3 ++- .../dc/src/main/java/org/jlab/rec/dc/banks/HitReader.java | 3 ++- .../org/jlab/rec/dc/cluster/ClusterCleanerUtilities.java | 3 ++- .../src/main/java/org/jlab/rec/dc/cluster/ClusterFinder.java | 3 ++- .../dc/src/main/java/org/jlab/rec/dc/cross/Cross.java | 3 ++- .../dc/src/main/java/org/jlab/rec/dc/nn/PatternRec.java | 3 ++- .../dc/src/main/java/org/jlab/rec/dc/segment/Segment.java | 3 ++- .../java/org/jlab/rec/dc/timetodistance/TableLoader.java | 3 ++- .../main/java/org/jlab/rec/dc/track/TrackCandListFinder.java | 3 ++- .../src/main/java/org/jlab/rec/dc/track/fit/KFitterDoca.java | 3 ++- .../main/java/org/jlab/rec/dc/track/fit/MeasVecsDoca.java | 3 ++- .../main/java/org/jlab/rec/dc/track/fit/StateVecsDoca.java | 3 ++- .../src/main/java/org/jlab/rec/dc/trajectory/Trajectory.java | 3 ++- .../java/org/jlab/rec/dc/trajectory/TrajectorySurfaces.java | 3 ++- .../eb/src/main/java/org/jlab/service/eb/EBEngine.java | 3 ++- .../ec/src/main/java/org/jlab/service/ec/ECEngine.java | 3 ++- .../org/jlab/service/htcc/HTCCReconstructionService.java | 3 ++- .../ltcc/src/main/java/org/jlab/service/ltcc/LTCCEngine.java | 3 ++- .../main/java/org/jlab/service/postproc/PostprocEngine.java | 3 ++- .../src/main/java/org/jlab/service/raster/RasterEngine.java | 3 ++- .../src/main/java/org/jlab/service/recoil/RecoilEngine.java | 3 ++- .../src/main/java/org/jlab/service/urwell/URWellEngine.java | 3 ++- 42 files changed, 85 insertions(+), 43 deletions(-) diff --git a/common-tools/clas-io/src/main/java/org/jlab/io/evio/EvioDataDictionary.java b/common-tools/clas-io/src/main/java/org/jlab/io/evio/EvioDataDictionary.java index 1129c8a18b..87fc32e34c 100644 --- a/common-tools/clas-io/src/main/java/org/jlab/io/evio/EvioDataDictionary.java +++ b/common-tools/clas-io/src/main/java/org/jlab/io/evio/EvioDataDictionary.java @@ -6,6 +6,7 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; +import org.jlab.logging.SplitLogger; import org.jlab.io.base.DataBank; import org.jlab.io.base.DataDescriptor; @@ -20,7 +21,7 @@ */ public class EvioDataDictionary implements DataDictionary { - static final Logger LOGGER = Logger.getLogger(EvioDataDictionary.class.getName()); + static final Logger LOGGER = SplitLogger.create(EvioDataDictionary.class.getName()); private HashMap descriptors = new HashMap<>(); public EvioDataDictionary() { diff --git a/common-tools/clas-io/src/main/java/org/jlab/io/evio/EvioSource.java b/common-tools/clas-io/src/main/java/org/jlab/io/evio/EvioSource.java index abadc99fc9..c276067f7f 100644 --- a/common-tools/clas-io/src/main/java/org/jlab/io/evio/EvioSource.java +++ b/common-tools/clas-io/src/main/java/org/jlab/io/evio/EvioSource.java @@ -6,6 +6,7 @@ import java.nio.ByteOrder; import java.util.logging.Level; import java.util.logging.Logger; +import org.jlab.logging.SplitLogger; import org.jlab.coda.jevio.EvioCompactReader; import org.jlab.coda.jevio.EvioException; @@ -16,7 +17,7 @@ public final class EvioSource implements DataSource { - static final Logger LOGGER = Logger.getLogger(EvioSource.class.getName()); + static final Logger LOGGER = SplitLogger.create(EvioSource.class.getName()); private ByteOrder storeByteOrder = ByteOrder.BIG_ENDIAN; private EvioCompactReader evioReader = null; private int currentEvent; diff --git a/common-tools/clas-io/src/main/java/org/jlab/io/hipo/HipoDataSync.java b/common-tools/clas-io/src/main/java/org/jlab/io/hipo/HipoDataSync.java index c401daaaa0..3f448d6727 100644 --- a/common-tools/clas-io/src/main/java/org/jlab/io/hipo/HipoDataSync.java +++ b/common-tools/clas-io/src/main/java/org/jlab/io/hipo/HipoDataSync.java @@ -3,6 +3,7 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; +import org.jlab.logging.SplitLogger; import org.jlab.io.base.DataEvent; import org.jlab.io.base.DataSync; import org.jlab.io.base.DataBank; @@ -17,7 +18,7 @@ */ public class HipoDataSync implements DataSync { - public static final Logger LOGGER = Logger.getLogger(HipoDataSync.class.getName()); + public static final Logger LOGGER = SplitLogger.create(HipoDataSync.class.getName()); HipoWriterSorted writer = null; diff --git a/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java b/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java index 85ba18104d..649e34d46c 100644 --- a/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java +++ b/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java @@ -4,6 +4,7 @@ import java.util.HashMap; import java.util.logging.Level; import java.util.logging.Logger; +import org.jlab.logging.SplitLogger; import org.jlab.detector.base.DetectorType; import org.jlab.detector.base.GeometryFactory; import org.jlab.detector.units.SystemOfUnits.Length; @@ -573,7 +574,7 @@ public Vector3d center() { /////////////////////////////////////////////////// public final class DCGeant4Factory extends Geant4Factory { - private static final Logger LOGGER = Logger.getLogger("DCGeant4Factory"); + private static final Logger LOGGER = SplitLogger.create("DCGeant4Factory"); DCdatabase dbref = null; private final HashMap properties = new HashMap<>(); diff --git a/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/SVT/SVTConstants.java b/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/SVT/SVTConstants.java index dd7c9275a7..391d3861af 100644 --- a/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/SVT/SVTConstants.java +++ b/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/SVT/SVTConstants.java @@ -6,6 +6,7 @@ import java.util.Map.Entry; import java.util.logging.Level; import java.util.logging.Logger; +import org.jlab.logging.SplitLogger; import org.jlab.detector.calib.utils.DatabaseConstantProvider; // coatjava-3.0 @@ -33,7 +34,7 @@ */ public class SVTConstants { - public static Logger LOGGER = Logger.getLogger(SVTConstants.class.getName()); + public static Logger LOGGER = SplitLogger.create(SVTConstants.class.getName()); private static String ccdbPath = "/geometry/cvt/svt/"; private static boolean bLoadedConstants = false; // only load constants once diff --git a/common-tools/clas-reco/src/main/java/org/jlab/clas/reco/ReconstructionEngine.java b/common-tools/clas-reco/src/main/java/org/jlab/clas/reco/ReconstructionEngine.java index f39aa79a20..9248667a25 100644 --- a/common-tools/clas-reco/src/main/java/org/jlab/clas/reco/ReconstructionEngine.java +++ b/common-tools/clas-reco/src/main/java/org/jlab/clas/reco/ReconstructionEngine.java @@ -12,6 +12,7 @@ import java.util.concurrent.ConcurrentMap; import java.util.logging.Level; import java.util.logging.Logger; +import org.jlab.logging.SplitLogger; import org.jlab.clara.base.ClaraUtil; import org.jlab.clara.engine.Engine; import org.jlab.clara.engine.EngineData; @@ -40,7 +41,7 @@ */ public abstract class ReconstructionEngine implements Engine { - Logger LOGGER = Logger.getLogger(ReconstructionEngine.class.getName()); + Logger LOGGER = SplitLogger.create(ReconstructionEngine.class.getName()); public static final String CONFIG_BANK_NAME = "COAT::config"; diff --git a/common-tools/clas-tracking/src/main/java/org/jlab/clas/tracking/kalmanfilter/zReference/Constants.java b/common-tools/clas-tracking/src/main/java/org/jlab/clas/tracking/kalmanfilter/zReference/Constants.java index 7eb9d2cfb7..40d86e6e10 100644 --- a/common-tools/clas-tracking/src/main/java/org/jlab/clas/tracking/kalmanfilter/zReference/Constants.java +++ b/common-tools/clas-tracking/src/main/java/org/jlab/clas/tracking/kalmanfilter/zReference/Constants.java @@ -1,6 +1,7 @@ package org.jlab.clas.tracking.kalmanfilter.zReference; import java.util.logging.Logger; +import org.jlab.logging.SplitLogger; /** * Constants used in forward tracking @@ -14,7 +15,7 @@ private Constants() { } - public static Logger LOGGER = Logger.getLogger(Constants.class.getName()); + public static Logger LOGGER = SplitLogger.create(Constants.class.getName()); // CONSTATNS for TRANSFORMATION public static final double ITERSTOPXHB = 1.2e-2; @@ -29,4 +30,4 @@ private Constants() { public static final double ITERSTOPTYTB = 3.5e-6; public static final double ITERSTOPQTB = 1.1e-5; -} \ No newline at end of file +} diff --git a/common-tools/cnuphys/magfield/src/main/java/cnuphys/magfield/MagneticField.java b/common-tools/cnuphys/magfield/src/main/java/cnuphys/magfield/MagneticField.java index 43480d9dee..15ed78f322 100644 --- a/common-tools/cnuphys/magfield/src/main/java/cnuphys/magfield/MagneticField.java +++ b/common-tools/cnuphys/magfield/src/main/java/cnuphys/magfield/MagneticField.java @@ -9,6 +9,7 @@ import java.nio.FloatBuffer; import java.util.logging.Level; import java.util.logging.Logger; +import org.jlab.logging.SplitLogger; /** * For magnetic fields stored in a specific format. This is low-level, @@ -19,7 +20,7 @@ * @version 1.0 */ public abstract class MagneticField implements IMagField { - public static Logger LOGGER = Logger.getLogger(MagneticField.class.getName()); + public static Logger LOGGER = SplitLogger.create(MagneticField.class.getName()); /** Magic number used to check if byteswapping is necessary. */ public static final int MAGICNUMBER = 0xced; diff --git a/common-tools/cnuphys/magfield/src/main/java/cnuphys/magfield/MagneticFields.java b/common-tools/cnuphys/magfield/src/main/java/cnuphys/magfield/MagneticFields.java index 0e21160ee8..6b8862c95b 100644 --- a/common-tools/cnuphys/magfield/src/main/java/cnuphys/magfield/MagneticFields.java +++ b/common-tools/cnuphys/magfield/src/main/java/cnuphys/magfield/MagneticFields.java @@ -13,6 +13,7 @@ import java.util.TimeZone; import java.util.logging.Level; import java.util.logging.Logger; +import org.jlab.logging.SplitLogger; import javax.swing.ButtonGroup; import javax.swing.JFileChooser; @@ -30,7 +31,7 @@ */ public class MagneticFields { - public static Logger LOGGER = Logger.getLogger(MagneticField.class.getName()); + public static Logger LOGGER = SplitLogger.create(MagneticField.class.getName()); // used for rotating to tilted sector coordinates private static final double ROOT3OVER2 = Math.sqrt(3) / 2; diff --git a/common-tools/cnuphys/magfield/src/main/java/cnuphys/magfield/Torus.java b/common-tools/cnuphys/magfield/src/main/java/cnuphys/magfield/Torus.java index bd42ef59c0..17e43f2713 100644 --- a/common-tools/cnuphys/magfield/src/main/java/cnuphys/magfield/Torus.java +++ b/common-tools/cnuphys/magfield/src/main/java/cnuphys/magfield/Torus.java @@ -5,6 +5,7 @@ import java.io.PrintStream; import java.util.logging.Level; import java.util.logging.Logger; +import org.jlab.logging.SplitLogger; /** * The Class Torus. @@ -15,7 +16,7 @@ public class Torus extends MagneticField { - public static Logger LOGGER = Logger.getLogger(Torus.class.getName()); + public static Logger LOGGER = SplitLogger.create(Torus.class.getName()); //has part of the solenoid been added in to remove the overlap? diff --git a/common-tools/cnuphys/swimmer/src/main/java/cnuphys/swim/Swimmer.java b/common-tools/cnuphys/swimmer/src/main/java/cnuphys/swim/Swimmer.java index c170bebcf8..ec0e2e47e7 100644 --- a/common-tools/cnuphys/swimmer/src/main/java/cnuphys/swim/Swimmer.java +++ b/common-tools/cnuphys/swimmer/src/main/java/cnuphys/swim/Swimmer.java @@ -3,6 +3,7 @@ import java.util.ArrayList; import java.util.logging.Level; import java.util.logging.Logger; +import org.jlab.logging.SplitLogger; import cnuphys.adaptiveSwim.AdaptiveSwimResult; import cnuphys.adaptiveSwim.geometry.Cylinder; @@ -28,7 +29,7 @@ * */ public final class Swimmer { - public static Logger LOGGER = Logger.getLogger(Swimmer.class.getName()); + public static Logger LOGGER = SplitLogger.create(Swimmer.class.getName()); // Speed of light in m/s public static final double C = 299792458.0; // m/s diff --git a/common-tools/swim-tools/src/main/java/org/jlab/clas/swimtools/MagFieldsEngine.java b/common-tools/swim-tools/src/main/java/org/jlab/clas/swimtools/MagFieldsEngine.java index ceab50389a..2e9ba0aab8 100644 --- a/common-tools/swim-tools/src/main/java/org/jlab/clas/swimtools/MagFieldsEngine.java +++ b/common-tools/swim-tools/src/main/java/org/jlab/clas/swimtools/MagFieldsEngine.java @@ -5,6 +5,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Level; import java.util.logging.Logger; +import org.jlab.logging.SplitLogger; import org.jlab.clas.reco.ReconstructionEngine; import org.jlab.io.base.DataBank; @@ -14,7 +15,7 @@ public class MagFieldsEngine extends ReconstructionEngine { - public static Logger LOGGER = Logger.getLogger(MagFieldsEngine.class.getName()); + public static Logger LOGGER = SplitLogger.create(MagFieldsEngine.class.getName()); private String solShift = null; diff --git a/common-tools/swim-tools/src/main/java/org/jlab/clas/swimtools/Swimmer.java b/common-tools/swim-tools/src/main/java/org/jlab/clas/swimtools/Swimmer.java index 7915ce6129..759c72f189 100644 --- a/common-tools/swim-tools/src/main/java/org/jlab/clas/swimtools/Swimmer.java +++ b/common-tools/swim-tools/src/main/java/org/jlab/clas/swimtools/Swimmer.java @@ -4,6 +4,7 @@ import java.util.HashMap; import java.util.logging.Level; import java.util.logging.Logger; +import org.jlab.logging.SplitLogger; /** * @@ -13,7 +14,7 @@ public class Swimmer { - public static Logger LOGGER = Logger.getLogger(Swimmer.class.getName()); + public static Logger LOGGER = SplitLogger.create(Swimmer.class.getName()); private static HashMap swimmers = new HashMap<>(); diff --git a/reconstruction/alert/src/main/java/org/jlab/rec/ahdc/HelixFit/HelixFitJava.java b/reconstruction/alert/src/main/java/org/jlab/rec/ahdc/HelixFit/HelixFitJava.java index 1b29535d51..de2f46e1b1 100644 --- a/reconstruction/alert/src/main/java/org/jlab/rec/ahdc/HelixFit/HelixFitJava.java +++ b/reconstruction/alert/src/main/java/org/jlab/rec/ahdc/HelixFit/HelixFitJava.java @@ -2,6 +2,7 @@ import java.util.logging.Level; import java.util.logging.Logger; +import org.jlab.logging.SplitLogger; /** Helix Fit. * @@ -9,7 +10,7 @@ */ public class HelixFitJava { - static final Logger LOGGER = Logger.getLogger(HelixFitJava.class.getName()); + static final Logger LOGGER = SplitLogger.create(HelixFitJava.class.getName()); /** \todo What does this method do * \what does its name even mean? diff --git a/reconstruction/alert/src/main/java/org/jlab/rec/atof/hit/ATOFHit.java b/reconstruction/alert/src/main/java/org/jlab/rec/atof/hit/ATOFHit.java index 895faeb015..ba3c2eefc9 100644 --- a/reconstruction/alert/src/main/java/org/jlab/rec/atof/hit/ATOFHit.java +++ b/reconstruction/alert/src/main/java/org/jlab/rec/atof/hit/ATOFHit.java @@ -4,6 +4,7 @@ import org.jlab.geom.prim.Point3D; import org.jlab.rec.atof.constants.Parameters; import java.util.logging.Logger; +import org.jlab.logging.SplitLogger; import org.jlab.rec.alert.constants.CalibrationConstantsLoader; /** @@ -17,7 +18,7 @@ */ public class ATOFHit { - static final Logger LOGGER = Logger.getLogger(ATOFHit.class.getName()); + static final Logger LOGGER = SplitLogger.create(ATOFHit.class.getName()); private int sector, layer, component, order; private int tdc, tot; diff --git a/reconstruction/alert/src/main/java/org/jlab/service/atof/ATOFEngine.java b/reconstruction/alert/src/main/java/org/jlab/service/atof/ATOFEngine.java index b65f7886d6..962f33b09b 100644 --- a/reconstruction/alert/src/main/java/org/jlab/service/atof/ATOFEngine.java +++ b/reconstruction/alert/src/main/java/org/jlab/service/atof/ATOFEngine.java @@ -4,6 +4,7 @@ import java.util.HashMap; import java.util.Map; import java.util.logging.Logger; +import org.jlab.logging.SplitLogger; import org.jlab.clas.reco.ReconstructionEngine; import org.jlab.io.base.DataBank; @@ -39,7 +40,7 @@ public ATOFEngine() { private Detector ATOF; private double b; //Magnetic field private boolean useStartTime = true; - static final Logger LOGGER = Logger.getLogger(ATOFEngine.class.getName()); + static final Logger LOGGER = SplitLogger.create(ATOFEngine.class.getName()); public void setB(double B) { this.b = B; diff --git a/reconstruction/bg/src/main/java/org/jlab/service/bg/BackgroundEngine.java b/reconstruction/bg/src/main/java/org/jlab/service/bg/BackgroundEngine.java index 1cec83e1e0..12527b6af7 100644 --- a/reconstruction/bg/src/main/java/org/jlab/service/bg/BackgroundEngine.java +++ b/reconstruction/bg/src/main/java/org/jlab/service/bg/BackgroundEngine.java @@ -5,6 +5,7 @@ import java.util.LinkedList; import java.util.logging.Level; import java.util.logging.Logger; +import org.jlab.logging.SplitLogger; import org.jlab.analysis.eventmerger.EventMerger; import org.jlab.clas.reco.ReconstructionEngine; import org.jlab.io.base.DataEvent; @@ -24,7 +25,7 @@ public class BackgroundEngine extends ReconstructionEngine { public static final String CONF_REUSE_EVENTS = "reuseEvents"; public static final String CONF_BG_SCALE = "bgScale"; - static final Logger logger = Logger.getLogger(BackgroundEngine.class.getName()); + static final Logger logger = SplitLogger.create(BackgroundEngine.class.getName()); EventMerger bgmerger = null; // LinkedList bgfilenames = new LinkedList<>(); diff --git a/reconstruction/calib/src/main/java/org/jlab/calibration/service/CalibBanksEngine.java b/reconstruction/calib/src/main/java/org/jlab/calibration/service/CalibBanksEngine.java index 486ba3e748..b1c03b2d25 100644 --- a/reconstruction/calib/src/main/java/org/jlab/calibration/service/CalibBanksEngine.java +++ b/reconstruction/calib/src/main/java/org/jlab/calibration/service/CalibBanksEngine.java @@ -5,6 +5,7 @@ import java.util.List; import java.util.Map; import java.util.logging.Logger; +import org.jlab.logging.SplitLogger; import org.jlab.calibration.detectors.CTOFBankBuilder; import org.jlab.calibration.detectors.DCBankBuilder; import org.jlab.calibration.detectors.CalibBankBuilder; @@ -26,7 +27,7 @@ public class CalibBanksEngine extends ReconstructionEngine { public static final String CONF_DETECTORS = "detectors"; private final List detectors = new ArrayList<>(); - static final Logger logger = Logger.getLogger(CalibBanksEngine.class.getName()); + static final Logger logger = SplitLogger.create(CalibBanksEngine.class.getName()); public CalibBanksEngine() { super("CALIB", "devita", "1.0"); diff --git a/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/Constants.java b/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/Constants.java index 51303f0636..cebe01dcac 100644 --- a/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/Constants.java +++ b/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/Constants.java @@ -4,6 +4,7 @@ import java.util.HashMap; import java.util.Map; import java.util.logging.Logger; +import org.jlab.logging.SplitLogger; import org.jlab.clas.pdg.PhysicsConstants; import org.jlab.clas.swimtools.Swim; @@ -13,7 +14,7 @@ public class Constants { - public static Logger LOGGER = Logger.getLogger(Constants.class.getName()); + public static Logger LOGGER = SplitLogger.create(Constants.class.getName()); public static double CAANGLE1= 1.75; public static double CAANGLE2=0.551; public static double CAANGLE3=30.; diff --git a/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/bmt/CCDBConstantsLoader.java b/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/bmt/CCDBConstantsLoader.java index 3cfad3e2dd..7f753280a7 100644 --- a/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/bmt/CCDBConstantsLoader.java +++ b/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/bmt/CCDBConstantsLoader.java @@ -8,6 +8,7 @@ import java.util.logging.Level; import java.util.logging.Logger; +import org.jlab.logging.SplitLogger; /** * @@ -16,7 +17,7 @@ */ public class CCDBConstantsLoader { - public static Logger LOGGER = Logger.getLogger(CCDBConstantsLoader.class.getName()); + public static Logger LOGGER = SplitLogger.create(CCDBConstantsLoader.class.getName()); public CCDBConstantsLoader() {} diff --git a/reconstruction/dc/src/main/java/org/jlab/rec/dc/Constants.java b/reconstruction/dc/src/main/java/org/jlab/rec/dc/Constants.java index e11d0ac1b6..5f9abaa520 100644 --- a/reconstruction/dc/src/main/java/org/jlab/rec/dc/Constants.java +++ b/reconstruction/dc/src/main/java/org/jlab/rec/dc/Constants.java @@ -3,6 +3,7 @@ import java.util.ArrayList; import java.util.logging.Level; import java.util.logging.Logger; +import org.jlab.logging.SplitLogger; import cnuphys.snr.NoiseReductionParameters; import java.util.LinkedHashMap; @@ -43,7 +44,7 @@ public static Constants getInstance() { } - public static Logger LOGGER = Logger.getLogger(Constants.class.getName()); + public static Logger LOGGER = SplitLogger.create(Constants.class.getName()); private static boolean ConstantsLoaded = false; 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 eaa35990c4..3a94af9f00 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 @@ -6,6 +6,7 @@ import java.util.ArrayList; import java.util.logging.Level; import java.util.logging.Logger; +import org.jlab.logging.SplitLogger; import org.jlab.io.base.DataBank; import org.jlab.io.base.DataEvent; @@ -54,7 +55,7 @@ public class HitReader { private List _HBHits; //hit-based tracking hit information private List _TBHits; //time-based tracking hit information - private static final Logger LOGGER = Logger.getLogger(HitReader.class.getName()); + private static final Logger LOGGER = SplitLogger.create(HitReader.class.getName()); public HitReader(Banks names, DCGeant4Factory detector) { this.bankNames= names; diff --git a/reconstruction/dc/src/main/java/org/jlab/rec/dc/cluster/ClusterCleanerUtilities.java b/reconstruction/dc/src/main/java/org/jlab/rec/dc/cluster/ClusterCleanerUtilities.java index 6ab72f997e..82e8001eed 100644 --- a/reconstruction/dc/src/main/java/org/jlab/rec/dc/cluster/ClusterCleanerUtilities.java +++ b/reconstruction/dc/src/main/java/org/jlab/rec/dc/cluster/ClusterCleanerUtilities.java @@ -4,6 +4,7 @@ import java.util.Collections; import java.util.List; import java.util.logging.Logger; +import org.jlab.logging.SplitLogger; import org.jlab.detector.geant4.v2.DCGeant4Factory; import org.jlab.io.base.DataEvent; @@ -15,7 +16,7 @@ public class ClusterCleanerUtilities { - private static final Logger LOGGER = Logger.getLogger(ClusterCleanerUtilities.class.getName()); + private static final Logger LOGGER = SplitLogger.create(ClusterCleanerUtilities.class.getName()); public ClusterCleanerUtilities() { List> sortdHits = new ArrayList<>(); 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 a2d1b735fe..9d7a8bf3bf 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 @@ -8,6 +8,7 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; +import org.jlab.logging.SplitLogger; import org.jlab.detector.geant4.v2.DCGeant4Factory; import org.jlab.io.base.DataEvent; @@ -40,7 +41,7 @@ public class ClusterFinder { public ClusterFinder() { } - private static final Logger LOGGER = Logger.getLogger(ClusterFinder.class.getName()); + private static final Logger LOGGER = SplitLogger.create(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..9974df96b1 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 @@ -3,6 +3,7 @@ import java.util.ArrayList; import java.util.logging.Level; import java.util.logging.Logger; +import org.jlab.logging.SplitLogger; import org.jlab.clas.clas.math.FastMath; //import org.apache.commons.math3.util.FastMath; @@ -21,7 +22,7 @@ */ public class Cross extends ArrayList implements Comparable { - private static final Logger LOGGER = Logger.getLogger(Cross.class.getName()); + private static final Logger LOGGER = SplitLogger.create(Cross.class.getName()); /** * serial id 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 945c6a65a6..a5ef36462a 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 @@ -8,6 +8,7 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; +import org.jlab.logging.SplitLogger; import org.jlab.detector.geant4.v2.DCGeant4Factory; import org.jlab.rec.dc.Constants; import org.jlab.rec.dc.cluster.Cluster; @@ -29,7 +30,7 @@ */ public class PatternRec { - private static final Logger LOGGER = Logger.getLogger(PatternRec.class.getName()); + private static final Logger LOGGER = SplitLogger.create(PatternRec.class.getName()); private final ClusterFinder clf = new ClusterFinder(); private final ClusterCleanerUtilities ct = new ClusterCleanerUtilities(); 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..25ad293380 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 @@ -3,6 +3,7 @@ import java.util.ArrayList; import java.util.List; import java.util.logging.Logger; +import org.jlab.logging.SplitLogger; import org.jlab.detector.geant4.v2.DCGeant4Factory; import org.jlab.geom.prim.Plane3D; import org.jlab.geom.prim.Point3D; @@ -23,7 +24,7 @@ public class Segment extends ArrayList implements Comparable, Cloneable { - private static final Logger LOGGER = Logger.getLogger(Segment.class.getName()); + private static final Logger LOGGER = SplitLogger.create(Segment.class.getName()); private static final long serialVersionUID = -997960312423538455L; private FittedCluster _fittedCluster; 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 5b77fb736d..cb52f0ff37 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 @@ -5,6 +5,7 @@ import java.util.List; import java.util.Map; import java.util.logging.Logger; +import org.jlab.logging.SplitLogger; import org.jlab.detector.base.DetectorType; import org.jlab.detector.base.GeometryFactory; import org.jlab.geom.base.ConstantProvider; @@ -23,7 +24,7 @@ public class TableLoader { public TableLoader() { } - public static final Logger LOGGER = Logger.getLogger(TableLoader.class.getName()); + public static final Logger LOGGER = SplitLogger.create(TableLoader.class.getName()); private static boolean T2DLOADED = false; 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 c3d248a1bf..7843a30371 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 @@ -8,6 +8,7 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; +import org.jlab.logging.SplitLogger; import org.jlab.clas.clas.math.FastMath; import org.jlab.clas.swimtools.Swim; import org.jlab.detector.geant4.v2.DCGeant4Factory; @@ -43,7 +44,7 @@ public class TrackCandListFinder { - private static final Logger LOGGER = Logger.getLogger(TrackCandListFinder.class.getName()); + private static final Logger LOGGER = SplitLogger.create(TrackCandListFinder.class.getName()); long startTime, startTime2 = 0; diff --git a/reconstruction/dc/src/main/java/org/jlab/rec/dc/track/fit/KFitterDoca.java b/reconstruction/dc/src/main/java/org/jlab/rec/dc/track/fit/KFitterDoca.java index dc93e2e965..2b0dea4eb7 100644 --- a/reconstruction/dc/src/main/java/org/jlab/rec/dc/track/fit/KFitterDoca.java +++ b/reconstruction/dc/src/main/java/org/jlab/rec/dc/track/fit/KFitterDoca.java @@ -3,6 +3,7 @@ import java.util.ArrayList; import java.util.List; import java.util.logging.Logger; +import org.jlab.logging.SplitLogger; import org.jlab.clas.swimtools.Swim; import org.jlab.detector.geant4.v2.DCGeant4Factory; @@ -16,7 +17,7 @@ */ public class KFitterDoca { - private static final Logger LOGGER = Logger.getLogger(KFitterDoca.class.getName()); + private static final Logger LOGGER = SplitLogger.create(KFitterDoca.class.getName()); public boolean setFitFailed = false; diff --git a/reconstruction/dc/src/main/java/org/jlab/rec/dc/track/fit/MeasVecsDoca.java b/reconstruction/dc/src/main/java/org/jlab/rec/dc/track/fit/MeasVecsDoca.java index 59e3388e1c..0013e2c53d 100644 --- a/reconstruction/dc/src/main/java/org/jlab/rec/dc/track/fit/MeasVecsDoca.java +++ b/reconstruction/dc/src/main/java/org/jlab/rec/dc/track/fit/MeasVecsDoca.java @@ -4,6 +4,7 @@ import java.util.Collections; import java.util.List; import java.util.logging.Logger; +import org.jlab.logging.SplitLogger; import org.jlab.detector.geant4.v2.DCGeant4Factory; import org.jlab.geom.prim.Line3D; import org.jlab.geom.prim.Point3D; @@ -13,7 +14,7 @@ public class MeasVecsDoca { - private static final Logger LOGGER = Logger.getLogger(MeasVecsDoca.class.getName()); + private static final Logger LOGGER = SplitLogger.create(MeasVecsDoca.class.getName()); public List measurements = new ArrayList(); diff --git a/reconstruction/dc/src/main/java/org/jlab/rec/dc/track/fit/StateVecsDoca.java b/reconstruction/dc/src/main/java/org/jlab/rec/dc/track/fit/StateVecsDoca.java index 70d56dd75c..50a1de5df3 100644 --- a/reconstruction/dc/src/main/java/org/jlab/rec/dc/track/fit/StateVecsDoca.java +++ b/reconstruction/dc/src/main/java/org/jlab/rec/dc/track/fit/StateVecsDoca.java @@ -4,6 +4,7 @@ import java.util.HashMap; import java.util.Map; import java.util.logging.Logger; +import org.jlab.logging.SplitLogger; import org.jlab.clas.clas.math.FastMath; import org.jlab.clas.pdg.PhysicsConstants; import org.jlab.clas.swimtools.Swim; @@ -16,7 +17,7 @@ */ public class StateVecsDoca { - private static final Logger LOGGER = Logger.getLogger(StateVecsDoca.class.getName()); + private static final Logger LOGGER = SplitLogger.create(StateVecsDoca.class.getName()); private final double Bmax = 2.366498; // averaged 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..427351481a 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 @@ -3,6 +3,7 @@ import java.util.ArrayList; import java.util.List; import java.util.logging.Logger; +import org.jlab.logging.SplitLogger; import org.jlab.clas.swimtools.Swim; import org.jlab.detector.base.DetectorType; import org.jlab.geom.prim.Point3D; @@ -23,7 +24,7 @@ public class Trajectory extends ArrayList { public Trajectory() { } - private static final Logger LOGGER = Logger.getLogger(Trajectory.class.getName()); + private static final Logger LOGGER = SplitLogger.create(Trajectory.class.getName()); private int id; private int sector; 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..293488c803 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 @@ -17,6 +17,7 @@ import java.io.PrintWriter; import java.util.logging.Logger; +import org.jlab.logging.SplitLogger; import org.jlab.geom.detector.ec.ECLayer; import org.jlab.geom.detector.ec.ECSuperlayer; import org.jlab.geom.detector.fmt.FMTLayer; @@ -33,7 +34,7 @@ */ public class TrajectorySurfaces { - public static Logger LOGGER = Logger.getLogger(TrajectorySurfaces.class.getName()); + public static Logger LOGGER = SplitLogger.create(TrajectorySurfaces.class.getName()); private List> detectorPlanes = new ArrayList<>(); diff --git a/reconstruction/eb/src/main/java/org/jlab/service/eb/EBEngine.java b/reconstruction/eb/src/main/java/org/jlab/service/eb/EBEngine.java index e6b974ec95..887e45b6e8 100644 --- a/reconstruction/eb/src/main/java/org/jlab/service/eb/EBEngine.java +++ b/reconstruction/eb/src/main/java/org/jlab/service/eb/EBEngine.java @@ -3,6 +3,7 @@ import java.util.Collections; import java.util.List; import java.util.logging.Logger; +import org.jlab.logging.SplitLogger; import org.jlab.clas.reco.ReconstructionEngine; import org.jlab.io.base.DataEvent; @@ -23,7 +24,7 @@ */ public class EBEngine extends ReconstructionEngine { - public static final Logger LOGGER = Logger.getLogger(EBEngine.class.getName()); + public static final Logger LOGGER = SplitLogger.create(EBEngine.class.getName()); boolean usePOCA = false; diff --git a/reconstruction/ec/src/main/java/org/jlab/service/ec/ECEngine.java b/reconstruction/ec/src/main/java/org/jlab/service/ec/ECEngine.java index 0657f1db26..21c1921ad1 100644 --- a/reconstruction/ec/src/main/java/org/jlab/service/ec/ECEngine.java +++ b/reconstruction/ec/src/main/java/org/jlab/service/ec/ECEngine.java @@ -6,6 +6,7 @@ import java.util.Optional; import java.util.logging.Level; import java.util.logging.Logger; +import org.jlab.logging.SplitLogger; import org.jlab.clas.reco.ReconstructionEngine; import org.jlab.detector.base.DetectorCollection; @@ -23,7 +24,7 @@ public class ECEngine extends ReconstructionEngine { - public static Logger LOGGER = Logger.getLogger(ECEngine.class.getName()); + public static Logger LOGGER = SplitLogger.create(ECEngine.class.getName()); public ECEngine(){ super("EC","gavalian","1.0"); diff --git a/reconstruction/htcc/src/main/java/org/jlab/service/htcc/HTCCReconstructionService.java b/reconstruction/htcc/src/main/java/org/jlab/service/htcc/HTCCReconstructionService.java index bb7816c7d3..9a0e03a3b7 100644 --- a/reconstruction/htcc/src/main/java/org/jlab/service/htcc/HTCCReconstructionService.java +++ b/reconstruction/htcc/src/main/java/org/jlab/service/htcc/HTCCReconstructionService.java @@ -2,6 +2,7 @@ import java.util.Arrays; import java.util.logging.Level; import java.util.logging.Logger; +import org.jlab.logging.SplitLogger; import org.jlab.clas.reco.ReconstructionEngine; import org.jlab.rec.htcc.HTCCReconstruction; @@ -13,7 +14,7 @@ */ public class HTCCReconstructionService extends ReconstructionEngine{ - public static Logger LOGGER = Logger.getLogger(HTCCReconstructionService.class.getName()); + public static Logger LOGGER = SplitLogger.create(HTCCReconstructionService.class.getName()); public HTCCReconstructionService(){ super("HTCC","henkins","1.0"); diff --git a/reconstruction/ltcc/src/main/java/org/jlab/service/ltcc/LTCCEngine.java b/reconstruction/ltcc/src/main/java/org/jlab/service/ltcc/LTCCEngine.java index 0a1f2380e3..695225a34b 100644 --- a/reconstruction/ltcc/src/main/java/org/jlab/service/ltcc/LTCCEngine.java +++ b/reconstruction/ltcc/src/main/java/org/jlab/service/ltcc/LTCCEngine.java @@ -6,6 +6,7 @@ import java.util.Arrays; import java.util.logging.Level; import java.util.logging.Logger; +import org.jlab.logging.SplitLogger; /** * LTCC Reconstruction Engine. @@ -14,7 +15,7 @@ */ public class LTCCEngine extends ReconstructionEngine { - public static Logger LOGGER = Logger.getLogger(LTCCEngine.class.getName()); + public static Logger LOGGER = SplitLogger.create(LTCCEngine.class.getName()); private static final boolean DEBUG = false; private static final List CC_TABLES = diff --git a/reconstruction/postproc/src/main/java/org/jlab/service/postproc/PostprocEngine.java b/reconstruction/postproc/src/main/java/org/jlab/service/postproc/PostprocEngine.java index 3a45e064a1..54323315b3 100644 --- a/reconstruction/postproc/src/main/java/org/jlab/service/postproc/PostprocEngine.java +++ b/reconstruction/postproc/src/main/java/org/jlab/service/postproc/PostprocEngine.java @@ -2,6 +2,7 @@ import java.io.File; import java.util.logging.Logger; +import org.jlab.logging.SplitLogger; import org.jlab.analysis.postprocess.Processor; import org.jlab.clas.reco.ReconstructionEngine; import org.jlab.io.base.DataEvent; @@ -18,7 +19,7 @@ public class PostprocEngine extends ReconstructionEngine { public static final String CONF_RESTREAM_HELICITY = "restream"; public static final String CONF_REBUILD_SCALERS = "rebuild"; - static final Logger logger = Logger.getLogger(PostprocEngine.class.getName()); + static final Logger logger = SplitLogger.create(PostprocEngine.class.getName()); Processor processor = null; diff --git a/reconstruction/raster/src/main/java/org/jlab/service/raster/RasterEngine.java b/reconstruction/raster/src/main/java/org/jlab/service/raster/RasterEngine.java index fe1a313904..00a59676c1 100644 --- a/reconstruction/raster/src/main/java/org/jlab/service/raster/RasterEngine.java +++ b/reconstruction/raster/src/main/java/org/jlab/service/raster/RasterEngine.java @@ -3,6 +3,7 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; +import org.jlab.logging.SplitLogger; import javax.swing.JFrame; import org.jlab.clas.reco.ReconstructionEngine; import org.jlab.groot.data.H2F; @@ -28,7 +29,7 @@ public class RasterEngine extends ReconstructionEngine { private final int xComponent = 1; private final int yComponent = 2; - public static final Logger LOGGER = Logger.getLogger(RasterEngine.class.getName()); + public static final Logger LOGGER = SplitLogger.create(RasterEngine.class.getName()); public RasterEngine() { super("RasterEngine","devita","1.0"); diff --git a/reconstruction/recoil/src/main/java/org/jlab/service/recoil/RecoilEngine.java b/reconstruction/recoil/src/main/java/org/jlab/service/recoil/RecoilEngine.java index d1f8325f7a..c5ef1f4780 100644 --- a/reconstruction/recoil/src/main/java/org/jlab/service/recoil/RecoilEngine.java +++ b/reconstruction/recoil/src/main/java/org/jlab/service/recoil/RecoilEngine.java @@ -4,6 +4,7 @@ import java.util.Optional; import java.util.logging.Level; import java.util.logging.Logger; +import org.jlab.logging.SplitLogger; import javax.swing.JFrame; import org.jlab.clas.reco.ReconstructionEngine; import org.jlab.detector.base.DetectorType; @@ -27,7 +28,7 @@ */ public class RecoilEngine extends ReconstructionEngine { - public static Logger LOGGER = Logger.getLogger(RecoilEngine.class.getName()); + public static Logger LOGGER = SplitLogger.create(RecoilEngine.class.getName()); public static RecoilStripFactory factory = new RecoilStripFactory(); diff --git a/reconstruction/urwell/src/main/java/org/jlab/service/urwell/URWellEngine.java b/reconstruction/urwell/src/main/java/org/jlab/service/urwell/URWellEngine.java index fcb53c5ad1..fc5cbd10b8 100644 --- a/reconstruction/urwell/src/main/java/org/jlab/service/urwell/URWellEngine.java +++ b/reconstruction/urwell/src/main/java/org/jlab/service/urwell/URWellEngine.java @@ -4,6 +4,7 @@ import java.util.Optional; import java.util.logging.Level; import java.util.logging.Logger; +import org.jlab.logging.SplitLogger; import javax.swing.JFrame; import org.jlab.clas.reco.ReconstructionEngine; import org.jlab.detector.base.DetectorType; @@ -27,7 +28,7 @@ */ public class URWellEngine extends ReconstructionEngine { - public static Logger LOGGER = Logger.getLogger(URWellEngine.class.getName()); + public static Logger LOGGER = SplitLogger.create(URWellEngine.class.getName()); public static URWellStripFactory factory = new URWellStripFactory();