- Replace Shielding with QGSP_INCLXX_HP, as it includes Radioactive Decay in later Geant4 versions

- Use correct Verbosity Setting to silence physics list spam
- Fix wrong Material in Clover Detector setup (@ywang)
- Use in C10H8O4 instead of C10H8O3 for PET material (@warr)

Author: janmayer

CMakeLists.txt

@@ -3,6 +3,8 @@ cmake_minimum_required(VERSION 3.11 FATAL_ERROR)
 project(G4Horus)
 
 # Find Geant4 package, require all available UI and Vis drivers by default
+# set(CMAKE_FIND_PACKAGE_SORT_ORDER NATURAL)
+# set(CMAKE_FIND_PACKAGE_SORT_DIRECTION DEC)
 find_package(Geant4 10.5 REQUIRED ui_all vis_all multithreaded)
 # Unfortunately, Geant4 uses cmake ineptly and forces its settings upon us ...
 include(${Geant4_USE_FILE})

G4Horus.cc

@@ -1,13 +1,14 @@
 #include "ActionInitialization.hh"
 #include "DetectorConstruction.hh"
 
+#include "G4HadronicParameters.hh"
 #include "G4HadronicProcessStore.hh"
 #include "G4MTRunManager.hh"
 #include "G4UIExecutive.hh"
 #include "G4UImanager.hh"
+#include "G4Version.hh"
 #include "G4VisExecutive.hh"
-#include "Shielding.hh"
-// #include "QGSP_INCLXX.hh"
+#include "QGSP_INCLXX_HP.hh"
 
 inline std::string GetCmdOption(char** begin, char** end,
                                 const std::string& option,
@@ -53,16 +54,18 @@ int main(int argc, char* argv[])
 
     G4Random::setTheEngine(new CLHEP::RanecuEngine);
 
-    // Silence hadronic processes summary
-    G4HadronicProcessStore::Instance()->SetVerbose(0);
-
     auto run_manager = new G4MTRunManager();
     run_manager->SetVerboseLevel(0);
     run_manager->SetUserInitialization(new DetectorConstruction());
-    // run_manager->SetUserInitialization(new QGSP_INCLXX(0));
-    run_manager->SetUserInitialization(new Shielding(0)); // includes G4RadioactiveDecay
+    run_manager->SetUserInitialization(new QGSP_INCLXX_HP(0));
     run_manager->SetUserInitialization(new ActionInitialization(GetCmdOption(argv, argv + argc, "-k", "hist")));
     run_manager->SetNumberOfThreads(threads);
+// Silence hadronic processes summary
+#if G4VERSION_NUMBER < 1070
+    G4HadronicProcessStore::Instance()->SetVerbose(0);
+#else
+    G4HadronicParameters::Instance()->SetVerboseLevel(0);
+#endif
     run_manager->Initialize();
 
     auto ui_manager = G4UImanager::GetUIpointer();

G4Horus.sh

@@ -6,16 +6,16 @@ set -e
 # On some systems, using the following option can improve
 # the 3D performance of the detector visualization.
 # On others, it will crash the Geant4 window.
-export LIBGL_ALWAYS_INDIRECT=y
+# export LIBGL_ALWAYS_INDIRECT=y
 
 ## Geant 4 Version
 # If a specific Geant4 version should be used, adapt and uncomment these lines.
-# source /data/jmayer/software/geant4.10.05/bin/geant4.sh
+# source /opt/Geant4/4.10.07.p01/bin/geant4.sh
 echo "Using Geant4 Version $(geant4-config --version) in $(dirname $(dirname $(geant4-config --prefix)))"
 
 ## Build Project
 # Remove previous build directory if it exists and recreate it
-#rm -rf build
+# rm -rf build
 mkdir -p build
 cd build
 

src/DetectorConstruction.cc

@@ -127,7 +127,7 @@ void DetectorConstruction::DefineMaterials()
 
     G4Material* PET = new G4Material("PET", 1.4 * g / cm3, 3);
     PET->AddElement(C, 10);
-    PET->AddElement(O, 3);
+    PET->AddElement(O, 4);
     PET->AddElement(H, 8);
 
     G4Material* Brass = new G4Material("Brass", 8.5 * g / cm3, 2);

src/detectors/HPGeClover.cc

@@ -187,7 +187,7 @@ void HPGe::Clover::Leaf(const G4double mx, const G4double my, const G4double rot
         new G4PVPlacement(G4Transform3D(rm, crystalPO), crystalLV, leaf.name + "_crystalPV", fDetectorLV, false, 0, checkOverlap);
     }
 
-    // Todschicht Kristall
+    // Totschicht Kristall
     {
         auto inactiveSV_Step1 = new G4Tubs("", 0., leaf.crystalRadius, leaf.deadlayerThickness / 2., 0. * deg, 360. * deg);
         auto inactiveSV_Step2 = new G4SubtractionSolid("", inactiveSV_Step1, cutbox, nullptr, G4ThreeVector(0, -(leaf.crystalOffset + cutbox_size), 0));
@@ -212,7 +212,7 @@ void HPGe::Clover::Leaf(const G4double mx, const G4double my, const G4double rot
         auto alabsSV_Step2 = new G4SubtractionSolid("", alabsSV_Step1, cutbox, nullptr, G4ThreeVector(0, -(leaf.crystalOffset + cutbox_size), 0));
         auto alabsSV = new G4SubtractionSolid(leaf.name + "_alAbsSV", alabsSV_Step2, cutbox, nullptr, G4ThreeVector((leaf.crystalOffset + cutbox_size), 0, 0));
 
-        auto alabsLV = new G4LogicalVolume(alabsSV, Ge, leaf.name + "_alAbsLV");
+        auto alabsLV = new G4LogicalVolume(alabsSV, Al, leaf.name + "_alAbsLV");
         auto alabsVA = new G4VisAttributes(G4Colour(1.0, .0, .0));
         alabsVA->SetForceSolid(true);
         alabsLV->SetVisAttributes(alabsVA);