diff --git a/common-tools/clara-io/pom.xml b/common-tools/clara-io/pom.xml index 6b3b0e59c0..1c3a50f9b6 100644 --- a/common-tools/clara-io/pom.xml +++ b/common-tools/clara-io/pom.xml @@ -52,12 +52,11 @@ org.jlab.clas clas-utils 14.2.1-SNAPSHOT - + org.apache.commons commons-text - 1.15.0 diff --git a/common-tools/clas-detector/src/main/java/org/jlab/detector/calib/utils/DatabaseConstantProvider.java b/common-tools/clas-detector/src/main/java/org/jlab/detector/calib/utils/DatabaseConstantProvider.java index 0505a2204a..a4b0d69c1f 100644 --- a/common-tools/clas-detector/src/main/java/org/jlab/detector/calib/utils/DatabaseConstantProvider.java +++ b/common-tools/clas-detector/src/main/java/org/jlab/detector/calib/utils/DatabaseConstantProvider.java @@ -12,7 +12,7 @@ import java.util.Vector; import java.util.logging.Level; import java.util.logging.Logger; -import org.jlab.ccdb.CCDB; +import org.jlab.ccdb.CcdbPackage; import javax.swing.JFrame; import org.jlab.ccdb.Assignment; @@ -144,7 +144,7 @@ private void initialize(String address){ // choose /tmp directory: FileSystemExecScan.scan(); - provider = CCDB.createProvider(address); + provider = CcdbPackage.createProvider(address); LOGGER.log(Level.INFO, String.format("[DB] ---> open %s | %s | %s | %s", runNumber, variation, databaseDate, address)); diff --git a/common-tools/clas-io/pom.xml b/common-tools/clas-io/pom.xml index 32aa1e67c2..d51e553d66 100644 --- a/common-tools/clas-io/pom.xml +++ b/common-tools/clas-io/pom.xml @@ -18,7 +18,6 @@ org.jlab.coda xmsg - 2.3 @@ -45,7 +44,6 @@ org.jlab.coda et - 14.0 diff --git a/common-tools/clas-jcsg/pom.xml b/common-tools/clas-jcsg/pom.xml index 623abdfa82..03531bcc43 100644 --- a/common-tools/clas-jcsg/pom.xml +++ b/common-tools/clas-jcsg/pom.xml @@ -47,7 +47,6 @@ java3d vecmath - 1.3.1 org.slf4j diff --git a/common-tools/clas-reco/pom.xml b/common-tools/clas-reco/pom.xml index 9a84fdb676..cd69073c41 100644 --- a/common-tools/clas-reco/pom.xml +++ b/common-tools/clas-reco/pom.xml @@ -36,12 +36,6 @@ jar-with-dependencies - - org.jlab.coda - jtools - 2.2 - - cnuphys magfield diff --git a/common-tools/clas-reco/src/main/java/org/jlab/clas/reco/Clas12Types.java b/common-tools/clas-reco/src/main/java/org/jlab/clas/reco/Clas12Types.java index 4daf8a9c13..656d9b9211 100644 --- a/common-tools/clas-reco/src/main/java/org/jlab/clas/reco/Clas12Types.java +++ b/common-tools/clas-reco/src/main/java/org/jlab/clas/reco/Clas12Types.java @@ -5,8 +5,6 @@ import org.jlab.clara.base.error.ClaraException; import org.jlab.clara.engine.ClaraSerializer; import org.jlab.clara.engine.EngineDataType; -import org.jlab.clas12.tools.MimeType; -import org.jlab.clas12.tools.property.JPropertyList; import org.jlab.jnp.hipo4.data.Event; @@ -30,22 +28,9 @@ public Object read(ByteBuffer buffer) throws ClaraException { } } - public static final EngineDataType EVIO = new EngineDataType(MimeType.EVIO.type(), EngineDataType.BYTES.serializer()); + public static final EngineDataType EVIO = new EngineDataType("binary/data-evio", EngineDataType.BYTES.serializer()); public static final EngineDataType HIPO = new EngineDataType("binary/data-hipo", new HipoSerializer()); - public static final EngineDataType PROPERTY_LIST = new EngineDataType(MimeType.PROPERTY_LIST.type(), new ClaraSerializer() { - - @Override - public ByteBuffer write(Object data) throws ClaraException { - JPropertyList pl = (JPropertyList) data; - return ByteBuffer.wrap(pl.getStringRepresentation(true).getBytes()); - } - - @Override - public Object read(ByteBuffer buffer) throws ClaraException { - return new JPropertyList(new String(buffer.array())); - } - }); } diff --git a/common-tools/clas-utils/pom.xml b/common-tools/clas-utils/pom.xml index 4057106f8a..57208d53ee 100644 --- a/common-tools/clas-utils/pom.xml +++ b/common-tools/clas-utils/pom.xml @@ -17,7 +17,6 @@ org.apache.commons commons-text - 1.15.0 org.jlab.clas diff --git a/common-tools/coat-libs/pom.xml b/common-tools/coat-libs/pom.xml index d8c6659cf2..77e0bc4b7e 100644 --- a/common-tools/coat-libs/pom.xml +++ b/common-tools/coat-libs/pom.xml @@ -32,7 +32,6 @@ org.jlab.coda et - 14.0 @@ -45,22 +44,9 @@ j4ml-clas12 - - org.jama - jamapack - 1.0 - - org.jlab.plugins trackfitter - 1.0 - - - - org.jlab.plugins - jMath - 1.0 @@ -158,12 +144,6 @@ jminuit - - de.erichseifert - vectorgraphics2d - 1.0 - - net.objecthunter exp4j @@ -172,7 +152,7 @@ - + src/main/resources diff --git a/pom.xml b/pom.xml index 93a1bb8e70..3038312116 100644 --- a/pom.xml +++ b/pom.xml @@ -24,9 +24,25 @@ https://code.jlab.org/api/v4/projects/919/packages/maven - clas12-clara-java + clas12-clara-java https://code.jlab.org/api/v4/projects/243/packages/maven + + clas12-xmsg-java + https://code.jlab.org/api/v4/projects/959/packages/maven + + + clas12-ccdbrcdb-java + https://code.jlab.org/api/v4/projects/245/packages/maven + + + clas12-evio + https://code.jlab.org/api/v4/projects/1038/packages/maven + + + clas12-et + https://code.jlab.org/api/v4/projects/1044/packages/maven + clas12maven https://clasweb.jlab.org/.clas12maven @@ -106,6 +122,12 @@ linux + + java3d + vecmath + 1.3.1 + + org.slf4j slf4j-api @@ -124,10 +146,16 @@ 3.20.0 + + org.apache.commons + commons-text + 1.15.0 + + org.jlab groot - 4.0.5 + 4.0.5 @@ -139,14 +167,20 @@ org.jlab.coda jclara - 4.3 + 6.2 + + + + org.jlab.coda + xmsg + 2.5 org.jlab.coda jevio jar-with-dependencies - 6.2-SNAPSHOT + 6.2.1 net.jpountz.lz4 @@ -167,6 +201,12 @@ + + org.jlab.coda + et + 16.6.1 + + org.jlab.jnp jnp-hipo @@ -179,6 +219,18 @@ 4.5 + + org.jlab.ccdbrcdb + ccdbrcdb + 2.1 + + + + org.jlab.plugins + trackfitter + 1.0 + + j4ml j4ml-neuroph @@ -197,12 +249,6 @@ 0.9-SNAPSHOT - - org.jlab.ccdbrcdb - ccdbrcdb - 2.0 - - gov.nist.math jama @@ -212,7 +258,7 @@ ai.djl bom - 0.38.0 + 0.38.0 pom import @@ -224,24 +270,17 @@ - see `docs/dependency_conflicts.md` for more info --> - + net.objecthunter exp4j 0.4.8 - - - com.google.code.gson - gson - 2.13.1 - - @@ -392,6 +431,7 @@ + com.google.protobuf:protobuf-java diff --git a/reconstruction/alert/pom.xml b/reconstruction/alert/pom.xml index c4baa62486..025d2aaa81 100644 --- a/reconstruction/alert/pom.xml +++ b/reconstruction/alert/pom.xml @@ -137,7 +137,7 @@ ${project.build.directory}/lib/services - ai.djl + ai.djl,com.google.code.gson diff --git a/reconstruction/cvt/pom.xml b/reconstruction/cvt/pom.xml index 9e84e203fd..1319e25e62 100644 --- a/reconstruction/cvt/pom.xml +++ b/reconstruction/cvt/pom.xml @@ -17,7 +17,6 @@ java3d vecmath - 1.3.1 org.jlab @@ -89,7 +88,6 @@ org.jlab.plugins trackfitter - 1.0 junit diff --git a/reconstruction/dc/pom.xml b/reconstruction/dc/pom.xml index 4e7f4562b3..92bdb67c88 100644 --- a/reconstruction/dc/pom.xml +++ b/reconstruction/dc/pom.xml @@ -100,7 +100,6 @@ org.jlab.plugins trackfitter - 1.0 org.jlab.clas 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() {