Merge branch 'development' into rgl-yaml

Author: baltzell

common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/MPGD/trapezoid/MPGDTrapezoidStripFactory.java

@@ -337,7 +337,7 @@ protected static boolean buildStripSegment(int internalIndex, StripConstants c,
         Vector3d nXY = new Vector3d(ca, -sa, 0.0);
         double rhs = (internalIndex + 0.5) * c.pitch;
 
-        List<Vector3d> inters = new ArrayList<>(4);
+        List<Vector3d> inters = new ArrayList<>();
 
         for (Vector3d[] e : tr.edges()) {
             Vector3d P = new Vector3d(0, 0, 0);
@@ -360,8 +360,14 @@ protected static boolean buildStripSegment(int internalIndex, StripConstants c,
                 double d2 = dx * dx + dy * dy;
                 if (d2 > best) {
                     best = d2;
-                    a = inters.get(i);
-                    b = inters.get(j);
+                    if(dy>0) {
+                        a = inters.get(i);
+                        b = inters.get(j);
+                    }
+                    else {
+                        a = inters.get(j);
+                        b = inters.get(i);                    
+                    }
                 }
             }
         }
@@ -419,9 +425,9 @@ protected List<StripGeom> buildStripCache(StripConstants c) {
             tmp.add(s);
         }
 
-        tmp.sort(Comparator
-                .comparingDouble((StripGeom s) -> s.orderXLocal)
-                .thenComparingInt(s -> s.internalIndex));
+//        tmp.sort(Comparator
+//                .comparingDouble((StripGeom s) -> s.orderXLocal)
+//                .thenComparingInt(s -> s.internalIndex));
 
         int comp = 1;
         for (StripGeom s : tmp) {

pom.xml

@@ -74,7 +74,7 @@
       <dependency>
         <groupId>org.yaml</groupId>
         <artifactId>snakeyaml</artifactId>
-        <version>2.5</version>
+        <version>2.6</version>
       </dependency>
 
       <dependency>