Merge pull request #192 from paolafer/add-shielding-for-new

Add shielding class for NEW
next-exp · Feb 17, 2023 · 37505b5 · 37505b5
2 parents c874449 + 2938964
commit 37505b5
Show file tree

Hide file tree

Showing 10 changed files with 569 additions and 10 deletions.
diff --git a/macros/NEXT_options.config.mac b/macros/NEXT_options.config.mac
@@ -48,7 +48,7 @@
 # Some of possible regions for NEW:
 # LAB, EXTERNAL_PORT_ANODE, EXTERNAL_PORT_AXIAL, SOURCE_PORT_AXIAL_EXT,
 # SOURCE_PORT_LATERAL_EXT, SOURCE_PORT_LATERAL_DISK, SOURCE_PORT_UP_DISK,
-# SOURCE_DISK, SHIELDING_LEAD, SHIELDING_STEEL, INNER_AIR, SHIELDING_STRUCT,
+# SOURCE_DISK, SHIELDING_LEAD, SHIELDING_STEEL, INNER_AIR, SHIELDING_STRUCT,
 # EXTERNAL, PEDESTAL, EXTRA_VESSEL, MINI_CASTLE, RN_MINI_CASTLE,
 # MINI_CASTLE_STEEL, VESSEL, SOURCE_PORT_ANODE, SOURCE_PORT_UP,
 # SOURCE_PORT_AXIAL, INTERNAL_PORT_ANODE, INTERNAL_PORT_UPPER,

diff --git a/macros/calibration/NEW_disk_source.config.mac b/macros/calibration/NEW_disk_source.config.mac
@@ -24,7 +24,7 @@
 /Geometry/NextNew/source_material Na
 
 ## For visualization
-/Geometry/Next100/shielding_vis false
+/Geometry/NextNew/shielding_vis false
 /Geometry/NextNew/table_vis false
 /Geometry/NextNew/ics_vis true
 /Geometry/NextNew/vessel_vis false

diff --git a/macros/calibration/NEW_external_source.config.mac b/macros/calibration/NEW_external_source.config.mac
@@ -26,7 +26,7 @@
 /Geometry/NextNew/lead_castle false
 
 ## For visualization
-/Geometry/Next100/shielding_vis false
+/Geometry/NextNew/shielding_vis false
 /Geometry/NextNew/table_vis false
 /Geometry/NextNew/ics_vis true
 /Geometry/NextNew/vessel_vis false

diff --git a/macros/calibration/NEW_internal_source.config.mac b/macros/calibration/NEW_internal_source.config.mac
@@ -28,7 +28,7 @@
 /Geometry/NextNew/lead_castle false
 
 ## For visualization
-/Geometry/Next100/shielding_vis false
+/Geometry/NextNew/shielding_vis false
 /Geometry/NextNew/table_vis false
 /Geometry/NextNew/ics_vis false
 /Geometry/NextNew/energy_plane_vis false

diff --git a/macros/geometries/NEWDefaultVisibility.mac b/macros/geometries/NEWDefaultVisibility.mac
@@ -6,7 +6,7 @@
 ## The NEXT Collaboration
 ## ----------------------------------------------------------------------------
 
-/Geometry/Next100/shielding_vis     false
+/Geometry/NextNew/shielding_vis     false
 /Geometry/NextNew/table_vis         false
 /Geometry/NextNew/minicastle_vis    false
 /Geometry/NextNew/ics_vis           false

diff --git a/source/geometries/NextNew.cc b/source/geometries/NextNew.cc
@@ -9,7 +9,7 @@
 #include "NextNew.h"
 
 #include "LSCHallA.h"
-#include "Next100Shielding.h"
+#include "NextNewShielding.h"
 #include "NextNewPedestal.h"
 #include "NextNewMiniCastle.h"
 #include "NextNewVessel.h"
@@ -75,7 +75,7 @@ namespace nexus {
     //Lab walls
     hallA_walls_ = new LSCHallA();
     //Shielding
-    shielding_ = new Next100Shielding();
+    shielding_ = new NextNewShielding();
     //Pedestal
     pedestal_ = new NextNewPedestal();
     // Mini lead castle

diff --git a/source/geometries/NextNew.h b/source/geometries/NextNew.h
@@ -13,7 +13,7 @@
 #include <G4RotationMatrix.hh>
 
 namespace nexus {class LSCHallA; }
-namespace nexus {class Next100Shielding; }
+namespace nexus {class NextNewShielding; }
 namespace nexus {class NextNewPedestal; }
 namespace nexus {class NextNewMiniCastle; }
 namespace nexus {class NextNewVessel; }
@@ -65,7 +65,7 @@ namespace nexus {
 
     //Detector parts
     LSCHallA* hallA_walls_;
-    Next100Shielding* shielding_;
+    NextNewShielding* shielding_;
     NextNewPedestal* pedestal_;
     NextNewMiniCastle* mini_castle_;
     NextNewVessel* vessel_;