Print

Print
Commit in slic/src on MAIN
VisManager.cc+1-31.9 -> 1.10
PhysicsListFactory.cc+69-361.16 -> 1.17
+70-39
2 modified files
JM: Geant4 9.0 compatibility updates.
slic/src
VisManager.cc 1.9 -> 1.10
diff -u -r1.9 -r1.10
--- VisManager.cc	27 Apr 2007 01:54:35 -0000	1.9
+++ VisManager.cc	29 Jun 2007 22:20:43 -0000	1.10
@@ -1,11 +1,10 @@

-// $Header: /cvs/lcd/slic/src/VisManager.cc,v 1.9 2007/04/27 01:54:35 jeremy Exp $

+// $Header: /cvs/lcd/slic/src/VisManager.cc,v 1.10 2007/06/29 22:20:43 jeremy Exp $

 #ifdef G4VIS_USE
 #include "VisManager.hh"
 
 /* Geant4 visualization libs with no external deps */
 #include "G4ASCIITree.hh"
 #include "G4DAWNFILE.hh"

-#include "G4GAGTree.hh"

 #include "G4HepRepFile.hh"
 #include "G4HepRep.hh"
 #include "G4RayTracer.hh"

@@ -63,7 +62,6 @@

     // Graphics Systems not needing external packages or libraries...
     RegisterGraphicsSystem(new G4ASCIITree);
     RegisterGraphicsSystem(new G4DAWNFILE);

-    RegisterGraphicsSystem(new G4GAGTree);

     RegisterGraphicsSystem(new G4HepRepFile);
     RegisterGraphicsSystem(new G4HepRep);
     RegisterGraphicsSystem(new G4RayTracer);
slic/src
PhysicsListFactory.cc 1.16 -> 1.17
diff -u -r1.16 -r1.17
--- PhysicsListFactory.cc	27 Apr 2007 01:54:35 -0000	1.16
+++ PhysicsListFactory.cc	29 Jun 2007 22:20:43 -0000	1.17
@@ -1,32 +1,62 @@

-// $Header: /cvs/lcd/slic/src/PhysicsListFactory.cc,v 1.16 2007/04/27 01:54:35 jeremy Exp $

+// $Header: /cvs/lcd/slic/src/PhysicsListFactory.cc,v 1.17 2007/06/29 22:20:43 jeremy Exp $

 #include "PhysicsListFactory.hh"
 

+/*
+FTFC
+FTFP
+FTFP_EMV
+LBE
+LHEP
+LHEP_BERT
+LHEP_BERT_HP
+LHEP_EMV
+LHEP_PRECO_HP
+QBBC
+QGSC
+QGSC_EFLOW
+QGSC_EMV
+QGSP
+QGSP_BERT
+QGSP_BERT_EMV
+QGSP_BERT_HP
+QGSP_BERT_NQE
+QGSP_BERT_TRV
+QGSP_BIC
+QGSP_BIC_HP
+QGSP_EMV
+QGSP_EMV_NQE
+QGSP_EMX
+QGSP_NQE
+QGSP_QEL
+*/
+

 // geant4 physics lists
 #include "FTFC.hh"
 #include "FTFP.hh"

+#include "FTFP_EMV.hh"

 #include "LBE.hh"
 #include "LHEP.hh"
 #include "LHEP_BERT.hh"
 #include "LHEP_BERT_HP.hh"

-#include "LHEP_BIC.hh"
-#include "LHEP_BIC_HP.hh"

 #include "LHEP_EMV.hh"

-#include "LHEP_HP.hh"
-#include "LHEP_LEAD.hh"
-#include "LHEP_LEAD_HP.hh"
-#include "LHEP_PRECO.hh"

 #include "LHEP_PRECO_HP.hh"
 #include "QBBC.hh"
 #include "QGSC.hh"

-#include "QGSC_LEAD.hh"
-#include "QGSC_LEAD_HP.hh"

+#include "QGSC_EFLOW.hh"
+#include "QGSC_EMV.hh"

 #include "QGSP.hh"
 #include "QGSP_BERT.hh"

+#include "QGSP_BERT_EMV.hh"

 #include "QGSP_BERT_HP.hh"

+#include "QGSP_BERT_NQE.hh"
+#include "QGSP_BERT_TRV.hh"

 #include "QGSP_BIC.hh"

+#include "QGSP_BIC_HP.hh"

 #include "QGSP_EMV.hh"

+#include "QGSP_EMV_NQE.hh"

 #include "QGSP_EMX.hh"

-#include "QGSP_HP.hh"

+#include "QGSP_NQE.hh"
+#include "QGSP_QEL.hh"

 
 // lcphys
 #ifdef SLIC_USE_LCPHYS

@@ -45,7 +75,8 @@

  * @param name         The name of the list which will be used to instantiate it.
  * @param description  A short description of the list.
  */

-#define BUILDER(list,name,description) this->addBuilder( new TPhysicsListBuilder<list>( name, description ) );

+//#define BUILDER(list,name,description) this->addBuilder( new TPhysicsListBuilder<list>( name, description ) );
+#define BUILDER(list,description) this->addBuilder( new TPhysicsListBuilder<list>( "\""#list"\"", description ) );

 
 namespace slic
 {

@@ -103,33 +134,35 @@

   {
 
 #ifdef SLIC_USE_LCPHYS

-    BUILDER(LCPhysicsList,"LCPhys","ILC Physics List by Dennis Wright.")

+    BUILDER(LCPhysicsList, "ILC Physics List by Dennis Wright.")

 #endif
 

-    BUILDER(LHEP,          "LHEP",          "Low and High Energy Parameterised")
-    BUILDER(FTFC,          "FTFC",          "Fritiof with CHIPS")
-    BUILDER(FTFP,          "FTFP",          "Fritiof with precompound")
-    BUILDER(LBE,           "LBE",           "low backgrounds experiment with low energy EM")
-    BUILDER(LHEP_BERT,     "LHEP_BERT",     "LHEP with Bertini Cascade")
-    BUILDER(LHEP_BERT_HP,  "LHEP_BERT_HP",  "LHEP with Bertini Cascade and high precision neutrons")
-    BUILDER(LHEP_BIC,      "LHEP_BIC",      "LHEP with Binary Cascade")
-    BUILDER(LHEP_BIC_HP,   "LHEP_BIC_HP",   "LHEP with Binary Cascade and high precision neutrons")
-    BUILDER(LHEP_EMV,      "LHEP_EMV",      "LHEP with v 7.1 EM processes")
-    BUILDER(LHEP_HP,       "LHEP_HP",       "LHEP with high precision neutrons")
-    BUILDER(LHEP_LEAD,     "LHEP_LEAD",     "LHEP with leading particle")
-    BUILDER(LHEP_LEAD_HP,  "LHEP_LEAD_HP",  "LHEP with leading particle and HP")
-    BUILDER(LHEP_PRECO,    "LHEP_PRECO",    "LHEP with precompound")
-    BUILDER(LHEP_PRECO_HP, "LHEP_PRECO_HP", "LHEP_PRECO with HP")      
-    BUILDER(QGSC,          "QGSC",          "Quark Gluon-String (QGS) with CHIPS")
-    BUILDER(QGSC_LEAD,     "QGSC_LEAD",     "QGSC with leading particle")
-    BUILDER(QGSC_LEAD_HP,  "QGSC_LEAD_HP",  "QGSC_LEAD with HP")
-    BUILDER(QGSP,          "QGSP",          "QGS with precompound")
-    BUILDER(QGSP_BERT,     "QGSP_BERT",     "QGSP with Bertini Cascade")
-    BUILDER(QGSP_BERT_HP,  "QGSP_BERT_HP",  "QGSP with Bertini Cascade and high precision neutrons")
-    BUILDER(QGSP_BIC,      "QGSP_BIC",      "QGSP with Binary Cascade")
-    BUILDER(QGSP_EMV,      "QGSP_EMV",      "LHEP with v 7.1 EM processes")
-    BUILDER(QGSP_EMX,      "QGSP_EMX",      "QGSP with v 7.2 EM processes")
-    BUILDER(QGSP_HP,       "QGSP_HP",       "QGSP with high precision neutron")

+    BUILDER(FTFC,          "Fritiof with CHIPS")
+    BUILDER(FTFP,          "Fritiof with precompound")
+    BUILDER(FTFP_EMV,      "FTFP with v 7.1 EM processes")
+    BUILDER(LBE,           "low backgrounds experiment with low energy EM")
+    BUILDER(LHEP,          "Low and High Energy Parameterised")
+    BUILDER(LHEP_BERT,     "LHEP with Bertini Cascade")
+    BUILDER(LHEP_BERT_HP,  "LHEP with Bertini Cascade and high precision neutrons")
+    BUILDER(LHEP_EMV,      "LHEP with v 7.1 EM processes")
+    BUILDER(LHEP_PRECO_HP, "LHEP_PRECO with HP")
+    BUILDER(QBBC,           "")
+    BUILDER(QGSC,           "Quark Gluon-String (QGS) with CHIPS")
+    BUILDER(QGSC_EFLOW,     "")
+    BUILDER(QGSC_EMV,       "QGSC with v 7.1 EM processes")
+    BUILDER(QGSP,           "QGS with precompound")
+    BUILDER(QGSP_BERT,      "QGSP with Bertini Cascade")
+    BUILDER(QGSP_BERT_EMV,  "QGSP_BERT with v 7.1 EM processes")
+    BUILDER(QGSP_BERT_HP,    "QGSP with Bertini Cascade and high precision neutrons")
+    BUILDER(QGSP_BERT_NQE,  "")
+    BUILDER(QGSP_BERT_NQE,  "")
+    BUILDER(QGSP_BIC,       "QGSP with Binary Cascade")
+    BUILDER(QGSP_BIC_HP,    "QGSP with Binary Cascade")
+    BUILDER(QGSP_EMV,       "LHEP with v 7.1 EM processes")
+    BUILDER(QGSP_EMV_NQE,   "")
+    BUILDER(QGSP_EMX,       "QGSP with v 7.2 EM processes")
+    BUILDER(QGSP_NQE,       "")
+    BUILDER(QGSP_QEL,       "")

   }
 
   void PhysicsListFactory::addBuilder( VPhysicsListBuilder* builder)
CVSspam 0.2.8