Project

General

Profile

Changes to test45

These changes were done in "Standalone" mode (see README, using CMakeLists_Standalone.txt)

Changes to test45.cc itself

$ diff -u -w test45.cc ../../source/geant4/tests/test45/
--- test45.cc    2016-01-31 23:10:49.853508000 -0600
+++ ../../source/geant4/tests/test45/test45.cc    2016-01-31 17:52:58.346555000 -0600
@@ -48,13 +48,7 @@
 #include "Randomize.hh" 

 #include "DetectorConstruction.hh" 
-#ifdef USE_OLD_FACTORY
    #include "G4PhysListFactory.hh" 
-#else
-  #include "G4PhysListFactoryAlt.hh" 
-  using namespace g4alt;
-#endif
-
 #include "G4VModularPhysicsList.hh" 
 #include "PrimaryGeneratorAction.hh" 

Running tests

cd ${GEANT4_DIR}/tests-standalone/test45-standalone/
# no fancy CMakeList.txt manipulation
$CCFORCE cmake .   # CCFORCE to use alternative gcc
make -f Makefile
cp ./test45.cc ./test45.cc_original_code
mv ./test45 ./test45_original_code
./test45_original_code test45.in >& test45.out.original_code
export PHYSLIST=QGSP_BERT
./test45_original_code test45.in >& test45.out.original_code_QGSP_BERT
unset PHYSLIST
make -f Makefile clean
make -f Makefile
cp ./test45.cc ./test45.cc_new_factory
mv ./test45 ./test45_new_factory
./test45_new_factory test45.in >& test45.out.new_factory
export PHYSLIST=QGSP_BERT
./test45_new_factory test45.in >& test45.out.new_factory_QGSP_BERT
unset PHYSLIST

Differences

$ diff -u test45.out.original_code test45.out.new_factory
--- test45.out.original_code    2016-01-31 23:09:31.080459000 -0600
+++ test45.out.new_factory    2016-01-31 23:12:41.381413000 -0600
@@ -7,9 +7,9 @@
                             WWW : http://cern.ch/geant4
 *************************************************************

-### G4PhysListFactory WARNING:  environment variable PHYSLIST is not defined
+### G4PhysListRegistry WARNING:  environment variable PHYSLIST is not defined
     Default Physics Lists FTFP_BERT is instantiated
-G4PhysListFactory::GetReferencePhysList <FTFP_BERT>  EMoption= 0
+G4PhysListRegistry::GetModularPhysicsList <FTFP_BERT>, as "FTFP_BERT" with extensions "" 
 <<< Geant4 Physics List simulation engine: FTFP_BERT 2.0

 <<< Reference Physics List FTFP_BERT is built
@@ -756,7 +756,7 @@
  Run terminated.
 Run Summary
   Number of events processed : 100000
-  User=11.93s Real=11.96s Sys=0s
+  User=10.06s Real=10.07s Sys=0.01s
 RunAction: End of run actions are started
 HistoManager: End of run actions are started
 ========================================================
$ diff -u test45.out.original_code_QGSP_BERT test45.out.new_factory_QGSP_BERT
--- test45.out.original_code_QGSP_BERT    2016-01-31 23:09:44.003795000 -0600
+++ test45.out.new_factory_QGSP_BERT    2016-01-31 23:12:52.967714000 -0600
@@ -7,7 +7,7 @@
                             WWW : http://cern.ch/geant4
 *************************************************************

-G4PhysListFactory::GetReferencePhysList <QGSP_BERT>  EMoption= 0
+G4PhysListRegistry::GetModularPhysicsList <QGSP_BERT>, as "QGSP_BERT" with extensions "" 
 <<< Geant4 Physics List simulation engine: QGSP_BERT 4.0

 <<< Reference Physics List QGSP_BERT is built
@@ -770,7 +770,7 @@
  Run terminated.
 Run Summary
   Number of events processed : 100000
-  User=11.46s Real=11.48s Sys=0.01s
+  User=10.24s Real=10.25s Sys=0.01s
 RunAction: End of run actions are started
 HistoManager: End of run actions are started
 ========================================================
$ diff -u test45.out.original_code test45.out.new_factory_QGSP_BERT
--- test45.out.original_code    2016-01-31 23:09:31.080459000 -0600
+++ test45.out.new_factory_QGSP_BERT    2016-01-31 23:12:52.967714000 -0600
@@ -7,12 +7,10 @@
                             WWW : http://cern.ch/geant4
 *************************************************************

-### G4PhysListFactory WARNING:  environment variable PHYSLIST is not defined
-    Default Physics Lists FTFP_BERT is instantiated
-G4PhysListFactory::GetReferencePhysList <FTFP_BERT>  EMoption= 0
-<<< Geant4 Physics List simulation engine: FTFP_BERT 2.0
+G4PhysListRegistry::GetModularPhysicsList <QGSP_BERT>, as "QGSP_BERT" with extensions "" 
+<<< Geant4 Physics List simulation engine: QGSP_BERT 4.0

-<<< Reference Physics List FTFP_BERT is built
+<<< Reference Physics List QGSP_BERT is built

 /run/verbose 1
 /tracking/verbose 0
@@ -435,10 +433,12 @@
      Cr_sctns:            GheishaElastic: 0 eV  ---> 100 TeV

   Process: neutronInelastic
-        Model:                      FTFP: 4 GeV ---> 100 TeV
-        Model:            BertiniCascade: 0 eV  ---> 5 GeV
+        Model:                      QGSP: 12 GeV ---> 100 TeV
+        Model:                      FTFP: 9.5 GeV ---> 25 GeV
+        Model:            BertiniCascade: 0 eV  ---> 9.9 GeV
      Cr_sctns:      G4NeutronInelasticXS: 0 eV  ---> 100 TeV
      Cr_sctns:       Barashenkov-Glauber: 0 eV  ---> 100 TeV
+     Cr_sctns:       Barashenkov-Glauber: 0 eV  ---> 100 TeV
      Cr_sctns:          GheishaInelastic: 0 eV  ---> 100 TeV

   Process: nCapture
@@ -617,9 +617,11 @@
      Cr_sctns:            GheishaElastic: 0 eV  ---> 100 TeV

   Process: kaon+Inelastic
-        Model:                      FTFP: 4 GeV ---> 100 TeV
-        Model:            BertiniCascade: 0 eV  ---> 5 GeV
+        Model:                      QGSP: 12 GeV ---> 100 TeV
+        Model:                      FTFP: 9.5 GeV ---> 25 GeV
+        Model:            BertiniCascade: 0 eV  ---> 9.9 GeV
      Cr_sctns:            Glauber-Gribov: 0 eV  ---> 2.88022e+295 J  
+     Cr_sctns:  ChipsKaonPlusInelasticXS: 0 eV  ---> 100 TeV
      Cr_sctns:          GheishaInelastic: 0 eV  ---> 100 TeV

 ---------------------------------------------------
@@ -630,9 +632,11 @@
      Cr_sctns:            GheishaElastic: 0 eV  ---> 100 TeV

   Process: kaon-Inelastic
-        Model:                      FTFP: 4 GeV ---> 100 TeV
-        Model:            BertiniCascade: 0 eV  ---> 5 GeV
+        Model:                      QGSP: 12 GeV ---> 100 TeV
+        Model:                      FTFP: 9.5 GeV ---> 25 GeV
+        Model:            BertiniCascade: 0 eV  ---> 9.9 GeV
      Cr_sctns:            Glauber-Gribov: 0 eV  ---> 2.88022e+295 J  
+     Cr_sctns: ChipsKaonMinusInelasticXS: 0 eV  ---> 100 TeV
      Cr_sctns:          GheishaInelastic: 0 eV  ---> 100 TeV

   Process: hBertiniCaptureAtRest
@@ -676,8 +680,12 @@
      Cr_sctns:            GheishaElastic: 0 eV  ---> 100 TeV

   Process: pi+Inelastic
-        Model:                      FTFP: 4 GeV ---> 100 TeV
-        Model:            BertiniCascade: 0 eV  ---> 5 GeV
+        Model:                      QGSP: 12 GeV ---> 100 TeV
+        Model:                      FTFP: 9.5 GeV ---> 25 GeV
+        Model:            BertiniCascade: 0 eV  ---> 9.9 GeV
+     Cr_sctns:      G4CrossSectionPairGG: 0 eV  ---> 100 TeV
+                         G4CrossSectionPairGG: G4PiNuclearCrossSection cross sections 
+                           below 91 GeV, Glauber-Gribov above 
      Cr_sctns:      G4CrossSectionPairGG: 0 eV  ---> 100 TeV
                          G4CrossSectionPairGG: G4PiNuclearCrossSection cross sections 
                            below 91 GeV, Glauber-Gribov above 
@@ -693,8 +701,12 @@
      Cr_sctns:            GheishaElastic: 0 eV  ---> 100 TeV

   Process: pi-Inelastic
-        Model:                      FTFP: 4 GeV ---> 100 TeV
-        Model:            BertiniCascade: 0 eV  ---> 5 GeV
+        Model:                      QGSP: 12 GeV ---> 100 TeV
+        Model:                      FTFP: 9.5 GeV ---> 25 GeV
+        Model:            BertiniCascade: 0 eV  ---> 9.9 GeV
+     Cr_sctns:      G4CrossSectionPairGG: 0 eV  ---> 100 TeV
+                         G4CrossSectionPairGG: G4PiNuclearCrossSection cross sections 
+                           below 91 GeV, Glauber-Gribov above 
      Cr_sctns:      G4CrossSectionPairGG: 0 eV  ---> 100 TeV
                          G4CrossSectionPairGG: G4PiNuclearCrossSection cross sections 
                            below 91 GeV, Glauber-Gribov above 
@@ -711,8 +723,10 @@
      Cr_sctns:            GheishaElastic: 0 eV  ---> 100 TeV

   Process: protonInelastic
-        Model:                      FTFP: 4 GeV ---> 100 TeV
-        Model:            BertiniCascade: 0 eV  ---> 5 GeV
+        Model:                      QGSP: 12 GeV ---> 100 TeV
+        Model:                      FTFP: 9.5 GeV ---> 25 GeV
+        Model:            BertiniCascade: 0 eV  ---> 9.9 GeV
+     Cr_sctns:       Barashenkov-Glauber: 0 eV  ---> 100 TeV
      Cr_sctns:       Barashenkov-Glauber: 0 eV  ---> 100 TeV
      Cr_sctns:          GheishaInelastic: 0 eV  ---> 100 TeV

@@ -756,7 +770,7 @@
  Run terminated.
 Run Summary
   Number of events processed : 100000
-  User=11.93s Real=11.96s Sys=0s
+  User=10.24s Real=10.25s Sys=0.01s
 RunAction: End of run actions are started
 HistoManager: End of run actions are started
 ========================================================