Add parallelepiped test and IWYU

sethrj · Apr 3, 2024 · 6398ea3 · 6398ea3
1 parent 2dd161b
commit 6398ea3
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/src/orange/g4org/SolidConverter.cc b/src/orange/g4org/SolidConverter.cc
@@ -24,11 +24,7 @@
 #include <G4GenericTrap.hh>
 #include <G4Hype.hh>
 #include <G4IntersectionSolid.hh>
-#include <G4Navigator.hh>
 #include <G4Orb.hh>
-#include <G4PVDivision.hh>
-#include <G4PVParameterised.hh>
-#include <G4PVReplica.hh>
 #include <G4Para.hh>
 #include <G4Paraboloid.hh>
 #include <G4Polycone.hh>

diff --git a/test/orange/g4org/SolidConverter.test.cc b/test/orange/g4org/SolidConverter.test.cc
@@ -21,11 +21,7 @@
 #include <G4GenericTrap.hh>
 #include <G4Hype.hh>
 #include <G4IntersectionSolid.hh>
-#include <G4Navigator.hh>
 #include <G4Orb.hh>
-#include <G4PVDivision.hh>
-#include <G4PVParameterised.hh>
-#include <G4PVReplica.hh>
 #include <G4Para.hh>
 #include <G4Paraboloid.hh>
 #include <G4PhysicalConstants.hh>
@@ -213,6 +209,23 @@ TEST_F(SolidConverterTest, orb)
         {{0, 0, 0}, {0, 5.0, 0}, {10.0, 0, 0}});
 }
 
+TEST_F(SolidConverterTest, para)
+{
+    this->build_and_test(
+        G4Para("LArEMECInnerAluConeAluBar",
+               5.01588152875291,
+               5,
+               514,
+               0,
+               4.56062963173385,
+               0),
+        R"json({"_type":"shape","interior":{"_type":"parallelepiped","alpha":0.0,"halfedges":[0.501588152875291,0.5,51.400000000000006],"phi":0.0,"theta":0.22584674950181247},"label":"LArEMECInnerAluConeAluBar"})json",
+        {
+            {51.2, 0.40, 7.76},
+            {51.4, 0.51, 7.78},
+        });
+}
+
 TEST_F(SolidConverterTest, polycone)
 {
     static double const z[] = {6, 630};