Skip to content

Fixes to DC geometry #299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 24 commits into from
Aug 9, 2024
Merged

Fixes to DC geometry #299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
c5ce209
account for the fact the R3 reference wire is ministaggered
raffaelladevita Jun 12, 2024
5c99b26
accounting for the wire feedthroughs in DC geometry
raffaelladevita Jul 5, 2024
9ac021b
account for tilt
raffaelladevita Jul 8, 2024
7cd92eb
account for tilt
raffaelladevita Jul 9, 2024
3c0af40
account for tilt
raffaelladevita Jul 10, 2024
270b6b2
moved feedthrough parameters to CCDB, code cleanups
raffaelladevita Jul 16, 2024
4ecc1d7
removed unnecessary code
raffaelladevita Jul 17, 2024
60b2635
more cleanups and comments
raffaelladevita Jul 17, 2024
f9ddb7d
Merge branch 'development' into iss278-dcFixes
c-dilks Jul 19, 2024
9fc28fc
Merge branch 'development' into iss278-dcFixes
baltzell Jul 23, 2024
2b30120
introduced yaml variables to turn on/off ministagger and feedthrough …
raffaelladevita Jul 23, 2024
effc9b5
Merge branch 'iss278-dcFixes' of github.com:JeffersonLab/coatjava int…
raffaelladevita Jul 23, 2024
dc1e0bf
bug fix
raffaelladevita Jul 24, 2024
4e665c2
another bug fix
raffaelladevita Jul 24, 2024
21cf0cb
making R3 Geant4 volumes independent from ministagger
raffaelladevita Jul 25, 2024
d8ea972
Changed ministagger status enum name to more meaningful set
raffaelladevita Jul 25, 2024
ef74d1d
version bump
raffaelladevita Jul 30, 2024
dea21a3
Merge branch 'development' into iss278-dcFixes
raffaelladevita Jul 30, 2024
a417f7d
added printouts and comments
raffaelladevita Jul 30, 2024
875869e
added comments and printouts as per review bullets 1, 2, and 3
raffaelladevita Aug 8, 2024
4529c6d
added comments addressing review points 5,6,8, and 9
raffaelladevita Aug 8, 2024
5652a4e
few more comments improvement
raffaelladevita Aug 8, 2024
89b74dc
added examples of usage of new dc geometry variables to yaml files
raffaelladevita Aug 9, 2024
bae05a5
version bump
raffaelladevita Aug 9, 2024
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
4 changes: 2 additions & 2 deletions common-tools/clara-io/pom.xml
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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