Merge branch 'JeffersonLab:development' into development

JeffersonLab · May 14, 2024 · acde32e · acde32e
2 parents 08cd675 + 9c5dfd6
commit acde32e
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 10 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -4,6 +4,8 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+    ignore:
+      - dependency-name: "org.jlab:groot" # since version numbers are not in order
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -169,7 +169,7 @@ jobs:
   #############################################################################
 
   collect_webpages:
-    if: ${{ github.head_ref == 'development' || github.ref_name == 'development' }}
+    if: ${{ github.ref == 'refs/heads/development' }}
     needs: [ build, generate_documentation ]
     runs-on: ubuntu-latest
     steps:
@@ -190,7 +190,7 @@ jobs:
           path: pages/
 
   deploy_web_pages:
-    if: ${{ github.head_ref == 'development' || github.ref_name == 'development' }}
+    if: ${{ github.ref == 'refs/heads/development' }}
     needs: collect_webpages
     permissions:
       pages: write

diff --git a/etc/bankdefs/util/bankSplit.py b/etc/bankdefs/util/bankSplit.py
@@ -100,8 +100,8 @@ def create(dirname, banklist):
 dcalign.extend(["ai::tracks", "aidn::tracks", "TimeBasedTrkg::AIClusters", "TimeBasedTrkg::AIHits", "TimeBasedTrkg::AISegments", "TimeBasedTrkg::AITracks", "TimeBasedTrkg::TBClusters", "TimeBasedTrkg::TBHits", "TimeBasedTrkg::TBSegments", "TimeBasedTrkg::TBSegmentTrajectory", "TimeBasedTrkg::TBTracks"])
 
 # DC HV studies schema:
-dchv = list(dst)
-dchv.extend(["DC::tdc", "HitBasedTrkg::HBClusters", "HitBasedTrkg::HBHitTrkId", "HitBasedTrkg::HBHits", "HitBasedTrkg::HBSegmentTrajectory", "HitBasedTrkg::HBSegments", "HitBasedTrkg::HBTracks", "HitBasedTrkg::Hits", "HitBasedTrkg::Trajectory", "TimeBasedTrkg::TBClusters", "TimeBasedTrkg::TBHits", "TimeBasedTrkg::TBSegments", "TimeBasedTrkg::TBSegmentTrajectory", "TimeBasedTrkg::TBTracks"])
+dchv = list(dsthb)
+dchv.extend(["DC::tdc","DC::jitter", "HitBasedTrkg::HBClusters", "HitBasedTrkg::HBHitTrkId", "HitBasedTrkg::HBHits", "HitBasedTrkg::HBSegmentTrajectory", "HitBasedTrkg::HBSegments", "HitBasedTrkg::HBTracks", "HitBasedTrkg::Hits", "HitBasedTrkg::Trajectory", "TimeBasedTrkg::TBClusters", "TimeBasedTrkg::TBHits", "TimeBasedTrkg::TBSegments", "TimeBasedTrkg::TBSegmentTrajectory", "TimeBasedTrkg::TBTracks"])
 
 # Level3 validation schema:
 level3 = list(dst)

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -36,7 +36,7 @@
     <dependency>
       <groupId>org.jlab</groupId>
       <artifactId>groot</artifactId>
-      <version>4.1.0</version>
+      <version>4.0.5</version>
     </dependency>
 
     <!-- https://mvnrepository.com/artifact/org.jacoco/jacoco-maven-plugin -->
@@ -100,7 +100,7 @@
       <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jar-plugin</artifactId>
-          <version>3.2.2</version>
+          <version>3.4.1</version>
           <configuration>
               <archive>
                   <manifest>

diff --git a/reconstruction/dc/src/main/java/org/jlab/rec/dc/Constants.java b/reconstruction/dc/src/main/java/org/jlab/rec/dc/Constants.java
@@ -54,9 +54,10 @@ public static Constants getInstance() {
     public static final double SIN25 = Math.sin(Math.toRadians(25.));
     public static final double COS25 = Math.cos(Math.toRadians(25.));
     public static final double COS30 = Math.cos(Math.toRadians(30.)); 
-    public static final double SIN6 = Math.sin(Math.toRadians(6.));
-    public static final double COS6 = Math.cos(Math.toRadians(6.));
-    public static final double TAN6 = Math.tan(Math.toRadians(6.));
+    public static final double STEREOANGLE = 6.;
+    public static final double SIN6 = Math.sin(Math.toRadians(STEREOANGLE));
+    public static final double COS6 = Math.cos(Math.toRadians(STEREOANGLE));
+    public static final double TAN6 = Math.tan(Math.toRadians(STEREOANGLE));
     public static final double CTAN6 = 1/TAN6;
     public static final double[] SINSECTOR60 = {0, Math.sin(Math.toRadians(60.)), Math.sin(Math.toRadians(120.)), 0, 
         Math.sin(Math.toRadians(240.)), Math.sin(Math.toRadians(300.))};

diff --git a/reconstruction/dc/src/main/java/org/jlab/rec/dc/segment/Segment.java b/reconstruction/dc/src/main/java/org/jlab/rec/dc/segment/Segment.java
@@ -244,7 +244,7 @@ public boolean hasConsistentSlope(Segment otherseg) {
         boolean value = false;
 
         if (this.get_fitPlane() != null && otherseg.get_fitPlane() != null) { 
-            if (Math.abs(Math.toDegrees(Math.acos(this.get_fitPlane().normal().dot(otherseg.get_fitPlane().normal()))) - 12.) < Constants.SEGMENTPLANESANGLE) // the angle between the plane normals is 12 degrees with some tolerance
+            if (Math.abs(Math.toDegrees(Math.acos(this.get_fitPlane().normal().dot(otherseg.get_fitPlane().normal()))) - 2*Constants.STEREOANGLE) < Constants.SEGMENTPLANESANGLE) // the angle between the plane normals is 2*Constants.STEREOANGLE degrees with some tolerance
             {
                 value = true;
             }