Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 0 additions & 28 deletions common-tools/coat-libs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,24 +36,12 @@
<artifactId>j4ml-clas12</artifactId>
</dependency>

<dependency>
<groupId>org.jama</groupId>
<artifactId>jamapack</artifactId>
<version>1.0</version>
</dependency>

<dependency>
<groupId>org.jlab.plugins</groupId>
<artifactId>trackfitter</artifactId>
<version>1.0</version>
</dependency>

<dependency>
<groupId>org.jlab.plugins</groupId>
<artifactId>jMath</artifactId>
<version>1.0</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-io</artifactId>
Expand Down Expand Up @@ -144,22 +132,6 @@
<version>14.2.1-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.freehep</groupId>
<artifactId>jminuit</artifactId>
</dependency>

<dependency>
<groupId>de.erichseifert</groupId>
<artifactId>vectorgraphics2d</artifactId>
<version>1.0</version>
</dependency>

<dependency>
<groupId>net.objecthunter</groupId>
<artifactId>exp4j</artifactId>
</dependency>

</dependencies>

<build>
Expand Down
24 changes: 10 additions & 14 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
<dependency>
<groupId>org.jlab</groupId>
<artifactId>groot</artifactId>
<version>4.0.5</version>
<version>4.0.5</version> <!-- WARNING: if changed, check the `net.objecthunter:exp4j` version; see `docs/dependency_conflicts.md` -->
</dependency>

<dependency>
Expand Down Expand Up @@ -194,7 +194,7 @@
<dependency>
<groupId>org.jlab.jnp</groupId>
<artifactId>jnp-hipo4</artifactId>
<version>4.5</version> <!-- from code.jlab.org/hallb/clas12/hipo-java; WARNING: if changed, check the `net.objecthunter:exp4j` version; see `docs/dependency_conflicts.md` -->
<version>4.5</version> <!-- WARNING: if changed, check the `net.objecthunter:exp4j` version; see `docs/dependency_conflicts.md` -->
</dependency>

<dependency>
Expand Down Expand Up @@ -241,27 +241,24 @@
<scope>import</scope>
</dependency>

<!-- BEGIN DEPENDENCY CONFLICT RESOLUTION -->
<!--
the following dependency versions are specified to resolve dependency tree conflicts
- see also exclusions in `maven-enforcer-plugin`
resolve convergence conflict of `net.objecthunter:exp4j` by choosing the latest used by
- `org.jlab:groot:5.0.0` uses version 0.4.8
- `org.jlab.jnp:jnp-hipo4:4.5` uses version 0.4.8
- `org.jlab.jnp:jnp-hipo:2.0-SNAPSHOT` uses version 0.4.4
- see `docs/dependency_conflicts.md` for more info
-->

<!--
resolve conflict between `org.jlab.jnp:jnp-hipo:jar:2.0-SNAPSHOT` and `org.jlab.jnp:jnp-hipo4:jar:4.5`
by choosing the later version of their `net.objecthunter:exp4j` dependency
-->
<dependency>
<groupId>net.objecthunter</groupId>
<artifactId>exp4j</artifactId>
<version>0.4.8</version> <!-- WARNING: if changed, see `docs/dependency_conflicts.md` -->
</dependency>

<!--
resolve conflict between `org.jlab.coda:jclara` and `ai.djl:api`
resolve convergence conflict between `org.jlab.coda:jclara` and `ai.djl:api`
by choosing the later version of their `com.google.code.gson:gson` dependency
- `djl`'s `gson` version is here: https://github.com/deepjavalibrary/djl/blob/master/gradle/libs.versions.toml
- see `docs/dependency_conflicts.md` for more info
-->
<dependency>
<groupId>com.google.code.gson</groupId>
Expand All @@ -270,17 +267,16 @@
</dependency>

<!--
resolve conflict between `j4ml:j4ml-clas12` and `clas-tracking`
resolve convergence conflict between `j4ml:j4ml-clas12` and `clas-tracking`
by using the version of `org.ejml:ejml-simple` used by `j4ml:j4ml-clas12:jar:0.9-SNAPSHOT`
- see `docs/dependency_conflicts.md` for more info
-->
<dependency>
<groupId>org.ejml</groupId>
<artifactId>ejml-simple</artifactId>
<version>0.40</version> <!-- WARNING: if changed, see `docs/dependency_conflicts.md` -->
</dependency>

<!-- END DEPENDENCY CONFLICT RESOLUTION -->

</dependencies>
</dependencyManagement>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
*/
package org.jlab.service.ltcc;

//import org.jMath.Vector.threeVec;

import org.jlab.geom.prim.Vector3D;


Expand All @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Loading