From c92514f46d3cd40b58c72cc5e4a975e99935acae Mon Sep 17 00:00:00 2001
From: Paola Ferrario <paola.ferrario@gmail.com>
Date: Thu, 29 Feb 2024 15:46:04 +0100
Subject: [PATCH] Modify point samplers according to latest changes in nexus

---
 source/geometries/Honeycomb.cc | 10 +++++-----
 source/geometries/Honeycomb.h  |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/source/geometries/Honeycomb.cc b/source/geometries/Honeycomb.cc
index 162814787..bc4112e72 100644
--- 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
index c57a9a64b..654f00427 100644
--- 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_;
   };