Skip to content

Commit

Permalink
Merge pull request #421 from JeffersonLab/DCEffNewMatrixOps
Browse files Browse the repository at this point in the history 
Dc eff new matrix ops
  • Loading branch information
@raffaelladevita
raffaelladevita authored Dec 1, 2019
2 parents 60124df + 321988b commit 11b6e7f
Show file tree
Hide file tree
Showing 75 changed files with 2,737 additions and 1,651 deletions.
14 changes: 7 additions & 7 deletions common-tools/clas-analysis/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-analysis</artifactId>
<version>6b.3.2-SNAPSHOT</version>
<version>6c.3.6-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>6b.3.2-SNAPSHOT</version>
<version>6c.3.6-SNAPSHOT</version>
</parent>

<build>
Expand All @@ -30,31 +30,31 @@
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-utils</artifactId>
<version>6b.3.2-SNAPSHOT</version>
<version>6c.3.6-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-physics</artifactId>
<version>6b.3.2-SNAPSHOT</version>
<version>6c.3.6-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-io</artifactId>
<version>6b.3.2-SNAPSHOT</version>
<version>6c.3.6-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-geometry</artifactId>
<version>6b.3.2-SNAPSHOT</version>
<version>6c.3.6-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-detector</artifactId>
<version>6b.3.2-SNAPSHOT</version>
<version>6c.3.6-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down
10 changes: 5 additions & 5 deletions common-tools/clas-detector/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-detector</artifactId>
<version>6b.3.2-SNAPSHOT</version>
<version>6c.3.6-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>6b.3.2-SNAPSHOT</version>
<version>6c.3.6-SNAPSHOT</version>
</parent>

<build>
Expand All @@ -30,7 +30,7 @@
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-utils</artifactId>
<version>6b.3.2-SNAPSHOT</version>
<version>6c.3.6-SNAPSHOT</version>
</dependency>

<dependency>
Expand All @@ -42,13 +42,13 @@
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-io</artifactId>
<version>6b.3.2-SNAPSHOT</version>
<version>6c.3.6-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-geometry</artifactId>
<version>6b.3.2-SNAPSHOT</version>
<version>6c.3.6-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down
1 change: 1 addition & 0 deletions common-tools/clas-detector/src/main/java/org/jlab/detector/base/GeometryFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ public static ConstantProvider getConstants(DetectorType type, int run, String v
provider.loadTable("/geometry/dc/layer");
provider.loadTable("/geometry/dc/alignment");
provider.loadTable("/geometry/dc/ministagger");
provider.loadTable("/geometry/dc/endplatesbow");
}

if(type==DetectorType.ECAL){
Expand Down
10 changes: 5 additions & 5 deletions common-tools/clas-eventmerger/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>clas-eventmerger</artifactId>
<version>6b.3.2-SNAPSHOT</version>
<version>6c.3.6-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>6b.3.2-SNAPSHOT</version>
<version>6c.3.6-SNAPSHOT</version>
</parent>

<build>
Expand All @@ -29,19 +29,19 @@
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-utils</artifactId>
<version>6b.3.2-SNAPSHOT</version>
<version>6c.3.6-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-io</artifactId>
<version>6b.3.2-SNAPSHOT</version>
<version>6c.3.6-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-geometry</artifactId>
<version>6b.3.2-SNAPSHOT</version>
<version>6c.3.6-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions common-tools/clas-geometry/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-geometry</artifactId>
<version>6b.3.2-SNAPSHOT</version>
<version>6c.3.6-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>6b.3.2-SNAPSHOT</version>
<version>6c.3.6-SNAPSHOT</version>
</parent>

<build>
Expand Down
6 changes: 3 additions & 3 deletions common-tools/clas-io/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-io</artifactId>
<version>6b.3.2-SNAPSHOT</version>
<version>6c.3.6-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>6b.3.2-SNAPSHOT</version>
<version>6c.3.6-SNAPSHOT</version>
</parent>

<build>
Expand Down Expand Up @@ -75,7 +75,7 @@
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-utils</artifactId>
<version>6b.3.2-SNAPSHOT</version>
<version>6c.3.6-SNAPSHOT</version>
</dependency>
</dependencies>

Expand Down
8 changes: 4 additions & 4 deletions common-tools/clas-jcsg/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-jcsg</artifactId>
<version>6b.3.2-SNAPSHOT</version>
<version>6c.3.6-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>6b.3.2-SNAPSHOT</version>
<version>6c.3.6-SNAPSHOT</version>
</parent>

<build>
Expand Down Expand Up @@ -40,12 +40,12 @@
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-geometry</artifactId>
<version>6b.3.2-SNAPSHOT</version>
<version>6c.3.6-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-detector</artifactId>
<version>6b.3.2-SNAPSHOT</version>
<version>6c.3.6-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>java3d</groupId>
Expand Down
Loading

0 comments on commit 11b6e7f

Please sign in to comment.