Modify point samplers according to latest changes in nexus

next-exp · Feb 29, 2024 · c92514f · c92514f
1 parent 8b60f8b
commit c92514f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/source/geometries/Honeycomb.cc b/source/geometries/Honeycomb.cc
@@ -10,7 +10,7 @@
 #include "HoneycombBeam.h"
 #include "MaterialsList.h"
 #include "Visibilities.h"
-#include "CylinderPointSampler2020.h"
+#include "CylinderPointSampler.h"
 
 #include <G4LogicalVolume.hh>
 #include <G4RotationMatrix.hh>
@@ -164,9 +164,9 @@ namespace nexus {
 
     // Vertex generator
     gen_  =
-      new CylinderPointSampler2020(0., longer_length/2., longer_height/2.,
-                                   0., 360.*deg, 0,
-                                   G4ThreeVector(0., 0., hc_posz));
+      new CylinderPointSampler(0., longer_length/2., longer_height/2.,
+                               0., 360.*deg, 0,
+                               G4ThreeVector(0., 0., hc_posz));
 
   }
 
@@ -177,7 +177,7 @@ namespace nexus {
     if (region == "HONEYCOMB") {
       G4VPhysicalVolume* VertexVolume;
       do {
-        vertex = gen_->GenerateVertex("VOLUME");
+        vertex = gen_->GenerateVertex(VOLUME);
         G4ThreeVector glob_vtx(vertex);
         glob_vtx = glob_vtx - GetCoordOrigin();
         VertexVolume = geom_navigator_->LocateGlobalPointAndSetup(glob_vtx, 0, false);

diff --git a/source/geometries/Honeycomb.h b/source/geometries/Honeycomb.h
@@ -14,7 +14,7 @@
 #include <G4Navigator.hh>
 
 namespace nexus {
-  class CylinderPointSampler2020;
+  class CylinderPointSampler;
 
   class Honeycomb: public GeometryBase
   {
@@ -48,7 +48,7 @@ namespace nexus {
     G4double angle_, beam_dist_, beam_thickn_;
     G4double compl_angle_;
 
-    CylinderPointSampler2020* gen_;
+    CylinderPointSampler* gen_;
 
     G4Navigator* geom_navigator_;
   };