Skip to content

Commit cde7ab6

Browse files
committed
fix: use SplitLogger for all loggers
This PR extends #951 by replacing all `Logger.getLogger` patterns with `SplitLogger.create`.
1 parent 53d05e6 commit cde7ab6

File tree

42 files changed

+85
-43
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+85
-43
lines changed

common-tools/clas-io/src/main/java/org/jlab/io/evio/EvioDataDictionary.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import java.util.Map;
77
import java.util.logging.Level;
88
import java.util.logging.Logger;
9+
import org.jlab.logging.SplitLogger;
910

1011
import org.jlab.io.base.DataBank;
1112
import org.jlab.io.base.DataDescriptor;
@@ -20,7 +21,7 @@
2021
*/
2122
public class EvioDataDictionary implements DataDictionary {
2223

23-
static final Logger LOGGER = Logger.getLogger(EvioDataDictionary.class.getName());
24+
static final Logger LOGGER = SplitLogger.create(EvioDataDictionary.class.getName());
2425
private HashMap<String, EvioDataDescriptor> descriptors = new HashMap<>();
2526

2627
public EvioDataDictionary() {

common-tools/clas-io/src/main/java/org/jlab/io/evio/EvioSource.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import java.nio.ByteOrder;
77
import java.util.logging.Level;
88
import java.util.logging.Logger;
9+
import org.jlab.logging.SplitLogger;
910

1011
import org.jlab.coda.jevio.EvioCompactReader;
1112
import org.jlab.coda.jevio.EvioException;
@@ -16,7 +17,7 @@
1617

1718
public final class EvioSource implements DataSource {
1819

19-
static final Logger LOGGER = Logger.getLogger(EvioSource.class.getName());
20+
static final Logger LOGGER = SplitLogger.create(EvioSource.class.getName());
2021
private ByteOrder storeByteOrder = ByteOrder.BIG_ENDIAN;
2122
private EvioCompactReader evioReader = null;
2223
private int currentEvent;

common-tools/clas-io/src/main/java/org/jlab/io/hipo/HipoDataSync.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import java.util.List;
44
import java.util.logging.Level;
55
import java.util.logging.Logger;
6+
import org.jlab.logging.SplitLogger;
67
import org.jlab.io.base.DataEvent;
78
import org.jlab.io.base.DataSync;
89
import org.jlab.io.base.DataBank;
@@ -17,7 +18,7 @@
1718
*/
1819
public class HipoDataSync implements DataSync {
1920

20-
public static final Logger LOGGER = Logger.getLogger(HipoDataSync.class.getName());
21+
public static final Logger LOGGER = SplitLogger.create(HipoDataSync.class.getName());
2122

2223
HipoWriterSorted writer = null;
2324

common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import java.util.HashMap;
55
import java.util.logging.Level;
66
import java.util.logging.Logger;
7+
import org.jlab.logging.SplitLogger;
78
import org.jlab.detector.base.DetectorType;
89
import org.jlab.detector.base.GeometryFactory;
910
import org.jlab.detector.units.SystemOfUnits.Length;
@@ -573,7 +574,7 @@ public Vector3d center() {
573574
///////////////////////////////////////////////////
574575
public final class DCGeant4Factory extends Geant4Factory {
575576

576-
private static final Logger LOGGER = Logger.getLogger("DCGeant4Factory");
577+
private static final Logger LOGGER = SplitLogger.create("DCGeant4Factory");
577578
DCdatabase dbref = null;
578579

579580
private final HashMap<String, String> properties = new HashMap<>();

common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/SVT/SVTConstants.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import java.util.Map.Entry;
77
import java.util.logging.Level;
88
import java.util.logging.Logger;
9+
import org.jlab.logging.SplitLogger;
910

1011
import org.jlab.detector.calib.utils.DatabaseConstantProvider; // coatjava-3.0
1112

@@ -33,7 +34,7 @@
3334
*/
3435
public class SVTConstants {
3536

36-
public static Logger LOGGER = Logger.getLogger(SVTConstants.class.getName());
37+
public static Logger LOGGER = SplitLogger.create(SVTConstants.class.getName());
3738

3839
private static String ccdbPath = "/geometry/cvt/svt/";
3940
private static boolean bLoadedConstants = false; // only load constants once

common-tools/clas-reco/src/main/java/org/jlab/clas/reco/ReconstructionEngine.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import java.util.concurrent.ConcurrentMap;
1313
import java.util.logging.Level;
1414
import java.util.logging.Logger;
15+
import org.jlab.logging.SplitLogger;
1516
import org.jlab.clara.base.ClaraUtil;
1617
import org.jlab.clara.engine.Engine;
1718
import org.jlab.clara.engine.EngineData;
@@ -40,7 +41,7 @@
4041
*/
4142
public abstract class ReconstructionEngine implements Engine {
4243

43-
Logger LOGGER = Logger.getLogger(ReconstructionEngine.class.getName());
44+
Logger LOGGER = SplitLogger.create(ReconstructionEngine.class.getName());
4445

4546
public static final String CONFIG_BANK_NAME = "COAT::config";
4647

common-tools/clas-tracking/src/main/java/org/jlab/clas/tracking/kalmanfilter/zReference/Constants.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.jlab.clas.tracking.kalmanfilter.zReference;
22

33
import java.util.logging.Logger;
4+
import org.jlab.logging.SplitLogger;
45

56
/**
67
* Constants used in forward tracking
@@ -14,7 +15,7 @@ private Constants() {
1415
}
1516

1617

17-
public static Logger LOGGER = Logger.getLogger(Constants.class.getName());
18+
public static Logger LOGGER = SplitLogger.create(Constants.class.getName());
1819

1920
// CONSTATNS for TRANSFORMATION
2021
public static final double ITERSTOPXHB = 1.2e-2;
@@ -29,4 +30,4 @@ private Constants() {
2930
public static final double ITERSTOPTYTB = 3.5e-6;
3031
public static final double ITERSTOPQTB = 1.1e-5;
3132

32-
}
33+
}

common-tools/cnuphys/magfield/src/main/java/cnuphys/magfield/MagneticField.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import java.nio.FloatBuffer;
1010
import java.util.logging.Level;
1111
import java.util.logging.Logger;
12+
import org.jlab.logging.SplitLogger;
1213

1314
/**
1415
* For magnetic fields stored in a specific format. This is low-level,
@@ -19,7 +20,7 @@
1920
* @version 1.0
2021
*/
2122
public abstract class MagneticField implements IMagField {
22-
public static Logger LOGGER = Logger.getLogger(MagneticField.class.getName());
23+
public static Logger LOGGER = SplitLogger.create(MagneticField.class.getName());
2324

2425
/** Magic number used to check if byteswapping is necessary. */
2526
public static final int MAGICNUMBER = 0xced;

common-tools/cnuphys/magfield/src/main/java/cnuphys/magfield/MagneticFields.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import java.util.TimeZone;
1414
import java.util.logging.Level;
1515
import java.util.logging.Logger;
16+
import org.jlab.logging.SplitLogger;
1617

1718
import javax.swing.ButtonGroup;
1819
import javax.swing.JFileChooser;
@@ -30,7 +31,7 @@
3031
*/
3132
public class MagneticFields {
3233

33-
public static Logger LOGGER = Logger.getLogger(MagneticField.class.getName());
34+
public static Logger LOGGER = SplitLogger.create(MagneticField.class.getName());
3435

3536
// used for rotating to tilted sector coordinates
3637
private static final double ROOT3OVER2 = Math.sqrt(3) / 2;

common-tools/cnuphys/magfield/src/main/java/cnuphys/magfield/Torus.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import java.io.PrintStream;
66
import java.util.logging.Level;
77
import java.util.logging.Logger;
8+
import org.jlab.logging.SplitLogger;
89

910
/**
1011
* The Class Torus.
@@ -15,7 +16,7 @@
1516

1617
public class Torus extends MagneticField {
1718

18-
public static Logger LOGGER = Logger.getLogger(Torus.class.getName());
19+
public static Logger LOGGER = SplitLogger.create(Torus.class.getName());
1920

2021
//has part of the solenoid been added in to remove the overlap?
2122

0 commit comments

Comments
 (0)