Merge pull request #21360 from civanch/physics_lists

Updated Geant4 physics lists

SimG4Core/PhysicsLists/plugins/DummyPhysics.cc

@@ -1,4 +1,4 @@
-#include "DummyPhysics.hh"
+#include "DummyPhysics.h"
 #include "SimG4Core/PhysicsLists/interface/DummyEMPhysics.h"
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"

SimG4Core/PhysicsLists/plugins/FTFCMS_BIC.cc

@@ -1,4 +1,4 @@
-#include "FTFCMS_BIC.hh"
+#include "FTFCMS_BIC.h"
 #include "SimG4Core/PhysicsLists/interface/CMSMonopolePhysics.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 

SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT.cc

@@ -1,4 +1,4 @@
-#include "FTFPCMS_BERT.hh"
+#include "FTFPCMS_BERT.h"
 #include "SimG4Core/PhysicsLists/interface/CMSMonopolePhysics.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 

SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_ATL_EMM.cc

@@ -1,4 +1,4 @@
-#include "FTFPCMS_BERT_ATL_EMM.hh"
+#include "FTFPCMS_BERT_ATL_EMM.h"
 #include "SimG4Core/PhysicsLists/interface/CMSEmStandardPhysicsLPM.h"
 #include "SimG4Core/PhysicsLists/interface/CMSHadronPhysicsFTFP_BERT_ATL.h"
 #include "SimG4Core/PhysicsLists/interface/CMSMonopolePhysics.h"

SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EML.cc

@@ -1,5 +1,5 @@
-#include "FTFPCMS_BERT_EML.hh"
-#include "SimG4Core/PhysicsLists/interface/CMSEmStandardPhysics95msc93.h"
+#include "FTFPCMS_BERT_EML.h"
+#include "SimG4Core/PhysicsLists/interface/CMSEmStandardPhysics.h"
 #include "SimG4Core/PhysicsLists/interface/CMSMonopolePhysics.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
@@ -34,7 +34,7 @@ FTFPCMS_BERT_EML::FTFPCMS_BERT_EML(G4LogicalVolumeToDDLogicalPartMap& map,
 
   if (emPhys) {
     // EM Physics
-    RegisterPhysics( new CMSEmStandardPhysics95msc93("EM standard msc93",ver,""));
+    RegisterPhysics( new CMSEmStandardPhysics(ver));
 
     // Synchroton Radiation & GN Physics
     G4EmExtraPhysics* gn = new G4EmExtraPhysics(ver);

SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMM.cc

@@ -1,4 +1,4 @@
-#include "FTFPCMS_BERT_EMM.hh"
+#include "FTFPCMS_BERT_EMM.h"
 #include "SimG4Core/PhysicsLists/interface/CMSEmStandardPhysicsLPM.h"
 #include "SimG4Core/PhysicsLists/interface/CMSMonopolePhysics.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"

SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMV.cc

@@ -1,4 +1,4 @@
-#include "FTFPCMS_BERT_EMV.hh"
+#include "FTFPCMS_BERT_EMV.h"
 #include "SimG4Core/PhysicsLists/interface/CMSMonopolePhysics.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 

SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMY.cc

@@ -1,4 +1,4 @@
-#include "FTFPCMS_BERT_EMY.hh"
+#include "FTFPCMS_BERT_EMY.h"
 #include "SimG4Core/PhysicsLists/interface/CMSMonopolePhysics.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 

SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMY.hh → SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMY.h

@@ -1,14 +1,13 @@
 #ifndef SimG4Core_PhysicsLists_FTFPCMS_BERT_EMY_H
 #define SimG4Core_PhysicsLists_FTFPCMS_BERT_EMY_H
 
-// FTFP_BERT_EMY is a standard Geant4 Physics List with Option3 EM Physics
-//               configuration: forced more steps of e+- near geometry  
-//               boundary. This configuration may be used for R&D of 
+// FTFP_BERT_EMY is a standard Geant4 Physics List FTFP_BERT with Option3 
+//               EM Physics configuration: forced more steps of e+- near 
+//               geometry boundary. This configuration may be used for R&D of 
 //               tracker and HGCal detector performnace. The similation
 //               is expected to be approximately two times slower then 
 //               with the CMS production Physics List
 
-
 #include "SimG4Core/Physics/interface/PhysicsList.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 

SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT_EML_New.cc → SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMZ.cc

@@ -1,11 +1,9 @@
-#include "QGSPCMS_FTFP_BERT_EML_New.hh"
-//#include "SimG4Core/PhysicsLists/interface/CMSEmStandardPhysics95msc93.h"
-//#include "SimG4Core/PhysicsLists/interface/CMSEmStandardPhysicsLPM.h"
+#include "FTFPCMS_BERT_EMZ.h"
 #include "SimG4Core/PhysicsLists/interface/CMSMonopolePhysics.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-#include "G4EmStandardPhysics_option1.hh"
 #include "G4DecayPhysics.hh"
+#include "G4EmStandardPhysics_option4.hh"
 #include "G4EmExtraPhysics.hh"
 #include "G4IonPhysics.hh"
 #include "G4StoppingPhysics.hh"
@@ -14,9 +12,9 @@
 #include "G4HadronicProcessStore.hh"
 
 #include "G4DataQuestionaire.hh"
-#include "G4HadronPhysicsQGSP_FTFP_BERT.hh"
+#include "G4HadronPhysicsFTFP_BERT.hh"
 
-QGSPCMS_FTFP_BERT_EML_New::QGSPCMS_FTFP_BERT_EML_New(G4LogicalVolumeToDDLogicalPartMap& map, 
+FTFPCMS_BERT_EMZ::FTFPCMS_BERT_EMZ(G4LogicalVolumeToDDLogicalPartMap& map, 
 			   const HepPDT::ParticleDataTable * table_,
 			   sim::ChordFinderSetter *chordFinderSetter_, 
 			   const edm::ParameterSet & p) 
@@ -30,23 +28,22 @@ QGSPCMS_FTFP_BERT_EML_New::QGSPCMS_FTFP_BERT_EML_New(G4LogicalVolumeToDDLogicalP
   bool tracking= p.getParameter<bool>("TrackingCut");
   double timeLimit = p.getParameter<double>("MaxTrackTime")*ns;
   edm::LogInfo("PhysicsList") << "You are using the simulation engine: "
-			      << "QGSP_FTFP_BERT_EML_New \n Flags for EM Physics "
+			      << "FTFP_BERT_EMZ \n Flags for EM Physics "
 			      << emPhys << ", for Hadronic Physics "
 			      << hadPhys << " and tracking cut " << tracking
 			      << "   t(ns)= " << timeLimit/ns;
 
   if (emPhys) {
     // EM Physics
-    //RegisterPhysics(new CMSEmStandardPhysics95msc93("EM standard msc93",ver,""));
-    RegisterPhysics( new G4EmStandardPhysics_option1(ver));
+    RegisterPhysics(new G4EmStandardPhysics_option4(ver));
 
     // Synchroton Radiation & GN Physics
     G4EmExtraPhysics* gn = new G4EmExtraPhysics(ver);
     RegisterPhysics(gn);
   }
 
   // Decays
-  this->RegisterPhysics( new G4DecayPhysics(ver));
+  this->RegisterPhysics( new G4DecayPhysics(ver) );
 
   if (hadPhys) {
     G4HadronicProcessStore::Instance()->SetVerbose(ver);
@@ -55,7 +52,7 @@ QGSPCMS_FTFP_BERT_EML_New::QGSPCMS_FTFP_BERT_EML_New(G4LogicalVolumeToDDLogicalP
     RegisterPhysics( new G4HadronElasticPhysics(ver));
 
     // Hadron Physics
-    RegisterPhysics(  new G4HadronPhysicsQGSP_FTFP_BERT(ver));
+    RegisterPhysics(  new G4HadronPhysicsFTFP_BERT(ver));
 
     // Stopping Physics
     RegisterPhysics( new G4StoppingPhysics(ver));

SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMZ.h

@@ -0,0 +1,21 @@
+#ifndef SimG4Core_PhysicsLists_FTFPCMS_BERT_EMZ_H
+#define SimG4Core_PhysicsLists_FTFPCMS_BERT_EMZ_H
+
+// FTFP_BERT_EMZ is a standard Geant4 Physics List FTFP_BERT with Option4
+//               EM Physics configuration: used GS multiple scattering model
+//               for e+- below 100 MeV. Very precised simulation for thin  
+//               layers. This configuration may be used for R&D of 
+//               tracker and HGCal detector performnace. The similation
+//               is expected to be approximately two times slower then 
+//               with the CMS production Physics List
+
+#include "SimG4Core/Physics/interface/PhysicsList.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+
+class FTFPCMS_BERT_EMZ: public PhysicsList {
+
+public:
+  FTFPCMS_BERT_EMZ(G4LogicalVolumeToDDLogicalPartMap& map, const HepPDT::ParticleDataTable * table_, sim::ChordFinderSetter *chordFinderSetter_, const edm::ParameterSet & p);
+};
+
+#endif

SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_HP_EML.cc

@@ -1,4 +1,4 @@
-#include "FTFPCMS_BERT_HP_EML.hh"
+#include "FTFPCMS_BERT_HP_EML.h"
 #include "SimG4Core/PhysicsLists/interface/CMSEmStandardPhysicsXS.h"
 #include "SimG4Core/PhysicsLists/interface/CMSMonopolePhysics.h"
 #include "SimG4Core/PhysicsLists/interface/CMSThermalNeutrons.h"

SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_XS_EML.cc

@@ -1,4 +1,4 @@
-#include "FTFPCMS_BERT_XS_EML.hh"
+#include "FTFPCMS_BERT_XS_EML.h"
 #include "SimG4Core/PhysicsLists/interface/CMSEmStandardPhysicsXS.h"
 #include "SimG4Core/PhysicsLists/interface/CMSMonopolePhysics.h"
 #include "SimG4Core/PhysicsLists/interface/CMSThermalNeutrons.h"

SimG4Core/PhysicsLists/plugins/QBBCCMS.cc

@@ -1,8 +1,8 @@
-#include "QBBCCMS.hh"
+#include "QBBCCMS.h"
 #include "SimG4Core/PhysicsLists/interface/CMSMonopolePhysics.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-#include "G4EmStandardPhysics_option1.hh"
+#include "G4EmStandardPhysics.hh"
 #include "G4DecayPhysics.hh"
 #include "G4EmExtraPhysics.hh"
 #include "G4StoppingPhysics.hh"
@@ -33,7 +33,7 @@ QBBCCMS::QBBCCMS(G4LogicalVolumeToDDLogicalPartMap& map,
 
   if (emPhys) {
     // EM Physics
-    RegisterPhysics( new G4EmStandardPhysics_option1(ver));
+    RegisterPhysics( new G4EmStandardPhysics(ver));
 
     // Synchroton Radiation & GN Physics
     G4EmExtraPhysics* gn = new G4EmExtraPhysics(ver);

SimG4Core/PhysicsLists/plugins/QGSPCMS_BERT.cc

@@ -1,4 +1,4 @@
-#include "QGSPCMS_BERT.hh"
+#include "QGSPCMS_BERT.h"
 #include "SimG4Core/PhysicsLists/interface/CMSMonopolePhysics.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 

SimG4Core/PhysicsLists/plugins/QGSPCMS_BERT_EML.cc

@@ -1,5 +1,5 @@
-#include "QGSPCMS_BERT_EML.hh"
-#include "SimG4Core/PhysicsLists/interface/CMSEmStandardPhysics95msc93.h"
+#include "QGSPCMS_BERT_EML.h"
+#include "SimG4Core/PhysicsLists/interface/CMSEmStandardPhysics.h"
 #include "SimG4Core/PhysicsLists/interface/CMSMonopolePhysics.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
@@ -26,13 +26,13 @@ QGSPCMS_BERT_EML::QGSPCMS_BERT_EML(G4LogicalVolumeToDDLogicalPartMap& map,
   bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics",true);
   bool tracking= p.getParameter<bool>("TrackingCut");
   edm::LogInfo("PhysicsList") << "You are using the simulation engine: "
-			      << "QGSP_BERT_EML with Flags for EM Physics "
+			      << "QGSP_BERT_EMY with Flags for EM Physics "
 			      << emPhys << ", for Hadronic Physics "
 			      << hadPhys << " and tracking cut " << tracking;
 
   if (emPhys) {
     // EM Physics
-    RegisterPhysics( new CMSEmStandardPhysics95msc93("EM standard msc93",ver,""));
+    RegisterPhysics( new CMSEmStandardPhysics(ver));
 
     // Synchroton Radiation & GN Physics
     G4EmExtraPhysics* gn = new G4EmExtraPhysics(ver);