From 0e8e7e9f73be87df0572cc8973a283ed532faf67 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Thu, 13 Nov 2025 19:06:57 -0500 Subject: [PATCH 1/4] just remove unused singleton --- .../java/org/jlab/detector/swaps/SwapManager.java | 13 ++----------- .../java/org/jlab/service/swaps/SwapEngine.java | 2 +- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/common-tools/clas-detector/src/main/java/org/jlab/detector/swaps/SwapManager.java b/common-tools/clas-detector/src/main/java/org/jlab/detector/swaps/SwapManager.java index 483868c8e6..76ab922b34 100644 --- a/common-tools/clas-detector/src/main/java/org/jlab/detector/swaps/SwapManager.java +++ b/common-tools/clas-detector/src/main/java/org/jlab/detector/swaps/SwapManager.java @@ -55,8 +55,6 @@ public final class SwapManager { private ConstantsManager currConman = null; private SchemaFactory schema = null; - private static SwapManager instance = null; - public Set getDetectors() { return this.detsToBanks.keySet(); } @@ -67,14 +65,7 @@ public List getBanks(String detectorName) { return this.detsToBanks.get(detectorName); } - private SwapManager() {} - - public static synchronized SwapManager getInstance() { - if (instance == null) { - instance = new SwapManager(); - } - return instance; - } + public SwapManager() {} /** * @param detectorNames @@ -248,7 +239,7 @@ private void initDetectors(List detectorNames) { public static void main(String[] args) { - SwapManager man = getInstance(); + SwapManager man = new SwapManager(); System.out.println(Arrays.toString(man.get(11014, "/daq/tt/bmt",3,5,320,0))); man.initialize(Arrays.asList("DC"),"08/10/2020","10/13/2024"); diff --git a/reconstruction/swaps/src/main/java/org/jlab/service/swaps/SwapEngine.java b/reconstruction/swaps/src/main/java/org/jlab/service/swaps/SwapEngine.java index 3a132431da..609a678c9f 100644 --- a/reconstruction/swaps/src/main/java/org/jlab/service/swaps/SwapEngine.java +++ b/reconstruction/swaps/src/main/java/org/jlab/service/swaps/SwapEngine.java @@ -80,7 +80,7 @@ public boolean init() { System.out.println("["+this.getName()+"] --> Setting detectors : "+this.getEngineConfigString("detectors")); System.out.println("["+this.getName()+"] --> Modifying ADC/TDC banks!"); - this.swapman = SwapManager.getInstance(); + this.swapman = new SwapManager(); this.swapman.initialize(dets,previousTimestamp,currentTimestamp); System.out.println("["+this.getName()+"] --> swaps are ready...."); From 33fe875b04a72b6c264ae7f3258552a002d8c50a Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Thu, 13 Nov 2025 19:07:54 -0500 Subject: [PATCH 2/4] use eager initialization --- .../java/org/jlab/detector/geant4/DCGeant4Factory.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/common-tools/clas-geometry/src/main/java/org/jlab/detector/geant4/DCGeant4Factory.java b/common-tools/clas-geometry/src/main/java/org/jlab/detector/geant4/DCGeant4Factory.java index 01fe5065c6..f20559371e 100644 --- a/common-tools/clas-geometry/src/main/java/org/jlab/detector/geant4/DCGeant4Factory.java +++ b/common-tools/clas-geometry/src/main/java/org/jlab/detector/geant4/DCGeant4Factory.java @@ -45,15 +45,11 @@ final class DCdatabase { private int nguardwires; private final String dcdbpath = "/geometry/dc/"; - private static DCdatabase instance = null; + private static DCdatabase instance = new DCdatabase(); - private DCdatabase() { - } + private DCdatabase() {} - public static synchronized DCdatabase getInstance() { - if (instance == null) { - instance = new DCdatabase(); - } + public static DCdatabase getInstance() { return instance; } From 9e04fff4e18df5b69ea85a166a63284f08f81dee Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Thu, 13 Nov 2025 19:14:47 -0500 Subject: [PATCH 3/4] cleanup, IDE warnings --- .../org/jlab/detector/geant4/DCGeant4Factory.java | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/common-tools/clas-geometry/src/main/java/org/jlab/detector/geant4/DCGeant4Factory.java b/common-tools/clas-geometry/src/main/java/org/jlab/detector/geant4/DCGeant4Factory.java index f20559371e..c02017fbc1 100644 --- a/common-tools/clas-geometry/src/main/java/org/jlab/detector/geant4/DCGeant4Factory.java +++ b/common-tools/clas-geometry/src/main/java/org/jlab/detector/geant4/DCGeant4Factory.java @@ -1,17 +1,7 @@ -/* - * 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.detector.geant4; -import java.util.ArrayList; -import java.util.List; import java.util.HashMap; import org.jlab.geom.geant.Geant4Basic; -import org.jlab.geom.prim.Line3D; -import org.jlab.geom.prim.Plane3D; -import org.jlab.geom.prim.Point3D; import org.jlab.geom.base.ConstantProvider; import org.jlab.geom.prim.Vector3D; @@ -274,7 +264,7 @@ public class DCGeant4Factory { DCdatabase dbref = DCdatabase.getInstance(); private Geant4Basic motherVolume = new Geant4Basic("root", "Box", 0); - private HashMap properties = new HashMap(); + private HashMap properties = new HashMap<>(); private int nsgwires; From 1e98b82bdc36a91707cbaede8b33118b1ad86e77 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Fri, 21 Nov 2025 19:21:01 -0500 Subject: [PATCH 4/4] do not synchonize magfield global instance getter --- .../magfield/src/main/java/cnuphys/magfield/MagneticFields.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 9d439bd794..070dc817b2 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 @@ -123,7 +123,7 @@ public String getVersion() { * * @return the MagneticFields singleton */ - public static synchronized MagneticFields getInstance() { + public static MagneticFields getInstance() { if (instance == null) { instance = new MagneticFields(); }