Merge pull request #32009 from civanch/thermal_neutrons

Switch to Geant4 thermal neutron physics
cms-sw · Nov 3, 2020 · cdc8adf · cdc8adf
2 parents 6e73445 + d407b69
commit cdc8adf
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 64 deletions.
diff --git a/SimG4Core/PhysicsLists/interface/CMSThermalNeutrons.h b/SimG4Core/PhysicsLists/interface/CMSThermalNeutrons.h
diff --git a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_HP_EML.cc b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_HP_EML.cc
@@ -1,8 +1,8 @@
 #include "FTFPCMS_BERT_HP_EML.h"
 #include "SimG4Core/PhysicsLists/interface/CMSEmStandardPhysicsXS.h"
-#include "SimG4Core/PhysicsLists/interface/CMSThermalNeutrons.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
+#include "G4ThermalNeutrons.hh"
 #include "G4DecayPhysics.hh"
 #include "G4EmExtraPhysics.hh"
 #include "G4IonPhysics.hh"
@@ -60,7 +60,7 @@ FTFPCMS_BERT_HP_EML::FTFPCMS_BERT_HP_EML(const edm::ParameterSet& p) : PhysicsLi
       RegisterPhysics(ncut);
     }
     if (thermal) {
-      RegisterPhysics(new CMSThermalNeutrons(ver));
+      RegisterPhysics(new G4ThermalNeutrons(ver));
     }
   }
 }
diff --git a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_HP_EMM.cc b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_HP_EMM.cc
@@ -1,8 +1,8 @@
 #include "FTFPCMS_BERT_HP_EMM.h"
 #include "SimG4Core/PhysicsLists/interface/CMSEmStandardPhysicsLPM.h"
-#include "SimG4Core/PhysicsLists/interface/CMSThermalNeutrons.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
+#include "G4ThermalNeutrons.hh"
 #include "G4DecayPhysics.hh"
 #include "G4EmExtraPhysics.hh"
 #include "G4IonPhysics.hh"
@@ -60,7 +60,7 @@ FTFPCMS_BERT_HP_EMM::FTFPCMS_BERT_HP_EMM(const edm::ParameterSet& p) : PhysicsLi
       RegisterPhysics(ncut);
     }
     if (thermal) {
-      RegisterPhysics(new CMSThermalNeutrons(ver));
+      RegisterPhysics(new G4ThermalNeutrons(ver));
     }
   }
 }
diff --git a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_XS_EML.cc b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_XS_EML.cc
@@ -1,8 +1,8 @@
 #include "FTFPCMS_BERT_XS_EML.h"
 #include "SimG4Core/PhysicsLists/interface/CMSEmStandardPhysicsXS.h"
-#include "SimG4Core/PhysicsLists/interface/CMSThermalNeutrons.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
+#include "G4ThermalNeutrons.hh"
 #include "G4DecayPhysics.hh"
 #include "G4EmExtraPhysics.hh"
 #include "G4IonPhysics.hh"
@@ -60,7 +60,7 @@ FTFPCMS_BERT_XS_EML::FTFPCMS_BERT_XS_EML(const edm::ParameterSet& p) : PhysicsLi
       RegisterPhysics(ncut);
     }
     if (thermal) {
-      RegisterPhysics(new CMSThermalNeutrons(ver));
+      RegisterPhysics(new G4ThermalNeutrons(ver));
     }
   }
 }
diff --git a/SimG4Core/PhysicsLists/plugins/FTFPCMS_INCLXX_HP_EMM.cc b/SimG4Core/PhysicsLists/plugins/FTFPCMS_INCLXX_HP_EMM.cc
@@ -1,8 +1,8 @@
 #include "FTFPCMS_INCLXX_HP_EMM.h"
 #include "SimG4Core/PhysicsLists/interface/CMSEmStandardPhysicsLPM.h"
-#include "SimG4Core/PhysicsLists/interface/CMSThermalNeutrons.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
+#include "G4ThermalNeutrons.hh"
 #include "G4DecayPhysics.hh"
 #include "G4EmExtraPhysics.hh"
 #include "G4IonINCLXXPhysics.hh"
@@ -60,7 +60,7 @@ FTFPCMS_INCLXX_HP_EMM::FTFPCMS_INCLXX_HP_EMM(const edm::ParameterSet& p) : Physi
       RegisterPhysics(ncut);
     }
     if (thermal) {
-      RegisterPhysics(new CMSThermalNeutrons(ver));
+      RegisterPhysics(new G4ThermalNeutrons(ver));
     }
   }
 }
diff --git a/SimG4Core/PhysicsLists/src/CMSThermalNeutrons.cc b/SimG4Core/PhysicsLists/src/CMSThermalNeutrons.cc