From b49d3e34adfae65b3d798ca02e3a6edaf3826d38 Mon Sep 17 00:00:00 2001 From: Christopher Dilks Date: Wed, 7 Oct 2026 12:05:38 -0400 Subject: [PATCH] build: remove unnecessary shaded `coat-libs.jar` dependencies Remove the following dependencies from the shaded JAR (`coat-libs.jar`): | Dependency | Notes | | --- | --- | | `org.freehep:jminuit` | `calcode` may be consuming this, or the (newer) one provided by `groot`; in any case, `calcode` should depend _explicitly on this, not transitively, so let's remove it here | | `org.jama:jampack` | we don't use its `Jampack` classes anywhere here or downstream, but this dependency also includes some `Jama` classes such as `Jama.Matrix`; however, we also consume `gov.nist.math:jama` which has all the `Jama` classes we actually use | | `org.jlab.plugins:jMath` | completely unused | | `de.erichseifert:vectorgraphics2d` | unused here or anywhere downstream | | `net.objecthunter:exp4j` | unused here or anywhere downstream; however, it needs to be pinned in the parent POM's `dependencyManagement` in order to resolve a convergence conflict between `jnp-hipo4` and `jnp-hipo` (and if we can be rid of `jnp-hipo`, we can remove this pin) | --- common-tools/coat-libs/pom.xml | 28 ------------------- pom.xml | 24 +++++++--------- .../org/jlab/service/ltcc/LTCCCluster.java | 1 - .../service/ltcc/LTCCClusterCorrection.java | 6 ++-- .../main/java/org/jlab/rec/rtpc/Geometry.java | 5 ---- 5 files changed, 12 insertions(+), 52 deletions(-) diff --git a/common-tools/coat-libs/pom.xml b/common-tools/coat-libs/pom.xml index 5443841177..86ae62720b 100644 --- a/common-tools/coat-libs/pom.xml +++ b/common-tools/coat-libs/pom.xml @@ -36,24 +36,12 @@ j4ml-clas12 - - org.jama - jamapack - 1.0 - - org.jlab.plugins trackfitter 1.0 - - org.jlab.plugins - jMath - 1.0 - - org.jlab.clas clas-io @@ -144,22 +132,6 @@ 14.2.1-SNAPSHOT - - org.freehep - jminuit - - - - de.erichseifert - vectorgraphics2d - 1.0 - - - - net.objecthunter - exp4j - - diff --git a/pom.xml b/pom.xml index fb9d528729..4be635ba7e 100644 --- a/pom.xml +++ b/pom.xml @@ -133,7 +133,7 @@ org.jlab groot - 4.0.5 + 4.0.5 @@ -194,7 +194,7 @@ org.jlab.jnp jnp-hipo4 - 4.5 + 4.5 @@ -241,17 +241,13 @@ import - - - net.objecthunter exp4j @@ -259,9 +255,10 @@ com.google.code.gson @@ -270,8 +267,9 @@ org.ejml @@ -279,8 +277,6 @@ 0.40 - - diff --git a/reconstruction/ltcc/src/main/java/org/jlab/service/ltcc/LTCCCluster.java b/reconstruction/ltcc/src/main/java/org/jlab/service/ltcc/LTCCCluster.java index f6a91e0bf3..1ccc7d5534 100644 --- a/reconstruction/ltcc/src/main/java/org/jlab/service/ltcc/LTCCCluster.java +++ b/reconstruction/ltcc/src/main/java/org/jlab/service/ltcc/LTCCCluster.java @@ -7,7 +7,6 @@ import org.jlab.io.base.DataBank; import org.jlab.io.base.DataEvent; -//import org.jMath.Vector.threeVec; import java.util.List; import java.util.ArrayList; import org.jlab.geom.prim.Vector3D; diff --git a/reconstruction/ltcc/src/main/java/org/jlab/service/ltcc/LTCCClusterCorrection.java b/reconstruction/ltcc/src/main/java/org/jlab/service/ltcc/LTCCClusterCorrection.java index 086038d90d..59eebc1f8f 100644 --- a/reconstruction/ltcc/src/main/java/org/jlab/service/ltcc/LTCCClusterCorrection.java +++ b/reconstruction/ltcc/src/main/java/org/jlab/service/ltcc/LTCCClusterCorrection.java @@ -5,8 +5,6 @@ */ package org.jlab.service.ltcc; -//import org.jMath.Vector.threeVec; - import org.jlab.geom.prim.Vector3D; @@ -27,13 +25,13 @@ public class LTCCClusterCorrection { /* * static member function calcPosition * arguments: - - threeVec clusterPos: estimated cluster position from the + - Vector3D clusterPos: estimated cluster position from the reconstruction - double p: track momentum - int charge: track charge - double torus: torus field setting - double solenoid: solenoid field setting - * returns (threeVec): a vector with a more accurate cluster position + * returns (Vector3D): a vector with a more accurate cluster position */ public static Vector3D calcPosition(Vector3D clusterPos, double p, int charge, double torus, double solenoid) { diff --git a/reconstruction/rtpc/src/main/java/org/jlab/rec/rtpc/Geometry.java b/reconstruction/rtpc/src/main/java/org/jlab/rec/rtpc/Geometry.java index 9652c3b283..d3d43e8805 100644 --- a/reconstruction/rtpc/src/main/java/org/jlab/rec/rtpc/Geometry.java +++ b/reconstruction/rtpc/src/main/java/org/jlab/rec/rtpc/Geometry.java @@ -4,11 +4,6 @@ import java.io.FileNotFoundException; import java.io.PrintWriter; -/*import org.jMath.Vector.threeVec; - -import trackfitter.surface.Line; -import trackfitter.track.Helix;*/ - public class Geometry { public Geometry() {