Skip to content

Commit

Permalink
Fixes to DC geometry (#299)
Browse files Browse the repository at this point in the history 
* account for the fact the R3 reference wire is ministaggered

* accounting for the wire feedthroughs in DC geometry

* account for tilt

* account for tilt

* account for tilt

* moved feedthrough parameters to CCDB, code cleanups

* removed unnecessary code

* more cleanups and comments

* introduced yaml variables to turn on/off ministagger and feedthrough fixes gor compatibility with old alignment

* bug fix

* another bug fix

* making R3 Geant4 volumes independent from ministagger

* Changed ministagger status enum name to more meaningful set

* version bump

* added printouts and comments

* added comments and printouts as per review bullets 1, 2, and 3

* added comments addressing review points 5,6,8, and 9

* few more comments improvement

* added examples of usage of new dc geometry variables to yaml files

* version bump

---------

Co-authored-by: Christopher Dilks <[email protected]>
Co-authored-by: Nathan Baltzell <[email protected]>
  • Loading branch information
@raffaelladevita @c-dilks @baltzell
3 people authored Aug 9, 2024
1 parent 177ffd5 commit 515dd5c
Show file tree
Hide file tree
Showing 54 changed files with 439 additions and 180 deletions.
4 changes: 2 additions & 2 deletions common-tools/clara-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>clara-io</artifactId>
<version>10.1.2-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>10.1.2-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
20 changes: 10 additions & 10 deletions common-tools/clas-analysis/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,63 +3,63 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-analysis</artifactId>
<version>10.1.2-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>10.1.2-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
</parent>

<dependencies>
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-utils</artifactId>
<version>10.1.2-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-physics</artifactId>
<version>10.1.2-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-io</artifactId>
<version>10.1.2-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-geometry</artifactId>
<version>10.1.2-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-jcsg</artifactId>
<version>10.1.2-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>swim-tools</artifactId>
<version>10.1.2-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-detector</artifactId>
<version>10.1.2-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-reco</artifactId>
<version>10.1.2-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
</dependency>
</dependencies>

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,21 +3,21 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-detector</artifactId>
<version>10.1.2-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>10.1.2-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
</parent>

<dependencies>
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-utils</artifactId>
<version>10.1.2-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
</dependency>

<dependency>
Expand All @@ -29,13 +29,13 @@
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-io</artifactId>
<version>10.1.2-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-geometry</artifactId>
<version>10.1.2-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
</dependency>
</dependencies>

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 @@ -48,6 +48,7 @@ public static ConstantProvider getConstants(DetectorType type, int run, String v
provider.loadTable("/geometry/dc/alignment");
provider.loadTable("/geometry/dc/ministagger");
provider.loadTable("/geometry/dc/endplatesbow");
provider.loadTable("/geometry/dc/feedthroughs");
}

if(type==DetectorType.ECAL){
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>10.1.2-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>10.1.2-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
8 changes: 4 additions & 4 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>10.1.2-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>10.1.2-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down Expand Up @@ -90,13 +90,13 @@
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-utils</artifactId>
<version>10.1.2-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-logging</artifactId>
<version>10.1.2-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>

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>10.1.2-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>10.1.2-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
</parent>

<dependencies>
Expand All @@ -27,12 +27,12 @@
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-geometry</artifactId>
<version>10.1.2-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-detector</artifactId>
<version>10.1.2-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>java3d</groupId>
Expand Down
Loading

0 comments on commit 515dd5c

Please sign in to comment.