Changeset 1340 for trunk/source/physics_lists

Timestamp:

Nov 5, 2010, 3:45:55 PM (14 years ago)

Author:

garnier

Message:

update ti head

Location:

trunk/source/physics_lists

Files:

• CVS/Entries (modified) (1 diff)
• CVS/Tag (modified) (1 diff)
• History (modified) (5 diffs)
• builders/CVS/Entries (modified) (1 diff)
• builders/CVS/Tag (modified) (1 diff)
• builders/include/CVS/Entries (modified) (1 diff)
• builders/include/CVS/Tag (modified) (1 diff)
• builders/include/G4DataQuestionaire.hh (modified) (4 diffs)
• builders/include/G4HadronElasticPhysics.hh (modified) (4 diffs)
• builders/include/G4IonBinaryCascadePhysics.hh (modified) (3 diffs)
• builders/include/G4OpticalPhysics.hh (modified) (6 diffs)
• builders/include/G4OpticalPhysicsMessenger.hh (modified) (1 diff)
• builders/src/CVS/Entries (modified) (1 diff)
• builders/src/CVS/Tag (modified) (1 diff)
• builders/src/G4EmDNAPhysics.cc (modified) (4 diffs)
• builders/src/G4EmLivermorePhysics.cc (modified) (4 diffs)
• builders/src/G4EmLivermorePolarizedPhysics.cc (modified) (4 diffs)
• builders/src/G4EmPenelopePhysics.cc (modified) (4 diffs)
• builders/src/G4EmStandardPhysics.cc (modified) (7 diffs)
• builders/src/G4EmStandardPhysics_option1.cc (modified) (6 diffs)
• builders/src/G4EmStandardPhysics_option2.cc (modified) (5 diffs)
• builders/src/G4EmStandardPhysics_option3.cc (modified) (3 diffs)
• builders/src/G4HadronDElasticPhysics.cc (modified) (3 diffs)
• builders/src/G4HadronElasticPhysics.cc (modified) (6 diffs)
• builders/src/G4HadronElasticPhysicsHP.cc (modified) (4 diffs)
• builders/src/G4HadronHElasticPhysics.cc (modified) (2 diffs)
• builders/src/G4IonBinaryCascadePhysics.cc (modified) (6 diffs)
• builders/src/G4IonQMDPhysics.cc (modified) (3 diffs)
• builders/src/G4NeutronCrossSectionXS.cc (modified) (3 diffs)
• builders/src/G4OpticalPhysics.cc (modified) (9 diffs)
• builders/src/G4OpticalPhysicsMessenger.cc (modified) (5 diffs)
• lists/CVS/Entries (modified) (1 diff)
• lists/CVS/Tag (modified) (1 diff)
• lists/include/CHIPS.icc (modified) (2 diffs)
• lists/include/CVS/Entries (modified) (1 diff)
• lists/include/CVS/Tag (modified) (1 diff)
• lists/include/FTFC.icc (modified) (3 diffs)
• lists/include/FTFP.icc (modified) (3 diffs)
• lists/include/FTFP_BERT.icc (modified) (3 diffs)
• lists/include/FTFP_BERT_EMV.icc (modified) (3 diffs)
• lists/include/FTFP_BERT_EMX.icc (modified) (3 diffs)
• lists/include/FTFP_BERT_TRV.icc (modified) (3 diffs)
• lists/include/FTF_BIC.icc (modified) (2 diffs)
• lists/include/HadronPhysicsShielding.hh (added)
• lists/include/LBE.icc (modified) (7 diffs)
• lists/include/LHEP.icc (modified) (2 diffs)
• lists/include/LHEP_BERT.icc (modified) (3 diffs)
• lists/include/LHEP_BERT_HP.icc (modified) (3 diffs)
• lists/include/LHEP_EMV.icc (modified) (3 diffs)
• lists/include/LHEP_PRECO_HP.icc (modified) (3 diffs)
• lists/include/QGSC.icc (modified) (2 diffs)
• lists/include/QGSC_BERT.icc (modified) (2 diffs)
• lists/include/QGSC_CHIPS.icc (modified) (3 diffs)
• lists/include/QGSC_EMV.icc (modified) (2 diffs)
• lists/include/QGSC_QGSC.icc (modified) (2 diffs)
• lists/include/QGSP.icc (modified) (3 diffs)
• lists/include/QGSP_BERT.icc (modified) (3 diffs)
• lists/include/QGSP_BERT_CHIPS.icc (modified) (3 diffs)
• lists/include/QGSP_BERT_DIF.icc (modified) (3 diffs)
• lists/include/QGSP_BERT_EMV.icc (modified) (5 diffs)
• lists/include/QGSP_BERT_EMX.icc (modified) (3 diffs)
• lists/include/QGSP_BERT_HP.icc (modified) (2 diffs)
• lists/include/QGSP_BERT_NOLEP.icc (modified) (3 diffs)
• lists/include/QGSP_BERT_NQE.icc (modified) (3 diffs)
• lists/include/QGSP_BERT_TRV.icc (modified) (3 diffs)
• lists/include/QGSP_BIC.icc (modified) (2 diffs)
• lists/include/QGSP_BIC_EMY.icc (modified) (2 diffs)
• lists/include/QGSP_BIC_HP.icc (modified) (2 diffs)
• lists/include/QGSP_DIF.icc (modified) (3 diffs)
• lists/include/QGSP_EMV.icc (modified) (3 diffs)
• lists/include/QGSP_EMV_NQE.icc (modified) (3 diffs)
• lists/include/QGSP_FTFP_BERT.icc (modified) (3 diffs)
• lists/include/QGSP_INCL_ABLA.icc (modified) (3 diffs)
• lists/include/QGSP_NQE.icc (modified) (3 diffs)
• lists/include/QGSP_QEL.icc (modified) (3 diffs)
• lists/include/QGS_BIC.icc (modified) (2 diffs)
• lists/include/Shielding.hh (added)
• lists/include/Shielding.icc (added)
• lists/src/CVS/Entries (modified) (1 diff)
• lists/src/CVS/Tag (modified) (1 diff)
• lists/src/G4PhysListFactory.cc (modified) (3 diffs)
• lists/src/HadronPhysicsShielding.cc (added)
• lists/src/QBBC.cc (modified) (4 diffs)

trunk/source/physics_lists/CVS/Entries

@@ -1 +1 @@
 D/builders////
 D/lists////
-/GNUmakefile/1.6/Thu Sep 30 06:13:35 2010//Tgeant4-09-04-beta-01
-/History/1.139/Thu Sep 30 06:13:45 2010//Tgeant4-09-04-beta-01
+/CMakeLists.txt/1.1/Wed Sep 29 18:50:46 2010//Tphys-lists-V09-03-34
+/GNUmakefile/1.6/Thu Sep 30 06:13:35 2010//Tphys-lists-V09-03-34
+/History/1.158/Thu Nov  4 14:51:31 2010//Tphys-lists-V09-03-34

trunk/source/physics_lists/CVS/Tag

@@ -1 @@
-Ngeant4-09-04-beta-01
+Nphys-lists-V09-03-34

trunk/source/physics_lists/History

@@ -1 @@
-q$Id: History,v 1.139 2010/06/19 11:12:58 vnivanch Exp $
+q$Id: History,v 1.158 2010/11/03 16:54:43 gum Exp $
 -------------------------------------------------------------------
 
@@ -16 +16 @@
      ----------------------------------------------------------
 
-19-06-2011, V.Ivantchenko (phys-lists-V09-03-16)
+03-11-2010, P.Gumplinger                (phys-lists-V09-03-34)
+-  correctly implement the new option SetScintillationByParticleType
+   in G4OpticalPhysics
+
+02-11-2010, P.Gumplinger                (phys-lists-V09-03-33)
+-  Make ConstructProcess and ConstructParticle methods public
+   in G4OpticalPhysics
+
+28-10-2010, P.Gumplinger                (phys-lists-V09-03-32)
+-  Add SetScintillationByParticleTypeCmd and associated methods
+
+23-10-2010, P.Gumplinger                (phys-lists-V09-03-31)
+-  Add the G4OpMieHG scattering process to G4OpticalPhysics builder
+
+20-10-2010, L.Pandola                   (phys-lists-V09-03-30)
+- updated physics list LBE to comply with the new EM design 
+  (use Livermore models rather than LowEnergy processes)
+
+20-10-2010, L.Pandola                   (phys-lists-V09-03-30)
+- updated physics list LBE to comply with the new EM design 
+  (use Livermore models rather than LowEnergy processes)
+
+10-10-2010, V.Ivanchenko                (phys-lists-V09-03-29)
+- anti_deuteron, anti_triton, anti_alpha, anti_He3 are included
+  in all builders except DNA
+- G4EmStandardPhysics - WentzelVI model for multiple scattering and 
+             G4CoulombScattering process for muons are added
+- G4EmStandardPhysics_option2 - WentzelVI model for multiple scattering 
+             is added for pi+-, kaon+-, protons, single scattering
+             model is not added, because hadron elastic process 
+             should be used 
+
+08-10-2010, S. Incerti                  (phys-lists-V09-03-28)
+- Added new H excitation model to G4EmDNAPhysics.cc in builders
+
+30-09-2010, G.Folger                    (phys-lists-V09-03-27)
+-  Further Bug fix in G4IonQMDPhysics: use QMD for d, alpha
+
+24-09-2010, V.Ivanchenko                (phys-lists-V09-03-26)
+- G4HadronElasticPhysics - attempt to use exactly the same cross section 
+                           for p and n as in 9.4beta 
+
+23-09-2010, V.Ivanchenko                (phys-lists-V09-03-25)
+- G4HadronElasticPhysics, G4HadronElasticPhysicsHP - added CHIPS cross 
+  sections for p and n on Hydrogen and Helium targets 
+- G4PhysicsListFactory - return NULL if the name is wrong
+
+09-09-2010, S.Incerti                   (phys-lists-V09-03-24)
+- Added new e- G4DNA processes to G4EmDNAPhysics.cc in builders
+
+30-08-2010, G.Folger                    (phys-lists-V09-03-23)
+-  Bug fix in G4IonQMDPhysics: wrong energy limit for overlap with BIC
+
+25-08-2010, G.Folger                    (phys-lists-V09-03-22)
+-  Correct obsolete ctor of G4HadronElasticPhysics in header 
+
+24-08-2010, V.Ivanchenko (phys-lists-V09-03-21)
+-  don't use
+
+17-08-2010, V.Ivanchenko (phys-lists-V09-03-20)
+- Obsolete G4ParticleWithCut.hh header removed from many .icc files
+  by H.Kurashige 
+
+30-07-2010, V.Ivanchenko (phys-lists-V09-03-19)
+- In all EM builders use G4ionIonisation for He3 and He4 ions
+
+29-07-2010, V.Ivanchenko (phys-lists-V09-03-18)
+- G4IonBinaryCascadePhysics - added G4IonProtonCrossSection
+
+29-07-2010, V.Ivanchenko (phys-lists-V09-03-17)
+- G4DataQuestionaire - for optical physics G4REALSURFACEDATA is checked
+  instead of G4LEDATA (bug report #1125), the check is disabled, because
+  not clear if this dataset is mandatory or not; check on new
+  G4NEUTRONXSDATA is added
+- QBBC - added check on G4NEUTRONXSDATA, use G4HadronElasticPhysics
+- G4NeutronCrossSectionXS - added check on G4NEUTRONXSDATA
+- G4HadronElasticPhysics renamed to G4HadronElasticPhysics93
+- G4HadronHElasticPhysics is copied to G4HadronElasticPhysics
+- QGSP_BERT_EMV use G4HadronElasticPhysics instead of G4HadronHElasticPhysics
+- G4HadronHElasticPhysics is marked as obsolete
+
+19-06-2010, V.Ivanchenko (phys-lists-V09-03-16)
 - G4FTFPNeutronBuilder, G4FTFPPiKBuilder, G4FTFPProtonBuilder,
   G4QGSPNeutronBuilder, G4QGSPPiKBuilder, G4QGSPProtonBuilder 
@@ -23 +104 @@
   HadronPhysicsQGSP_FTFP_BERT - added deletion of neutron builder 
 
-11-06-2011, G.Folger                    (phys-lists-V09-03-15)
+11-06-2010, G.Folger                    (phys-lists-V09-03-15)
 - fix compilation error in G4QPhotoNuclearPhysics
 
-11-06-2011, G.Folger                    (phys-lists-V09-03-14)
+11-06-2010, G.Folger                    (phys-lists-V09-03-14)
 - tag changes of Vladimir & Mikhail
 
-11-06-2011, V.Ivantchenko
+11-06-2010, V.Ivanchenko
 - G4EmStandardPhysics_option2 - RangeFactor for e+- is set to 0.04
 
@@ -68 +149 @@
 bug fix for the virtual distructor in G4QElasticPhysics & G4QIonPhysics
 
-03-June, V.Ivantchenko, G.Folger        (phys-lists-V09-03-07)
+03-June, V.Ivanchenko, G.Folger        (phys-lists-V09-03-07)
 - Introduce new ctor for all builders with signature
     AbcPhysics::AbcPhyics(G4int ver=value);
@@ -696 +777 @@
   in order to have backward compatibility with the previous release
 
-02.12.2005, G.Folger & V.Ivantchenko - phys-lists-V07-01-01
+02.12.2005, G.Folger & V.Ivanchenko - phys-lists-V07-01-01
 - Includes tags: emphys-V07-01-01 and hadr-lists-V07-01-02.
 - Implemented migration of physics lists to non static particles scheme.

trunk/source/physics_lists/builders/CVS/Entries

@@ -1 +1 @@
 D/include////
 D/src////
-/GNUmakefile/1.11/Thu Sep 30 06:13:45 2010//Tgeant4-09-04-beta-01
+/CMakeLists.txt/1.1/Wed Sep 29 18:50:54 2010//Tphys-lists-V09-03-34
+/GNUmakefile/1.11/Thu Sep 30 06:13:45 2010//Tphys-lists-V09-03-34
+/sources.cmake/1.1/Wed Sep 29 18:51:02 2010//Tphys-lists-V09-03-34

trunk/source/physics_lists/builders/CVS/Tag

@@ -1 @@
-Ngeant4-09-04-beta-01
+Nphys-lists-V09-03-34

trunk/source/physics_lists/builders/include/CVS/Entries

@@ -1 @@
-/CompileTimeConstraints.hh/1.1/Thu Sep 30 06:13:45 2010//Tgeant4-09-04-beta-01
-/G4BertiniNeutronBuilder.hh/1.2/Thu Sep 30 06:13:45 2010//Tgeant4-09-04-beta-01
-/G4BertiniPiKBuilder.hh/1.2/Thu Sep 30 06:13:45 2010//Tgeant4-09-04-beta-01
-/G4BertiniProtonBuilder.hh/1.2/Thu Sep 30 06:13:53 2010//Tgeant4-09-04-beta-01
-/G4BinaryNeutronBuilder.hh/1.2/Thu Sep 30 06:13:53 2010//Tgeant4-09-04-beta-01
-/G4BinaryPiKBuilder.hh/1.2/Thu Sep 30 06:13:53 2010//Tgeant4-09-04-beta-01
-/G4BinaryProtonBuilder.hh/1.2/Thu Sep 30 06:13:53 2010//Tgeant4-09-04-beta-01
-/G4ChargeExchangePhysics.hh/1.2/Thu Sep 30 06:13:53 2010//Tgeant4-09-04-beta-01
-/G4DataQuestionaire.hh/1.6/Thu Sep 30 06:13:53 2010//Tgeant4-09-04-beta-01
-/G4DecayPhysics.hh/1.4/Thu Sep 30 06:13:53 2010//Tgeant4-09-04-beta-01
-/G4ElectroNuclearBuilder.hh/1.1/Thu Sep 30 06:13:53 2010//Tgeant4-09-04-beta-01
-/G4EmDNAPhysics.hh/1.2/Thu Sep 30 06:13:53 2010//Tgeant4-09-04-beta-01
-/G4EmExtraPhysics.hh/1.3/Thu Sep 30 06:14:05 2010//Tgeant4-09-04-beta-01
-/G4EmLivermorePhysics.hh/1.2/Thu Sep 30 06:14:05 2010//Tgeant4-09-04-beta-01
-/G4EmLivermorePolarizedPhysics.hh/1.2/Thu Sep 30 06:14:05 2010//Tgeant4-09-04-beta-01
-/G4EmMessenger.hh/1.1/Thu Sep 30 06:14:05 2010//Tgeant4-09-04-beta-01
-/G4EmPenelopePhysics.hh/1.2/Thu Sep 30 06:14:05 2010//Tgeant4-09-04-beta-01
-/G4EmStandardPhysics.hh/1.5/Thu Sep 30 06:14:05 2010//Tgeant4-09-04-beta-01
-/G4EmStandardPhysics_option1.hh/1.2/Thu Sep 30 06:14:05 2010//Tgeant4-09-04-beta-01
-/G4EmStandardPhysics_option2.hh/1.2/Thu Sep 30 06:14:05 2010//Tgeant4-09-04-beta-01
-/G4EmStandardPhysics_option3.hh/1.2/Thu Sep 30 06:14:05 2010//Tgeant4-09-04-beta-01
-/G4FTFBinaryNeutronBuilder.hh/1.3/Thu Sep 30 06:14:05 2010//Tgeant4-09-04-beta-01
-/G4FTFBinaryPiKBuilder.hh/1.2/Thu Sep 30 06:14:10 2010//Tgeant4-09-04-beta-01
-/G4FTFBinaryProtonBuilder.hh/1.2/Thu Sep 30 06:14:10 2010//Tgeant4-09-04-beta-01
-/G4FTFBuilder.hh/1.2/Thu Sep 30 06:14:10 2010//Tgeant4-09-04-beta-01
-/G4FTFCNeutronBuilder.hh/1.3/Thu Sep 30 06:14:10 2010//Tgeant4-09-04-beta-01
-/G4FTFCPiKBuilder.hh/1.3/Thu Sep 30 06:14:10 2010//Tgeant4-09-04-beta-01
-/G4FTFCProtonBuilder.hh/1.4/Thu Sep 30 06:14:10 2010//Tgeant4-09-04-beta-01
-/G4FTFPNeutronBuilder.hh/1.5/Thu Sep 30 06:14:10 2010//Tgeant4-09-04-beta-01
-/G4FTFPPiKBuilder.hh/1.5/Thu Sep 30 06:14:10 2010//Tgeant4-09-04-beta-01
-/G4FTFPProtonBuilder.hh/1.5/Thu Sep 30 06:14:10 2010//Tgeant4-09-04-beta-01
-/G4HadronDElasticPhysics.hh/1.2/Thu Sep 30 06:14:15 2010//Tgeant4-09-04-beta-01
-/G4HadronElasticPhysics.hh/1.6/Thu Sep 30 06:14:15 2010//Tgeant4-09-04-beta-01
-/G4HadronElasticPhysicsHP.hh/1.1/Thu Sep 30 06:14:15 2010//Tgeant4-09-04-beta-01
-/G4HadronElasticPhysicsLHEP.hh/1.1/Thu Sep 30 06:14:15 2010//Tgeant4-09-04-beta-01
-/G4HadronElasticPhysicsXS.hh/1.1/Thu Sep 30 06:14:15 2010//Tgeant4-09-04-beta-01
-/G4HadronHElasticPhysics.hh/1.5/Thu Sep 30 06:14:15 2010//Tgeant4-09-04-beta-01
-/G4HadronQElasticPhysics.hh/1.2/Thu Sep 30 06:14:15 2010//Tgeant4-09-04-beta-01
-/G4InclAblaNeutronBuilder.hh/1.1/Thu Sep 30 06:14:15 2010//Tgeant4-09-04-beta-01
-/G4InclAblaPiKBuilder.hh/1.2/Thu Sep 30 06:14:15 2010//Tgeant4-09-04-beta-01
-/G4InclAblaProtonBuilder.hh/1.1/Thu Sep 30 06:14:35 2010//Tgeant4-09-04-beta-01
-/G4IonBinaryCascadePhysics.hh/1.2/Thu Sep 30 06:14:35 2010//Tgeant4-09-04-beta-01
-/G4IonInclAblaPhysics.hh/1.2/Thu Sep 30 06:14:35 2010//Tgeant4-09-04-beta-01
-/G4IonPhysics.hh/1.2/Thu Sep 30 06:14:35 2010//Tgeant4-09-04-beta-01
-/G4IonQMDPhysics.hh/1.2/Thu Sep 30 06:14:35 2010//Tgeant4-09-04-beta-01
-/G4LEPNeutronBuilder.hh/1.1/Thu Sep 30 06:14:35 2010//Tgeant4-09-04-beta-01
-/G4LEPPiKBuilder.hh/1.1/Thu Sep 30 06:14:35 2010//Tgeant4-09-04-beta-01
-/G4LEPProtonBuilder.hh/1.1/Thu Sep 30 06:14:35 2010//Tgeant4-09-04-beta-01
-/G4LHEPNeutronBuilder.hh/1.1/Thu Sep 30 06:14:35 2010//Tgeant4-09-04-beta-01
-/G4LHEPPiKBuilder.hh/1.1/Thu Sep 30 06:14:43 2010//Tgeant4-09-04-beta-01
-/G4LHEPProtonBuilder.hh/1.1/Thu Sep 30 06:14:43 2010//Tgeant4-09-04-beta-01
-/G4LHEPStoppingPhysics.hh/1.2/Thu Sep 30 06:14:43 2010//Tgeant4-09-04-beta-01
-/G4MiscCHIPSBuilder.hh/1.2/Thu Sep 30 06:14:43 2010//Tgeant4-09-04-beta-01
-/G4MiscLHEPBuilder.hh/1.2/Thu Sep 30 06:14:43 2010//Tgeant4-09-04-beta-01
-/G4MiscQGSCBuilder.hh/1.2/Thu Sep 30 06:14:43 2010//Tgeant4-09-04-beta-01
-/G4NeutronBuilder.hh/1.1/Thu Sep 30 06:14:43 2010//Tgeant4-09-04-beta-01
-/G4NeutronCrossSectionXS.hh/1.1/Thu Sep 30 06:14:43 2010//Tgeant4-09-04-beta-01
-/G4NeutronHPBuilder.hh/1.2/Thu Sep 30 06:14:43 2010//Tgeant4-09-04-beta-01
-/G4NeutronTrackingCut.hh/1.3/Thu Sep 30 06:14:55 2010//Tgeant4-09-04-beta-01
-/G4OpticalPhysics.hh/1.2/Thu Sep 30 06:14:55 2010//Tgeant4-09-04-beta-01
-/G4OpticalPhysicsMessenger.hh/1.1/Thu Sep 30 06:14:55 2010//Tgeant4-09-04-beta-01
-/G4PiKBuilder.hh/1.1/Thu Sep 30 06:14:55 2010//Tgeant4-09-04-beta-01
-/G4PrecoNeutronBuilder.hh/1.2/Thu Sep 30 06:14:55 2010//Tgeant4-09-04-beta-01
-/G4PrecoProtonBuilder.hh/1.2/Thu Sep 30 06:14:55 2010//Tgeant4-09-04-beta-01
-/G4ProtonBuilder.hh/1.1/Thu Sep 30 06:14:55 2010//Tgeant4-09-04-beta-01
-/G4QAtomicPhysics.hh/1.2/Thu Sep 30 06:14:55 2010//Tgeant4-09-04-beta-01
-/G4QCaptureAtRestPhysics.hh/1.2/Thu Sep 30 06:14:55 2010//Tgeant4-09-04-beta-01
-/G4QElasticPhysics.hh/1.2/Thu Sep 30 06:14:55 2010//Tgeant4-09-04-beta-01
-/G4QEmExtraPhysics.hh/1.2/Thu Sep 30 06:14:55 2010//Tgeant4-09-04-beta-01
-/G4QGSBinaryNeutronBuilder.hh/1.2/Thu Sep 30 06:14:55 2010//Tgeant4-09-04-beta-01
-/G4QGSBinaryPiKBuilder.hh/1.2/Thu Sep 30 06:14:55 2010//Tgeant4-09-04-beta-01
-/G4QGSBinaryProtonBuilder.hh/1.2/Thu Sep 30 06:14:55 2010//Tgeant4-09-04-beta-01
-/G4QGSBuilder.hh/1.3/Thu Sep 30 06:14:55 2010//Tgeant4-09-04-beta-01
-/G4QGSCEflowNeutronBuilder.hh/1.3/Thu Sep 30 06:14:55 2010//Tgeant4-09-04-beta-01
-/G4QGSCEflowPiKBuilder.hh/1.3/Thu Sep 30 06:14:55 2010//Tgeant4-09-04-beta-01
-/G4QGSCEflowProtonBuilder.hh/1.3/Thu Sep 30 06:14:55 2010//Tgeant4-09-04-beta-01
-/G4QGSCNeutronBuilder.hh/1.4/Thu Sep 30 06:14:56 2010//Tgeant4-09-04-beta-01
-/G4QGSCPiKBuilder.hh/1.4/Thu Sep 30 06:14:56 2010//Tgeant4-09-04-beta-01
-/G4QGSCProtonBuilder.hh/1.4/Thu Sep 30 06:14:56 2010//Tgeant4-09-04-beta-01
-/G4QGSC_CHIPSNeutronBuilder.hh/1.2/Thu Sep 30 06:14:56 2010//Tgeant4-09-04-beta-01
-/G4QGSC_CHIPSPiKBuilder.hh/1.1/Thu Sep 30 06:14:56 2010//Tgeant4-09-04-beta-01
-/G4QGSC_CHIPSProtonBuilder.hh/1.1/Thu Sep 30 06:14:56 2010//Tgeant4-09-04-beta-01
-/G4QGSC_QGSCNeutronBuilder.hh/1.1/Thu Sep 30 06:14:56 2010//Tgeant4-09-04-beta-01
-/G4QGSC_QGSCPiKBuilder.hh/1.1/Thu Sep 30 06:14:56 2010//Tgeant4-09-04-beta-01
-/G4QGSC_QGSCProtonBuilder.hh/1.1/Thu Sep 30 06:14:56 2010//Tgeant4-09-04-beta-01
-/G4QGSPNeutronBuilder.hh/1.5/Thu Sep 30 06:14:56 2010//Tgeant4-09-04-beta-01
-/G4QGSPPiKBuilder.hh/1.5/Thu Sep 30 06:14:56 2010//Tgeant4-09-04-beta-01
-/G4QGSPProtonBuilder.hh/1.6/Thu Sep 30 06:14:56 2010//Tgeant4-09-04-beta-01
-/G4QInelasticCHIPSBuilder.hh/1.2/Thu Sep 30 06:14:56 2010//Tgeant4-09-04-beta-01
-/G4QIonPhysics.hh/1.2/Thu Sep 30 06:14:56 2010//Tgeant4-09-04-beta-01
-/G4QMessenger.hh/1.1/Thu Sep 30 06:14:56 2010//Tgeant4-09-04-beta-01
-/G4QNeutrinoPhysics.hh/1.3/Thu Sep 30 06:14:56 2010//Tgeant4-09-04-beta-01
-/G4QNeutronBuilder.hh/1.4/Thu Sep 30 06:14:56 2010//Tgeant4-09-04-beta-01
-/G4QPhotoNuclearPhysics.hh/1.3/Thu Sep 30 06:14:56 2010//Tgeant4-09-04-beta-01
-/G4QProtonBuilder.hh/1.3/Thu Sep 30 06:14:56 2010//Tgeant4-09-04-beta-01
-/G4QStoppingPhysics.hh/1.6/Thu Sep 30 06:14:56 2010//Tgeant4-09-04-beta-01
-/G4RadioactiveDecayPhysics.hh/1.2/Thu Sep 30 06:14:56 2010//Tgeant4-09-04-beta-01
-/G4StoppingHadronBuilder.hh/1.1/Thu Sep 30 06:14:56 2010//Tgeant4-09-04-beta-01
-/G4VHadronModelBuilder.hh/1.1/Thu Sep 30 06:14:56 2010//Tgeant4-09-04-beta-01
-/G4VNeutronBuilder.hh/1.2/Thu Sep 30 06:14:56 2010//Tgeant4-09-04-beta-01
-/G4VPiKBuilder.hh/1.2/Thu Sep 30 06:14:56 2010//Tgeant4-09-04-beta-01
-/G4VProtonBuilder.hh/1.2/Thu Sep 30 06:14:56 2010//Tgeant4-09-04-beta-01
-/G4WarnPLStatus.hh/1.3/Thu Sep 30 06:14:56 2010//Tgeant4-09-04-beta-01
-/TheoModelFactory.hh/1.1/Thu Sep 30 06:14:56 2010//Tgeant4-09-04-beta-01
+/CompileTimeConstraints.hh/1.1/Thu Sep 30 06:13:45 2010//Tphys-lists-V09-03-34
+/G4BertiniNeutronBuilder.hh/1.2/Thu Sep 30 06:13:45 2010//Tphys-lists-V09-03-34
+/G4BertiniPiKBuilder.hh/1.2/Thu Sep 30 06:13:45 2010//Tphys-lists-V09-03-34
+/G4BertiniProtonBuilder.hh/1.2/Thu Sep 30 06:13:53 2010//Tphys-lists-V09-03-34
+/G4BinaryNeutronBuilder.hh/1.2/Thu Sep 30 06:13:53 2010//Tphys-lists-V09-03-34
+/G4BinaryPiKBuilder.hh/1.2/Thu Sep 30 06:13:53 2010//Tphys-lists-V09-03-34
+/G4BinaryProtonBuilder.hh/1.2/Thu Sep 30 06:13:53 2010//Tphys-lists-V09-03-34
+/G4ChargeExchangePhysics.hh/1.2/Thu Sep 30 06:13:53 2010//Tphys-lists-V09-03-34
+/G4DataQuestionaire.hh/1.7/Thu Nov  4 14:51:31 2010//Tphys-lists-V09-03-34
+/G4DecayPhysics.hh/1.4/Thu Sep 30 06:13:53 2010//Tphys-lists-V09-03-34
+/G4ElectroNuclearBuilder.hh/1.1/Thu Sep 30 06:13:53 2010//Tphys-lists-V09-03-34
+/G4EmDNAPhysics.hh/1.2/Thu Sep 30 06:13:53 2010//Tphys-lists-V09-03-34
+/G4EmExtraPhysics.hh/1.3/Thu Sep 30 06:14:05 2010//Tphys-lists-V09-03-34
+/G4EmLivermorePhysics.hh/1.2/Thu Sep 30 06:14:05 2010//Tphys-lists-V09-03-34
+/G4EmLivermorePolarizedPhysics.hh/1.2/Thu Sep 30 06:14:05 2010//Tphys-lists-V09-03-34
+/G4EmMessenger.hh/1.1/Thu Sep 30 06:14:05 2010//Tphys-lists-V09-03-34
+/G4EmPenelopePhysics.hh/1.2/Thu Sep 30 06:14:05 2010//Tphys-lists-V09-03-34
+/G4EmStandardPhysics.hh/1.5/Thu Sep 30 06:14:05 2010//Tphys-lists-V09-03-34
+/G4EmStandardPhysics_option1.hh/1.2/Thu Sep 30 06:14:05 2010//Tphys-lists-V09-03-34
+/G4EmStandardPhysics_option2.hh/1.2/Thu Sep 30 06:14:05 2010//Tphys-lists-V09-03-34
+/G4EmStandardPhysics_option3.hh/1.2/Thu Sep 30 06:14:05 2010//Tphys-lists-V09-03-34
+/G4FTFBinaryNeutronBuilder.hh/1.3/Thu Sep 30 06:14:05 2010//Tphys-lists-V09-03-34
+/G4FTFBinaryPiKBuilder.hh/1.2/Thu Sep 30 06:14:10 2010//Tphys-lists-V09-03-34
+/G4FTFBinaryProtonBuilder.hh/1.2/Thu Sep 30 06:14:10 2010//Tphys-lists-V09-03-34
+/G4FTFBuilder.hh/1.2/Thu Sep 30 06:14:10 2010//Tphys-lists-V09-03-34
+/G4FTFCNeutronBuilder.hh/1.3/Thu Sep 30 06:14:10 2010//Tphys-lists-V09-03-34
+/G4FTFCPiKBuilder.hh/1.3/Thu Sep 30 06:14:10 2010//Tphys-lists-V09-03-34
+/G4FTFCProtonBuilder.hh/1.4/Thu Sep 30 06:14:10 2010//Tphys-lists-V09-03-34
+/G4FTFPNeutronBuilder.hh/1.5/Thu Sep 30 06:14:10 2010//Tphys-lists-V09-03-34
+/G4FTFPPiKBuilder.hh/1.5/Thu Sep 30 06:14:10 2010//Tphys-lists-V09-03-34
+/G4FTFPProtonBuilder.hh/1.5/Thu Sep 30 06:14:10 2010//Tphys-lists-V09-03-34
+/G4HadronDElasticPhysics.hh/1.2/Thu Sep 30 06:14:15 2010//Tphys-lists-V09-03-34
+/G4HadronElasticPhysics93.hh/1.1/Thu Jul 29 10:52:13 2010//Tphys-lists-V09-03-34
+/G4HadronElasticPhysicsHP.hh/1.1/Thu Sep 30 06:14:15 2010//Tphys-lists-V09-03-34
+/G4HadronElasticPhysicsLHEP.hh/1.1/Thu Sep 30 06:14:15 2010//Tphys-lists-V09-03-34
+/G4HadronElasticPhysicsXS.hh/1.1/Thu Sep 30 06:14:15 2010//Tphys-lists-V09-03-34
+/G4HadronHElasticPhysics.hh/1.5/Thu Sep 30 06:14:15 2010//Tphys-lists-V09-03-34
+/G4HadronQElasticPhysics.hh/1.2/Thu Sep 30 06:14:15 2010//Tphys-lists-V09-03-34
+/G4InclAblaNeutronBuilder.hh/1.1/Thu Sep 30 06:14:15 2010//Tphys-lists-V09-03-34
+/G4InclAblaPiKBuilder.hh/1.2/Thu Sep 30 06:14:15 2010//Tphys-lists-V09-03-34
+/G4InclAblaProtonBuilder.hh/1.1/Thu Sep 30 06:14:35 2010//Tphys-lists-V09-03-34
+/G4IonInclAblaPhysics.hh/1.2/Thu Sep 30 06:14:35 2010//Tphys-lists-V09-03-34
+/G4IonPhysics.hh/1.2/Thu Sep 30 06:14:35 2010//Tphys-lists-V09-03-34
+/G4IonQMDPhysics.hh/1.2/Thu Sep 30 06:14:35 2010//Tphys-lists-V09-03-34
+/G4LEPNeutronBuilder.hh/1.1/Thu Sep 30 06:14:35 2010//Tphys-lists-V09-03-34
+/G4LEPPiKBuilder.hh/1.1/Thu Sep 30 06:14:35 2010//Tphys-lists-V09-03-34
+/G4LEPProtonBuilder.hh/1.1/Thu Sep 30 06:14:35 2010//Tphys-lists-V09-03-34
+/G4LHEPNeutronBuilder.hh/1.1/Thu Sep 30 06:14:35 2010//Tphys-lists-V09-03-34
+/G4LHEPPiKBuilder.hh/1.1/Thu Sep 30 06:14:43 2010//Tphys-lists-V09-03-34
+/G4LHEPProtonBuilder.hh/1.1/Thu Sep 30 06:14:43 2010//Tphys-lists-V09-03-34
+/G4LHEPStoppingPhysics.hh/1.2/Thu Sep 30 06:14:43 2010//Tphys-lists-V09-03-34
+/G4MiscCHIPSBuilder.hh/1.2/Thu Sep 30 06:14:43 2010//Tphys-lists-V09-03-34
+/G4MiscLHEPBuilder.hh/1.2/Thu Sep 30 06:14:43 2010//Tphys-lists-V09-03-34
+/G4MiscQGSCBuilder.hh/1.2/Thu Sep 30 06:14:43 2010//Tphys-lists-V09-03-34
+/G4NeutronBuilder.hh/1.1/Thu Sep 30 06:14:43 2010//Tphys-lists-V09-03-34
+/G4NeutronCrossSectionXS.hh/1.1/Thu Sep 30 06:14:43 2010//Tphys-lists-V09-03-34
+/G4NeutronHPBuilder.hh/1.2/Thu Sep 30 06:14:43 2010//Tphys-lists-V09-03-34
+/G4NeutronTrackingCut.hh/1.3/Thu Sep 30 06:14:55 2010//Tphys-lists-V09-03-34
+/G4OpticalPhysics.hh/1.6/Thu Nov  4 14:51:32 2010//Tphys-lists-V09-03-34
+/G4OpticalPhysicsMessenger.hh/1.2/Thu Nov  4 14:51:32 2010//Tphys-lists-V09-03-34
+/G4PiKBuilder.hh/1.1/Thu Sep 30 06:14:55 2010//Tphys-lists-V09-03-34
+/G4PrecoNeutronBuilder.hh/1.2/Thu Sep 30 06:14:55 2010//Tphys-lists-V09-03-34
+/G4PrecoProtonBuilder.hh/1.2/Thu Sep 30 06:14:55 2010//Tphys-lists-V09-03-34
+/G4ProtonBuilder.hh/1.1/Thu Sep 30 06:14:55 2010//Tphys-lists-V09-03-34
+/G4QAtomicPhysics.hh/1.2/Thu Sep 30 06:14:55 2010//Tphys-lists-V09-03-34
+/G4QCaptureAtRestPhysics.hh/1.2/Thu Sep 30 06:14:55 2010//Tphys-lists-V09-03-34
+/G4QElasticPhysics.hh/1.2/Thu Sep 30 06:14:55 2010//Tphys-lists-V09-03-34
+/G4QEmExtraPhysics.hh/1.2/Thu Sep 30 06:14:55 2010//Tphys-lists-V09-03-34
+/G4QGSBinaryNeutronBuilder.hh/1.2/Thu Sep 30 06:14:55 2010//Tphys-lists-V09-03-34
+/G4QGSBinaryPiKBuilder.hh/1.2/Thu Sep 30 06:14:55 2010//Tphys-lists-V09-03-34
+/G4QGSBinaryProtonBuilder.hh/1.2/Thu Sep 30 06:14:55 2010//Tphys-lists-V09-03-34
+/G4QGSBuilder.hh/1.3/Thu Sep 30 06:14:55 2010//Tphys-lists-V09-03-34
+/G4QGSCEflowNeutronBuilder.hh/1.3/Thu Sep 30 06:14:55 2010//Tphys-lists-V09-03-34
+/G4QGSCEflowPiKBuilder.hh/1.3/Thu Sep 30 06:14:55 2010//Tphys-lists-V09-03-34
+/G4QGSCEflowProtonBuilder.hh/1.3/Thu Sep 30 06:14:55 2010//Tphys-lists-V09-03-34
+/G4QGSCNeutronBuilder.hh/1.4/Thu Sep 30 06:14:56 2010//Tphys-lists-V09-03-34
+/G4QGSCPiKBuilder.hh/1.4/Thu Sep 30 06:14:56 2010//Tphys-lists-V09-03-34
+/G4QGSCProtonBuilder.hh/1.4/Thu Sep 30 06:14:56 2010//Tphys-lists-V09-03-34
+/G4QGSC_CHIPSNeutronBuilder.hh/1.2/Thu Sep 30 06:14:56 2010//Tphys-lists-V09-03-34
+/G4QGSC_CHIPSPiKBuilder.hh/1.1/Thu Sep 30 06:14:56 2010//Tphys-lists-V09-03-34
+/G4QGSC_CHIPSProtonBuilder.hh/1.1/Thu Sep 30 06:14:56 2010//Tphys-lists-V09-03-34
+/G4QGSC_QGSCNeutronBuilder.hh/1.1/Thu Sep 30 06:14:56 2010//Tphys-lists-V09-03-34
+/G4QGSC_QGSCPiKBuilder.hh/1.1/Thu Sep 30 06:14:56 2010//Tphys-lists-V09-03-34
+/G4QGSC_QGSCProtonBuilder.hh/1.1/Thu Sep 30 06:14:56 2010//Tphys-lists-V09-03-34
+/G4QGSPNeutronBuilder.hh/1.5/Thu Sep 30 06:14:56 2010//Tphys-lists-V09-03-34
+/G4QGSPPiKBuilder.hh/1.5/Thu Sep 30 06:14:56 2010//Tphys-lists-V09-03-34
+/G4QGSPProtonBuilder.hh/1.6/Thu Sep 30 06:14:56 2010//Tphys-lists-V09-03-34
+/G4QInelasticCHIPSBuilder.hh/1.2/Thu Sep 30 06:14:56 2010//Tphys-lists-V09-03-34
+/G4QIonPhysics.hh/1.2/Thu Sep 30 06:14:56 2010//Tphys-lists-V09-03-34
+/G4QMessenger.hh/1.1/Thu Sep 30 06:14:56 2010//Tphys-lists-V09-03-34
+/G4QNeutrinoPhysics.hh/1.3/Thu Sep 30 06:14:56 2010//Tphys-lists-V09-03-34
+/G4QNeutronBuilder.hh/1.4/Thu Sep 30 06:14:56 2010//Tphys-lists-V09-03-34
+/G4QPhotoNuclearPhysics.hh/1.3/Thu Sep 30 06:14:56 2010//Tphys-lists-V09-03-34
+/G4QProtonBuilder.hh/1.3/Thu Sep 30 06:14:56 2010//Tphys-lists-V09-03-34
+/G4QStoppingPhysics.hh/1.6/Thu Sep 30 06:14:56 2010//Tphys-lists-V09-03-34
+/G4RadioactiveDecayPhysics.hh/1.2/Thu Sep 30 06:14:56 2010//Tphys-lists-V09-03-34
+/G4StoppingHadronBuilder.hh/1.1/Thu Sep 30 06:14:56 2010//Tphys-lists-V09-03-34
+/G4VHadronModelBuilder.hh/1.1/Thu Sep 30 06:14:56 2010//Tphys-lists-V09-03-34
+/G4VNeutronBuilder.hh/1.2/Thu Sep 30 06:14:56 2010//Tphys-lists-V09-03-34
+/G4VPiKBuilder.hh/1.2/Thu Sep 30 06:14:56 2010//Tphys-lists-V09-03-34
+/G4VProtonBuilder.hh/1.2/Thu Sep 30 06:14:56 2010//Tphys-lists-V09-03-34
+/G4WarnPLStatus.hh/1.3/Thu Sep 30 06:14:56 2010//Tphys-lists-V09-03-34
+/TheoModelFactory.hh/1.1/Thu Sep 30 06:14:56 2010//Tphys-lists-V09-03-34
+/G4HadronElasticPhysics.hh/1.9/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/G4IonBinaryCascadePhysics.hh/1.3/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
 D

trunk/source/physics_lists/builders/include/CVS/Tag

@@ -1 @@
-Ngeant4-09-04-beta-01
+Nphys-lists-V09-03-34

trunk/source/physics_lists/builders/include/G4DataQuestionaire.hh

@@ -33 +33 @@
 #include "G4VPiKBuilder.hh"
 
-enum G4DataType {no, photon, neutron, radioactive, lowenergy, optical};
+enum G4DataType {no, photon, neutron, radioactive, lowenergy, optical, neutronxs};
 class G4DataQuestionaire
 {
   public: 
-    G4DataQuestionaire(G4DataType t1=no, G4DataType t2=no, G4DataType t3=no, G4DataType t4=no, G4DataType t5=no) 
+    G4DataQuestionaire(G4DataType t1=no, G4DataType t2=no, G4DataType t3=no, 
+                       G4DataType t4=no, G4DataType t5=no, G4DataType t6=no) 
     {
       G4cout << G4endl;
@@ -43 +44 @@
       //      G4cout <<G4endl<<G4endl;
       // G4cout << "##### the input "<<t1<<" "<<t2<<" "<<t3<<" "<<t4<<G4endl;
-      for(G4int i=0; i<5; i++)
+      for(G4int i=0; i<6; ++i)
       {
         G4DataType t(no);
@@ -51 +52 @@
         if(i==3) t=t4;
         if(i==4) t=t5;
+        if(i==5) t=t6;
         switch(t)
         {
@@ -98 +100 @@
             break;
           case optical:
-            if(!getenv("G4LEDATA") )
+            /*
+            if(!getenv("G4REALSURFACEDATA") )
             {
               G4cout << "Data describing surface propeties for optical photons are needed."<<G4endl;
               G4cout << "Please set the environmental variable G4REALSURFACEDATA"<<G4endl;
               G4cout << "to point to your RealSurface directory."<<G4endl;
+              G4cout << "Data are available from the Geant4 download page."<<G4endl;
+              G4Exception("G4DataQuestionaire", "007", FatalException,
+                          "Fatal error: Missing mandatory data for this simulation engine");
+            }
+            */
+            break;
+          case neutronxs:
+            if(!getenv("G4NEUTRONXSDATA") )
+            {
+              G4cout << "G4NEUTRONXS are needed."<<G4endl;
+              G4cout << "Please set the environmental variable G4NEUTRONXSDATA"<<G4endl;
+              G4cout << "to point to your G4NEUTRONXS directory."<<G4endl;
               G4cout << "Data are available from the Geant4 download page."<<G4endl;
               G4Exception("G4DataQuestionaire", "007", FatalException,

trunk/source/physics_lists/builders/include/G4HadronElasticPhysics.hh

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4HadronElasticPhysics.hh,v 1.6 2010/06/03 16:28:39 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4HadronElasticPhysics.hh,v 1.9 2010/08/25 16:49:51 gunter Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -31 +31 @@
 // ClassName:   G4HadronElasticPhysics
 //
-// Author: 11 April 2006 V. Ivanchenko
+// Author: 23 November 2006 V. Ivanchenko
 //
 // Modified:
-// 05.07.2006 V.Ivanchenko fix problem of initialisation of HP
-// 23.11.2006 V.Ivanchenko remove variables
+// 29.07.2010 V.Ivanchenko rename this class from G4HadronHElasticPhysics to
+//                         G4HadronElasticPhysics, old version of the class
+//                         is renamed to G4HadronElasticPhysics93
 //
 //----------------------------------------------------------------------------
@@ -45 +46 @@
 #include "globals.hh"
 #include "G4VPhysicsConstructor.hh"
-#include "G4UHadronElasticProcess.hh"
-#include "G4HadronElastic.hh"
-#include "G4NeutronHPElastic.hh"
-#include "G4NeutronHPElasticData.hh"
 
 class G4HadronElasticPhysics : public G4VPhysicsConstructor
 {
 public: 
-   G4HadronElasticPhysics(G4int ver = 1);
-   G4HadronElasticPhysics(const G4String& name,
-                         G4int ver = 0, G4bool hp = false,
-                         G4bool glauber = false);
+
+  G4HadronElasticPhysics(G4int ver = 0); 
+
+  // obsolete
+  G4HadronElasticPhysics(const G4String& name , 
+                         G4int ver = 0, G4bool hp = false, 
+                         const G4String& type="");
+
   virtual ~G4HadronElasticPhysics();
 
-public: 
   // This method will be invoked in the Construct() method. 
   // each particle type will be instantiated
@@ -71 +71 @@
 private:
 
-  G4HadronicInteraction* model;
-  G4HadronicInteraction* neutronModel;
-  G4HadronicInteraction* neutronHPModel;
-
-  G4String mname;
-
   G4int    verbose;
-  G4bool   hpFlag;
-  G4bool   glFlag;
   G4bool   wasActivated;
 };

trunk/source/physics_lists/builders/include/G4IonBinaryCascadePhysics.hh

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4IonBinaryCascadePhysics.hh,v 1.2 2010/06/03 15:03:53 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4IonBinaryCascadePhysics.hh,v 1.3 2010/07/30 14:20:08 vnivanch Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -55 +55 @@
 class G4TripathiCrossSection;
 class G4IonsShenCrossSection;
-
+class G4IonProtonCrossSection;
 
 class G4IonBinaryCascadePhysics : public G4VPhysicsConstructor
@@ -86 +86 @@
   G4TripathiLightCrossSection* fTripathiLight;
   G4IonsShenCrossSection* fShen;
+  G4IonProtonCrossSection* fIonH;
 
   G4LEDeuteronInelastic*  fLEDModel;

trunk/source/physics_lists/builders/include/G4OpticalPhysics.hh

@@ -54 +54 @@
 #include "G4OpAbsorption.hh"
 #include "G4OpRayleigh.hh"
+#include "G4OpMieHG.hh"
 #include "G4OpBoundaryProcess.hh"
 
@@ -67 +68 @@
     G4OpticalPhysics(G4int verbose, const G4String& name);
     virtual ~G4OpticalPhysics();
-
-  protected:
 
     // construct particle and physics
@@ -85 +84 @@
     // get methods
     virtual G4Scintillation* GetScintillationProcess() 
-                                         { return fScintillationProcess; }
-    virtual G4Cerenkov* GetCerenkovProcess() { return fCerenkovProcess; }
+                                       { return fScintillationProcess; }
+    virtual G4Cerenkov* GetCerenkovProcess()
+                                       { return fCerenkovProcess; }
     virtual G4OpWLS* GetOpWLSProcess() { return fOpWLSProcess; }
 
     virtual G4OpAbsorption* GetOpAbsorptionProcess()
-                                         { return fOpAbsorptionProcess; }
+                                       { return fOpAbsorptionProcess; }
     virtual G4OpRayleigh* GetOpRayleighProcess()
                                        { return fOpRayleighScatteringProcess; }
+    virtual G4OpMieHG* GetOpMieHGProcess()
+                                       { return fOpMieHGScatteringProcess; }
     virtual G4OpBoundaryProcess* GetOpBoundaryProcess()
-                                         { return fOpBoundaryProcess; }
+                                       { return fOpBoundaryProcess; }
 
     // set methods
@@ -105 +107 @@
 
     void SetWLSTimeProfile(G4String );
+    void SetScintillationByParticleType(G4bool );
     void AddScintillationSaturation(G4EmSaturation* );
+
 
     void SetTrackSecondariesFirst(G4bool );
@@ -123 +127 @@
     G4OpAbsorption*      fOpAbsorptionProcess;
     G4OpRayleigh*        fOpRayleighScatteringProcess;
+    G4OpMieHG*           fOpMieHGScatteringProcess;
     G4OpBoundaryProcess* fOpBoundaryProcess;
 
@@ -146 +151 @@
     G4bool                      fTrackSecondariesFirst;
 
+    /// option to  allow for the light yield to be a function of
+    /// particle type and deposited energy in case of non-linear
+    /// light emission in scintillators
+    G4bool                      fScintillationByParticleType;
+
 };
 

trunk/source/physics_lists/builders/include/G4OpticalPhysicsMessenger.hh

@@ -90 +90 @@
   G4UIcmdWithADouble*    fSetScintillationYieldFactorCmd;
 
+  /// setScintillationByParticleType command
+  G4UIcmdWithABool*      fSetScintillationByParticleTypeCmd;
+
   /// setOpticalSurfaceModel command
   G4UIcmdWithAString*    fSetOpticalSurfaceModelCmd;

trunk/source/physics_lists/builders/src/CVS/Entries

@@ -1 @@
-/G4BertiniNeutronBuilder.cc/1.4/Thu Sep 30 06:14:57 2010//Tgeant4-09-04-beta-01
-/G4BertiniPiKBuilder.cc/1.3/Thu Sep 30 06:14:57 2010//Tgeant4-09-04-beta-01
-/G4BertiniProtonBuilder.cc/1.3/Thu Sep 30 06:14:57 2010//Tgeant4-09-04-beta-01
-/G4BinaryNeutronBuilder.cc/1.3/Thu Sep 30 06:14:57 2010//Tgeant4-09-04-beta-01
-/G4BinaryPiKBuilder.cc/1.3/Thu Sep 30 06:14:57 2010//Tgeant4-09-04-beta-01
-/G4BinaryProtonBuilder.cc/1.3/Thu Sep 30 06:14:57 2010//Tgeant4-09-04-beta-01
-/G4ChargeExchangePhysics.cc/1.2/Thu Sep 30 06:14:57 2010//Tgeant4-09-04-beta-01
-/G4DecayPhysics.cc/1.2/Thu Sep 30 06:14:57 2010//Tgeant4-09-04-beta-01
-/G4ElectroNuclearBuilder.cc/1.1/Thu Sep 30 06:14:57 2010//Tgeant4-09-04-beta-01
-/G4EmDNAPhysics.cc/1.4/Thu Sep 30 06:14:57 2010//Tgeant4-09-04-beta-01
-/G4EmExtraPhysics.cc/1.4/Thu Sep 30 06:14:57 2010//Tgeant4-09-04-beta-01
-/G4EmLivermorePhysics.cc/1.9/Thu Sep 30 06:14:57 2010//Tgeant4-09-04-beta-01
-/G4EmLivermorePolarizedPhysics.cc/1.8/Thu Sep 30 06:14:57 2010//Tgeant4-09-04-beta-01
-/G4EmMessenger.cc/1.1/Thu Sep 30 06:14:57 2010//Tgeant4-09-04-beta-01
-/G4EmPenelopePhysics.cc/1.9/Thu Sep 30 06:14:57 2010//Tgeant4-09-04-beta-01
-/G4EmStandardPhysics.cc/1.21/Thu Sep 30 06:14:58 2010//Tgeant4-09-04-beta-01
-/G4EmStandardPhysics_option1.cc/1.16/Thu Sep 30 06:14:58 2010//Tgeant4-09-04-beta-01
-/G4EmStandardPhysics_option2.cc/1.24/Thu Sep 30 06:14:58 2010//Tgeant4-09-04-beta-01
-/G4EmStandardPhysics_option3.cc/1.20/Thu Sep 30 06:14:58 2010//Tgeant4-09-04-beta-01
-/G4FTFBinaryNeutronBuilder.cc/1.4/Thu Sep 30 06:14:58 2010//Tgeant4-09-04-beta-01
-/G4FTFBinaryPiKBuilder.cc/1.3/Thu Sep 30 06:14:58 2010//Tgeant4-09-04-beta-01
-/G4FTFBinaryProtonBuilder.cc/1.3/Thu Sep 30 06:14:58 2010//Tgeant4-09-04-beta-01
-/G4FTFBuilder.cc/1.3/Thu Sep 30 06:14:58 2010//Tgeant4-09-04-beta-01
-/G4FTFCNeutronBuilder.cc/1.3/Thu Sep 30 06:14:58 2010//Tgeant4-09-04-beta-01
-/G4FTFCPiKBuilder.cc/1.3/Thu Sep 30 06:14:58 2010//Tgeant4-09-04-beta-01
-/G4FTFCProtonBuilder.cc/1.4/Thu Sep 30 06:14:58 2010//Tgeant4-09-04-beta-01
-/G4FTFPNeutronBuilder.cc/1.6/Thu Sep 30 06:14:59 2010//Tgeant4-09-04-beta-01
-/G4FTFPPiKBuilder.cc/1.6/Thu Sep 30 06:14:59 2010//Tgeant4-09-04-beta-01
-/G4FTFPProtonBuilder.cc/1.7/Thu Sep 30 06:14:59 2010//Tgeant4-09-04-beta-01
-/G4HadronDElasticPhysics.cc/1.6/Thu Sep 30 06:14:59 2010//Tgeant4-09-04-beta-01
-/G4HadronElasticPhysics.cc/1.12/Thu Sep 30 06:14:59 2010//Tgeant4-09-04-beta-01
-/G4HadronElasticPhysicsHP.cc/1.2/Thu Sep 30 06:14:59 2010//Tgeant4-09-04-beta-01
-/G4HadronElasticPhysicsLHEP.cc/1.2/Thu Sep 30 06:14:59 2010//Tgeant4-09-04-beta-01
-/G4HadronElasticPhysicsXS.cc/1.2/Thu Sep 30 06:14:59 2010//Tgeant4-09-04-beta-01
-/G4HadronHElasticPhysics.cc/1.9/Thu Sep 30 06:14:59 2010//Tgeant4-09-04-beta-01
-/G4HadronQElasticPhysics.cc/1.9/Thu Sep 30 06:14:59 2010//Tgeant4-09-04-beta-01
-/G4InclAblaNeutronBuilder.cc/1.1/Thu Sep 30 06:14:59 2010//Tgeant4-09-04-beta-01
-/G4InclAblaPiKBuilder.cc/1.2/Thu Sep 30 06:15:00 2010//Tgeant4-09-04-beta-01
-/G4InclAblaProtonBuilder.cc/1.1/Thu Sep 30 06:15:00 2010//Tgeant4-09-04-beta-01
-/G4IonBinaryCascadePhysics.cc/1.3/Thu Sep 30 06:15:00 2010//Tgeant4-09-04-beta-01
-/G4IonInclAblaPhysics.cc/1.2/Thu Sep 30 06:15:00 2010//Tgeant4-09-04-beta-01
-/G4IonPhysics.cc/1.2/Thu Sep 30 06:15:00 2010//Tgeant4-09-04-beta-01
-/G4IonQMDPhysics.cc/1.2/Thu Sep 30 06:15:00 2010//Tgeant4-09-04-beta-01
-/G4LEPNeutronBuilder.cc/1.4/Thu Sep 30 06:15:00 2010//Tgeant4-09-04-beta-01
-/G4LEPPiKBuilder.cc/1.1/Thu Sep 30 06:15:00 2010//Tgeant4-09-04-beta-01
-/G4LEPProtonBuilder.cc/1.1/Thu Sep 30 06:15:00 2010//Tgeant4-09-04-beta-01
-/G4LHEPNeutronBuilder.cc/1.1/Thu Sep 30 06:15:00 2010//Tgeant4-09-04-beta-01
-/G4LHEPPiKBuilder.cc/1.1/Thu Sep 30 06:15:00 2010//Tgeant4-09-04-beta-01
-/G4LHEPProtonBuilder.cc/1.1/Thu Sep 30 06:15:00 2010//Tgeant4-09-04-beta-01
-/G4LHEPStoppingPhysics.cc/1.2/Thu Sep 30 06:15:00 2010//Tgeant4-09-04-beta-01
-/G4MiscCHIPSBuilder.cc/1.1/Thu Sep 30 06:15:00 2010//Tgeant4-09-04-beta-01
-/G4MiscLHEPBuilder.cc/1.3/Thu Sep 30 06:15:00 2010//Tgeant4-09-04-beta-01
-/G4MiscQGSCBuilder.cc/1.2/Thu Sep 30 06:15:00 2010//Tgeant4-09-04-beta-01
-/G4NeutronBuilder.cc/1.1/Thu Sep 30 06:15:00 2010//Tgeant4-09-04-beta-01
-/G4NeutronCrossSectionXS.cc/1.3/Thu Sep 30 06:15:00 2010//Tgeant4-09-04-beta-01
-/G4NeutronHPBuilder.cc/1.2/Thu Sep 30 06:15:01 2010//Tgeant4-09-04-beta-01
-/G4NeutronTrackingCut.cc/1.6/Thu Sep 30 06:15:01 2010//Tgeant4-09-04-beta-01
-/G4OpticalPhysics.cc/1.2/Thu Sep 30 06:15:01 2010//Tgeant4-09-04-beta-01
-/G4OpticalPhysicsMessenger.cc/1.1/Thu Sep 30 06:15:01 2010//Tgeant4-09-04-beta-01
-/G4PiKBuilder.cc/1.1/Thu Sep 30 06:15:01 2010//Tgeant4-09-04-beta-01
-/G4PrecoNeutronBuilder.cc/1.2/Thu Sep 30 06:15:01 2010//Tgeant4-09-04-beta-01
-/G4PrecoProtonBuilder.cc/1.2/Thu Sep 30 06:15:01 2010//Tgeant4-09-04-beta-01
-/G4ProtonBuilder.cc/1.1/Thu Sep 30 06:15:01 2010//Tgeant4-09-04-beta-01
-/G4QAtomicPhysics.cc/1.2/Thu Sep 30 06:15:01 2010//Tgeant4-09-04-beta-01
-/G4QCaptureAtRestPhysics.cc/1.2/Thu Sep 30 06:15:01 2010//Tgeant4-09-04-beta-01
-/G4QElasticPhysics.cc/1.2/Thu Sep 30 06:15:01 2010//Tgeant4-09-04-beta-01
-/G4QEmExtraPhysics.cc/1.2/Thu Sep 30 06:15:01 2010//Tgeant4-09-04-beta-01
-/G4QGSBinaryNeutronBuilder.cc/1.3/Thu Sep 30 06:15:01 2010//Tgeant4-09-04-beta-01
-/G4QGSBinaryPiKBuilder.cc/1.3/Thu Sep 30 06:15:01 2010//Tgeant4-09-04-beta-01
-/G4QGSBinaryProtonBuilder.cc/1.3/Thu Sep 30 06:15:01 2010//Tgeant4-09-04-beta-01
-/G4QGSBuilder.cc/1.3/Thu Sep 30 06:15:01 2010//Tgeant4-09-04-beta-01
-/G4QGSCEflowNeutronBuilder.cc/1.4/Thu Sep 30 06:15:09 2010//Tgeant4-09-04-beta-01
-/G4QGSCEflowPiKBuilder.cc/1.4/Thu Sep 30 06:15:09 2010//Tgeant4-09-04-beta-01
-/G4QGSCEflowProtonBuilder.cc/1.4/Thu Sep 30 06:15:09 2010//Tgeant4-09-04-beta-01
-/G4QGSCNeutronBuilder.cc/1.5/Thu Sep 30 06:15:09 2010//Tgeant4-09-04-beta-01
-/G4QGSCPiKBuilder.cc/1.5/Thu Sep 30 06:15:09 2010//Tgeant4-09-04-beta-01
-/G4QGSCProtonBuilder.cc/1.5/Thu Sep 30 06:15:09 2010//Tgeant4-09-04-beta-01
-/G4QGSC_CHIPSNeutronBuilder.cc/1.1/Thu Sep 30 06:15:09 2010//Tgeant4-09-04-beta-01
-/G4QGSC_CHIPSPiKBuilder.cc/1.1/Thu Sep 30 06:15:09 2010//Tgeant4-09-04-beta-01
-/G4QGSC_CHIPSProtonBuilder.cc/1.1/Thu Sep 30 06:15:09 2010//Tgeant4-09-04-beta-01
-/G4QGSC_QGSCNeutronBuilder.cc/1.1/Thu Sep 30 06:15:10 2010//Tgeant4-09-04-beta-01
-/G4QGSC_QGSCPiKBuilder.cc/1.1/Thu Sep 30 06:15:10 2010//Tgeant4-09-04-beta-01
-/G4QGSC_QGSCProtonBuilder.cc/1.1/Thu Sep 30 06:15:10 2010//Tgeant4-09-04-beta-01
-/G4QGSPNeutronBuilder.cc/1.6/Thu Sep 30 06:15:10 2010//Tgeant4-09-04-beta-01
-/G4QGSPPiKBuilder.cc/1.6/Thu Sep 30 06:15:10 2010//Tgeant4-09-04-beta-01
-/G4QGSPProtonBuilder.cc/1.6/Thu Sep 30 06:15:10 2010//Tgeant4-09-04-beta-01
-/G4QInelasticCHIPSBuilder.cc/1.3/Thu Sep 30 06:15:10 2010//Tgeant4-09-04-beta-01
-/G4QIonPhysics.cc/1.1/Thu Sep 30 06:15:10 2010//Tgeant4-09-04-beta-01
-/G4QMessenger.cc/1.1/Thu Sep 30 06:15:11 2010//Tgeant4-09-04-beta-01
-/G4QNeutrinoPhysics.cc/1.4/Thu Sep 30 06:15:11 2010//Tgeant4-09-04-beta-01
-/G4QNeutronBuilder.cc/1.4/Thu Sep 30 06:15:11 2010//Tgeant4-09-04-beta-01
-/G4QPhotoNuclearPhysics.cc/1.5/Thu Sep 30 06:15:11 2010//Tgeant4-09-04-beta-01
-/G4QProtonBuilder.cc/1.4/Thu Sep 30 06:15:11 2010//Tgeant4-09-04-beta-01
-/G4QStoppingPhysics.cc/1.5/Thu Sep 30 06:15:17 2010//Tgeant4-09-04-beta-01
-/G4RadioactiveDecayPhysics.cc/1.2/Thu Sep 30 06:15:17 2010//Tgeant4-09-04-beta-01
-/G4StoppingHadronBuilder.cc/1.1/Thu Sep 30 06:15:17 2010//Tgeant4-09-04-beta-01
-/G4VHadronModelBuilder.cc/1.1/Thu Sep 30 06:15:17 2010//Tgeant4-09-04-beta-01
-/G4VNeutronBuilder.cc/1.1/Thu Sep 30 06:15:17 2010//Tgeant4-09-04-beta-01
-/G4VPiKBuilder.cc/1.1/Thu Sep 30 06:15:17 2010//Tgeant4-09-04-beta-01
-/G4VProtonBuilder.cc/1.1/Thu Sep 30 06:15:17 2010//Tgeant4-09-04-beta-01
-/G4WarnPLStatus.cc/1.2/Thu Sep 30 06:15:17 2010//Tgeant4-09-04-beta-01
+/G4BertiniNeutronBuilder.cc/1.4/Thu Sep 30 06:14:57 2010//Tphys-lists-V09-03-34
+/G4BertiniPiKBuilder.cc/1.3/Thu Sep 30 06:14:57 2010//Tphys-lists-V09-03-34
+/G4BertiniProtonBuilder.cc/1.3/Thu Sep 30 06:14:57 2010//Tphys-lists-V09-03-34
+/G4BinaryNeutronBuilder.cc/1.3/Thu Sep 30 06:14:57 2010//Tphys-lists-V09-03-34
+/G4BinaryPiKBuilder.cc/1.3/Thu Sep 30 06:14:57 2010//Tphys-lists-V09-03-34
+/G4BinaryProtonBuilder.cc/1.3/Thu Sep 30 06:14:57 2010//Tphys-lists-V09-03-34
+/G4ChargeExchangePhysics.cc/1.2/Thu Sep 30 06:14:57 2010//Tphys-lists-V09-03-34
+/G4DecayPhysics.cc/1.2/Thu Sep 30 06:14:57 2010//Tphys-lists-V09-03-34
+/G4ElectroNuclearBuilder.cc/1.1/Thu Sep 30 06:14:57 2010//Tphys-lists-V09-03-34
+/G4EmExtraPhysics.cc/1.4/Thu Sep 30 06:14:57 2010//Tphys-lists-V09-03-34
+/G4EmMessenger.cc/1.1/Thu Sep 30 06:14:57 2010//Tphys-lists-V09-03-34
+/G4FTFBinaryNeutronBuilder.cc/1.4/Thu Sep 30 06:14:58 2010//Tphys-lists-V09-03-34
+/G4FTFBinaryPiKBuilder.cc/1.3/Thu Sep 30 06:14:58 2010//Tphys-lists-V09-03-34
+/G4FTFBinaryProtonBuilder.cc/1.3/Thu Sep 30 06:14:58 2010//Tphys-lists-V09-03-34
+/G4FTFBuilder.cc/1.3/Thu Sep 30 06:14:58 2010//Tphys-lists-V09-03-34
+/G4FTFCNeutronBuilder.cc/1.3/Thu Sep 30 06:14:58 2010//Tphys-lists-V09-03-34
+/G4FTFCPiKBuilder.cc/1.3/Thu Sep 30 06:14:58 2010//Tphys-lists-V09-03-34
+/G4FTFCProtonBuilder.cc/1.4/Thu Sep 30 06:14:58 2010//Tphys-lists-V09-03-34
+/G4FTFPNeutronBuilder.cc/1.6/Thu Sep 30 06:14:59 2010//Tphys-lists-V09-03-34
+/G4FTFPPiKBuilder.cc/1.6/Thu Sep 30 06:14:59 2010//Tphys-lists-V09-03-34
+/G4FTFPProtonBuilder.cc/1.7/Thu Sep 30 06:14:59 2010//Tphys-lists-V09-03-34
+/G4HadronElasticPhysics93.cc/1.1/Thu Jul 29 10:52:14 2010//Tphys-lists-V09-03-34
+/G4HadronElasticPhysicsLHEP.cc/1.2/Thu Sep 30 06:14:59 2010//Tphys-lists-V09-03-34
+/G4HadronElasticPhysicsXS.cc/1.2/Thu Sep 30 06:14:59 2010//Tphys-lists-V09-03-34
+/G4HadronQElasticPhysics.cc/1.9/Thu Sep 30 06:14:59 2010//Tphys-lists-V09-03-34
+/G4InclAblaNeutronBuilder.cc/1.1/Thu Sep 30 06:14:59 2010//Tphys-lists-V09-03-34
+/G4InclAblaPiKBuilder.cc/1.2/Thu Sep 30 06:15:00 2010//Tphys-lists-V09-03-34
+/G4InclAblaProtonBuilder.cc/1.1/Thu Sep 30 06:15:00 2010//Tphys-lists-V09-03-34
+/G4IonInclAblaPhysics.cc/1.2/Thu Sep 30 06:15:00 2010//Tphys-lists-V09-03-34
+/G4IonPhysics.cc/1.2/Thu Sep 30 06:15:00 2010//Tphys-lists-V09-03-34
+/G4LEPNeutronBuilder.cc/1.4/Thu Sep 30 06:15:00 2010//Tphys-lists-V09-03-34
+/G4LEPPiKBuilder.cc/1.1/Thu Sep 30 06:15:00 2010//Tphys-lists-V09-03-34
+/G4LEPProtonBuilder.cc/1.1/Thu Sep 30 06:15:00 2010//Tphys-lists-V09-03-34
+/G4LHEPNeutronBuilder.cc/1.1/Thu Sep 30 06:15:00 2010//Tphys-lists-V09-03-34
+/G4LHEPPiKBuilder.cc/1.1/Thu Sep 30 06:15:00 2010//Tphys-lists-V09-03-34
+/G4LHEPProtonBuilder.cc/1.1/Thu Sep 30 06:15:00 2010//Tphys-lists-V09-03-34
+/G4LHEPStoppingPhysics.cc/1.2/Thu Sep 30 06:15:00 2010//Tphys-lists-V09-03-34
+/G4MiscCHIPSBuilder.cc/1.1/Thu Sep 30 06:15:00 2010//Tphys-lists-V09-03-34
+/G4MiscLHEPBuilder.cc/1.3/Thu Sep 30 06:15:00 2010//Tphys-lists-V09-03-34
+/G4MiscQGSCBuilder.cc/1.2/Thu Sep 30 06:15:00 2010//Tphys-lists-V09-03-34
+/G4NeutronBuilder.cc/1.1/Thu Sep 30 06:15:00 2010//Tphys-lists-V09-03-34
+/G4NeutronHPBuilder.cc/1.2/Thu Sep 30 06:15:01 2010//Tphys-lists-V09-03-34
+/G4NeutronTrackingCut.cc/1.6/Thu Sep 30 06:15:01 2010//Tphys-lists-V09-03-34
+/G4OpticalPhysics.cc/1.6/Thu Nov  4 14:51:32 2010//Tphys-lists-V09-03-34
+/G4OpticalPhysicsMessenger.cc/1.3/Thu Nov  4 14:51:32 2010//Tphys-lists-V09-03-34
+/G4PiKBuilder.cc/1.1/Thu Sep 30 06:15:01 2010//Tphys-lists-V09-03-34
+/G4PrecoNeutronBuilder.cc/1.2/Thu Sep 30 06:15:01 2010//Tphys-lists-V09-03-34
+/G4PrecoProtonBuilder.cc/1.2/Thu Sep 30 06:15:01 2010//Tphys-lists-V09-03-34
+/G4ProtonBuilder.cc/1.1/Thu Sep 30 06:15:01 2010//Tphys-lists-V09-03-34
+/G4QAtomicPhysics.cc/1.2/Thu Sep 30 06:15:01 2010//Tphys-lists-V09-03-34
+/G4QCaptureAtRestPhysics.cc/1.2/Thu Sep 30 06:15:01 2010//Tphys-lists-V09-03-34
+/G4QElasticPhysics.cc/1.2/Thu Sep 30 06:15:01 2010//Tphys-lists-V09-03-34
+/G4QEmExtraPhysics.cc/1.2/Thu Sep 30 06:15:01 2010//Tphys-lists-V09-03-34
+/G4QGSBinaryNeutronBuilder.cc/1.3/Thu Sep 30 06:15:01 2010//Tphys-lists-V09-03-34
+/G4QGSBinaryPiKBuilder.cc/1.3/Thu Sep 30 06:15:01 2010//Tphys-lists-V09-03-34
+/G4QGSBinaryProtonBuilder.cc/1.3/Thu Sep 30 06:15:01 2010//Tphys-lists-V09-03-34
+/G4QGSBuilder.cc/1.3/Thu Sep 30 06:15:01 2010//Tphys-lists-V09-03-34
+/G4QGSCEflowNeutronBuilder.cc/1.4/Thu Sep 30 06:15:09 2010//Tphys-lists-V09-03-34
+/G4QGSCEflowPiKBuilder.cc/1.4/Thu Sep 30 06:15:09 2010//Tphys-lists-V09-03-34
+/G4QGSCEflowProtonBuilder.cc/1.4/Thu Sep 30 06:15:09 2010//Tphys-lists-V09-03-34
+/G4QGSCNeutronBuilder.cc/1.5/Thu Sep 30 06:15:09 2010//Tphys-lists-V09-03-34
+/G4QGSCPiKBuilder.cc/1.5/Thu Sep 30 06:15:09 2010//Tphys-lists-V09-03-34
+/G4QGSCProtonBuilder.cc/1.5/Thu Sep 30 06:15:09 2010//Tphys-lists-V09-03-34
+/G4QGSC_CHIPSNeutronBuilder.cc/1.1/Thu Sep 30 06:15:09 2010//Tphys-lists-V09-03-34
+/G4QGSC_CHIPSPiKBuilder.cc/1.1/Thu Sep 30 06:15:09 2010//Tphys-lists-V09-03-34
+/G4QGSC_CHIPSProtonBuilder.cc/1.1/Thu Sep 30 06:15:09 2010//Tphys-lists-V09-03-34
+/G4QGSC_QGSCNeutronBuilder.cc/1.1/Thu Sep 30 06:15:10 2010//Tphys-lists-V09-03-34
+/G4QGSC_QGSCPiKBuilder.cc/1.1/Thu Sep 30 06:15:10 2010//Tphys-lists-V09-03-34
+/G4QGSC_QGSCProtonBuilder.cc/1.1/Thu Sep 30 06:15:10 2010//Tphys-lists-V09-03-34
+/G4QGSPNeutronBuilder.cc/1.6/Thu Sep 30 06:15:10 2010//Tphys-lists-V09-03-34
+/G4QGSPPiKBuilder.cc/1.6/Thu Sep 30 06:15:10 2010//Tphys-lists-V09-03-34
+/G4QGSPProtonBuilder.cc/1.6/Thu Sep 30 06:15:10 2010//Tphys-lists-V09-03-34
+/G4QInelasticCHIPSBuilder.cc/1.3/Thu Sep 30 06:15:10 2010//Tphys-lists-V09-03-34
+/G4QIonPhysics.cc/1.1/Thu Sep 30 06:15:10 2010//Tphys-lists-V09-03-34
+/G4QMessenger.cc/1.1/Thu Sep 30 06:15:11 2010//Tphys-lists-V09-03-34
+/G4QNeutrinoPhysics.cc/1.4/Thu Sep 30 06:15:11 2010//Tphys-lists-V09-03-34
+/G4QNeutronBuilder.cc/1.4/Thu Sep 30 06:15:11 2010//Tphys-lists-V09-03-34
+/G4QPhotoNuclearPhysics.cc/1.5/Thu Sep 30 06:15:11 2010//Tphys-lists-V09-03-34
+/G4QProtonBuilder.cc/1.4/Thu Sep 30 06:15:11 2010//Tphys-lists-V09-03-34
+/G4QStoppingPhysics.cc/1.5/Thu Sep 30 06:15:17 2010//Tphys-lists-V09-03-34
+/G4RadioactiveDecayPhysics.cc/1.2/Thu Sep 30 06:15:17 2010//Tphys-lists-V09-03-34
+/G4StoppingHadronBuilder.cc/1.1/Thu Sep 30 06:15:17 2010//Tphys-lists-V09-03-34
+/G4VHadronModelBuilder.cc/1.1/Thu Sep 30 06:15:17 2010//Tphys-lists-V09-03-34
+/G4VNeutronBuilder.cc/1.1/Thu Sep 30 06:15:17 2010//Tphys-lists-V09-03-34
+/G4VPiKBuilder.cc/1.1/Thu Sep 30 06:15:17 2010//Tphys-lists-V09-03-34
+/G4VProtonBuilder.cc/1.1/Thu Sep 30 06:15:17 2010//Tphys-lists-V09-03-34
+/G4WarnPLStatus.cc/1.2/Thu Sep 30 06:15:17 2010//Tphys-lists-V09-03-34
+/G4EmDNAPhysics.cc/1.6/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/G4EmLivermorePhysics.cc/1.12/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/G4EmLivermorePolarizedPhysics.cc/1.11/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/G4EmPenelopePhysics.cc/1.12/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/G4EmStandardPhysics.cc/1.24/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/G4EmStandardPhysics_option1.cc/1.19/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/G4EmStandardPhysics_option2.cc/1.27/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/G4EmStandardPhysics_option3.cc/1.21/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/G4HadronDElasticPhysics.cc/1.7/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/G4HadronElasticPhysics.cc/1.16/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/G4HadronElasticPhysicsHP.cc/1.3/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/G4HadronHElasticPhysics.cc/1.10/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/G4IonBinaryCascadePhysics.cc/1.4/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/G4IonQMDPhysics.cc/1.4/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/G4NeutronCrossSectionXS.cc/1.4/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
 D

trunk/source/physics_lists/builders/src/CVS/Tag

@@ -1 @@
-Ngeant4-09-04-beta-01
+Nphys-lists-V09-03-34

trunk/source/physics_lists/builders/src/G4EmDNAPhysics.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4EmDNAPhysics.cc,v 1.4 2010/06/02 17:21:29 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4EmDNAPhysics.cc,v 1.6 2010/10/08 09:21:02 sincerti Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 
 #include "G4EmDNAPhysics.hh"
@@ -39 +39 @@
 
 #include "G4DNAExcitation.hh"
-#include "G4DNAEmfietzoglouExcitationModel.hh"
-#include "G4DNAMillerGreenExcitationModel.hh"
-#include "G4DNABornExcitationModel.hh"
-
+#include "G4DNAAttachment.hh"
+#include "G4DNAVibExcitation.hh"
 #include "G4DNAIonisation.hh"
-#include "G4DNABornIonisationModel.hh"
-#include "G4DNARuddIonisationModel.hh"
-
 #include "G4DNAChargeDecrease.hh"
-#include "G4DNADingfelderChargeDecreaseModel.hh"
-
 #include "G4DNAChargeIncrease.hh"
-#include "G4DNADingfelderChargeIncreaseModel.hh"
 
 // particles
@@ -151 +143 @@
       pmanager->AddDiscreteProcess(new G4DNAIonisation());
 
+      // *** Vibrational excitation ***
+      pmanager->AddDiscreteProcess(new G4DNAVibExcitation());
+      
+      // *** Attachment ***
+      pmanager->AddDiscreteProcess(new G4DNAAttachment()); 
+
     
     } else if ( particleName == "proton" ) {
@@ -158 +156 @@
 
     } else if ( particleName == "hydrogen" ) {
+      pmanager->AddDiscreteProcess(new G4DNAExcitation());
       pmanager->AddDiscreteProcess(new G4DNAIonisation());
       pmanager->AddDiscreteProcess(new G4DNAChargeIncrease());

trunk/source/physics_lists/builders/src/G4EmLivermorePhysics.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4EmLivermorePhysics.cc,v 1.9 2010/06/02 17:21:29 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4EmLivermorePhysics.cc,v 1.12 2010/10/10 15:18:34 vnivanch Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 
 #include "G4EmLivermorePhysics.hh"
@@ -80 +80 @@
 #include "G4hIonisation.hh"
 #include "G4ionIonisation.hh"
+#include "G4alphaIonisation.hh"
 #include "G4IonParametrisedLossModel.hh"
 #include "G4NuclearStopping.hh"
@@ -320 +321 @@
                particleName == "Ds+" ||
                particleName == "Ds-" ||
+               particleName == "anti_He3" ||
+               particleName == "anti_alpha" ||
+               particleName == "anti_deuteron" ||
                particleName == "anti_lambda_c+" ||
                particleName == "anti_omega-" ||
@@ -327 +331 @@
                particleName == "anti_sigma+" ||
                particleName == "anti_sigma-" ||
+               particleName == "anti_triton" ||
                particleName == "anti_xi_c+" ||
                particleName == "anti_xi-" ||

trunk/source/physics_lists/builders/src/G4EmLivermorePolarizedPhysics.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4EmLivermorePolarizedPhysics.cc,v 1.8 2010/06/02 17:21:29 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4EmLivermorePolarizedPhysics.cc,v 1.11 2010/10/10 15:18:34 vnivanch Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 
 #include "G4EmLivermorePolarizedPhysics.hh"
@@ -80 +80 @@
 #include "G4hIonisation.hh"
 #include "G4ionIonisation.hh"
+#include "G4alphaIonisation.hh"
 #include "G4IonParametrisedLossModel.hh"
 #include "G4NuclearStopping.hh"
@@ -317 +318 @@
                particleName == "Ds+" ||
                particleName == "Ds-" ||
+               particleName == "anti_He3" ||
+               particleName == "anti_alpha" ||
+               particleName == "anti_deuteron" ||
                particleName == "anti_lambda_c+" ||
                particleName == "anti_omega-" ||
@@ -324 +328 @@
                particleName == "anti_sigma+" ||
                particleName == "anti_sigma-" ||
+               particleName == "anti_triton" ||
                particleName == "anti_xi_c+" ||
                particleName == "anti_xi-" ||

trunk/source/physics_lists/builders/src/G4EmPenelopePhysics.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4EmPenelopePhysics.cc,v 1.9 2010/06/02 17:21:29 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4EmPenelopePhysics.cc,v 1.12 2010/10/10 15:18:34 vnivanch Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 
 #include "G4EmPenelopePhysics.hh"
@@ -81 +81 @@
 #include "G4hIonisation.hh"
 #include "G4ionIonisation.hh"
+#include "G4alphaIonisation.hh"
 #include "G4IonParametrisedLossModel.hh"
 #include "G4NuclearStopping.hh"
@@ -341 +342 @@
                particleName == "Ds+" ||
                particleName == "Ds-" ||
+               particleName == "anti_He3" ||
+               particleName == "anti_alpha" ||
+               particleName == "anti_deuteron" ||
                particleName == "anti_lambda_c+" ||
                particleName == "anti_omega-" ||
@@ -348 +352 @@
                particleName == "anti_sigma+" ||
                particleName == "anti_sigma-" ||
+               particleName == "anti_triton" ||
                particleName == "anti_xi_c+" ||
                particleName == "anti_xi-" ||

trunk/source/physics_lists/builders/src/G4EmStandardPhysics.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4EmStandardPhysics.cc,v 1.21 2010/06/02 17:21:29 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4EmStandardPhysics.cc,v 1.24 2010/10/10 15:18:34 vnivanch Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -57 +57 @@
 #include "G4MuMultipleScattering.hh"
 #include "G4hMultipleScattering.hh"
+#include "G4CoulombScattering.hh"
+#include "G4WentzelVIModel.hh"
 
 #include "G4eIonisation.hh"
@@ -70 +72 @@
 #include "G4hIonisation.hh"
 #include "G4ionIonisation.hh"
+#include "G4alphaIonisation.hh"
 
 #include "G4Gamma.hh"
@@ -177 +180 @@
                particleName == "mu-"    ) {
 
-      pmanager->AddProcess(new G4MuMultipleScattering,-1, 1, 1);
-      pmanager->AddProcess(new G4MuIonisation,        -1, 2, 2);
-      pmanager->AddProcess(new G4MuBremsstrahlung,    -1,-3, 3);
-      pmanager->AddProcess(new G4MuPairProduction,    -1,-4, 4);
+      G4MuMultipleScattering* msc = new G4MuMultipleScattering();
+      msc->AddEmModel(0, new G4WentzelVIModel());
+      pmanager->AddProcess(msc,                     -1, 1, 1);
+      pmanager->AddProcess(new G4MuIonisation,      -1, 2, 2);
+      pmanager->AddProcess(new G4MuBremsstrahlung,  -1,-3, 3);
+      pmanager->AddProcess(new G4MuPairProduction,  -1,-4, 4);
+      pmanager->AddDiscreteProcess(new G4CoulombScattering());
 
     } else if (particleName == "alpha" ||
@@ -210 +216 @@
                particleName == "Ds+" ||
                particleName == "Ds-" ||
+               particleName == "anti_He3" ||
+               particleName == "anti_alpha" ||
+               particleName == "anti_deuteron" ||
                particleName == "anti_lambda_c+" ||
                particleName == "anti_omega-" ||
@@ -217 +226 @@
                particleName == "anti_sigma+" ||
                particleName == "anti_sigma-" ||
+               particleName == "anti_triton" ||
                particleName == "anti_xi_c+" ||
                particleName == "anti_xi-" ||
@@ -238 +248 @@
   G4EmProcessOptions opt;
   opt.SetVerbose(verbose);
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+  opt.SetPolarAngleLimit(0.2);
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/source/physics_lists/builders/src/G4EmStandardPhysics_option1.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4EmStandardPhysics_option1.cc,v 1.16 2010/06/02 17:21:29 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4EmStandardPhysics_option1.cc,v 1.19 2010/10/10 15:18:34 vnivanch Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -59 +59 @@
 #include "G4MuMultipleScattering.hh"
 #include "G4hMultipleScattering.hh"
-#include "G4MscStepLimitType.hh"
+//#include "G4MscStepLimitType.hh"
+#include "G4WentzelVIModel.hh"
 
 #include "G4eIonisation.hh"
@@ -73 +74 @@
 #include "G4hIonisation.hh"
 #include "G4ionIonisation.hh"
+#include "G4alphaIonisation.hh"
 
 #include "G4Gamma.hh"
@@ -188 +190 @@
                particleName == "mu-"    ) {
 
-      pmanager->AddProcess(new G4MuMultipleScattering,-1, 1, 1);
+      pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
       pmanager->AddProcess(new G4MuIonisation,        -1, 2, 2);
       pmanager->AddProcess(new G4MuBremsstrahlung,    -1,-3, 3);
@@ -221 +223 @@
                particleName == "Ds+" ||
                particleName == "Ds-" ||
+               particleName == "anti_He3" ||
+               particleName == "anti_alpha" ||
+               particleName == "anti_deuteron" ||
                particleName == "anti_lambda_c+" ||
                particleName == "anti_omega-" ||
@@ -228 +233 @@
                particleName == "anti_sigma+" ||
                particleName == "anti_sigma-" ||
+               particleName == "anti_triton" ||
                particleName == "anti_xi_c+" ||
                particleName == "anti_xi-" ||

trunk/source/physics_lists/builders/src/G4EmStandardPhysics_option2.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4EmStandardPhysics_option2.cc,v 1.24 2010/06/10 14:48:23 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4EmStandardPhysics_option2.cc,v 1.27 2010/10/10 15:18:34 vnivanch Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -78 +78 @@
 #include "G4hIonisation.hh"
 #include "G4ionIonisation.hh"
+#include "G4alphaIonisation.hh"
 //#include "G4IonParametrisedLossModel.hh"
 
@@ -227 +228 @@
                particleName == "proton" ) {
 
-      pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
+      G4hMultipleScattering* msc = new G4hMultipleScattering();
+      msc->AddEmModel(0, new G4WentzelVIModel());
+      pmanager->AddProcess(msc,                       -1, 1, 1);
       pmanager->AddProcess(new G4hIonisation,         -1, 2, 2);
       pmanager->AddProcess(new G4hBremsstrahlung,     -1,-3, 3);
@@ -238 +241 @@
                particleName == "Ds+" ||
                particleName == "Ds-" ||
+               particleName == "anti_He3" ||
+               particleName == "anti_alpha" ||
+               particleName == "anti_deuteron" ||
                particleName == "anti_lambda_c+" ||
                particleName == "anti_omega-" ||
@@ -245 +251 @@
                particleName == "anti_sigma+" ||
                particleName == "anti_sigma-" ||
+               particleName == "anti_triton" ||
                particleName == "anti_xi_c+" ||
                particleName == "anti_xi-" ||

trunk/source/physics_lists/builders/src/G4EmStandardPhysics_option3.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4EmStandardPhysics_option3.cc,v 1.20 2010/06/02 17:21:29 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4EmStandardPhysics_option3.cc,v 1.21 2010/10/10 15:18:34 vnivanch Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -239 +239 @@
                particleName == "Ds+" ||
                particleName == "Ds-" ||
+               particleName == "anti_He3" ||
+               particleName == "anti_alpha" ||
+               particleName == "anti_deuteron" ||
                particleName == "anti_lambda_c+" ||
                particleName == "anti_omega-" ||
@@ -246 +249 @@
                particleName == "anti_sigma+" ||
                particleName == "anti_sigma-" ||
+               particleName == "anti_triton" ||
                particleName == "anti_xi_c+" ||
                particleName == "anti_xi-" ||

trunk/source/physics_lists/builders/src/G4HadronDElasticPhysics.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4HadronDElasticPhysics.cc,v 1.6 2010/06/03 15:09:54 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4HadronDElasticPhysics.cc,v 1.7 2010/07/29 10:52:14 vnivanch Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -82 +82 @@
 {
   if(verbose > 1) { 
-    G4cout << "### G4HadronHElasticPhysics: " << GetPhysicsName() 
+    G4cout << "### G4HadronDElasticPhysics: " << GetPhysicsName() 
            << G4endl; 
   }
@@ -92 +92 @@
 {
   if(verbose > 1) { 
-    G4cout << "### G4HadronHElasticPhysics: " << GetPhysicsName() 
+    G4cout << "### G4HadronDElasticPhysics: " << GetPhysicsName() 
            << G4endl; 
   }

trunk/source/physics_lists/builders/src/G4HadronElasticPhysics.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4HadronElasticPhysics.cc,v 1.12 2010/06/03 16:28:39 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4HadronElasticPhysics.cc,v 1.16 2010/09/24 12:54:13 vnivanch Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
 //
-// ClassName:   G4HadronElasticPhysics
+// ClassName:   G4HadronElasticPhysics 
 //
-// Author: 11 April 2006 V. Ivanchenko
+// Author: 23 November 2006 V. Ivanchenko
 //
 // Modified:
-// 05.07.2006 V.Ivanchenko define process by particle name; 
-//                         fix problem of initialisation of HP
-// 24.07.2006 V.Ivanchenko add G4NeutronHPElasticData 
-// 10.08.2006 V.Ivanchenko separate neutrons from other particles
-// 17.11.2006 V.Ivanchenko do not redefine G4HadronElastic default parameters
-// 19.02.2007 V.Ivanchenko set QModelLowLimit and LowestEnergyLimit to zero
-// 19.02.2007 A.Howard set QModelLowLimit and LowestEnergyLimit to zero 
-//                     for neutrons
-// 06.03.2007 V.Ivanchenko use updated interface to G4UElasticCrossSection
+// 21.03.2007 V.Ivanchenko Use G4BGGNucleonElasticXS and G4BGGPionElasticXS; 
+//                         Reduce thresholds for HE and Q-models to zero
+// 03.06.2010 V.Ivanchenko cleanup constructors and ConstructProcess method
+// 29.07.2010 V.Ivanchenko rename this class from G4HadronHElasticPhysics to
+//                         G4HadronElasticPhysics, old version of the class
+//                         is renamed to G4HadronElasticPhysics93
 //
 //----------------------------------------------------------------------------
 //
+// CHIPS for sampling scattering for p and n
+// Glauber model for samplimg of high energy pi+- (E > 1GeV)
+// LHEP sampling model for the other particle
+// BBG cross sections for p, n and pi+- 
+// LHEP cross sections for other particles
 
 #include "G4HadronElasticPhysics.hh"
-
-#include "G4HadronicProcess.hh"
-#include "G4HadronElasticProcess.hh"
-#include "G4HadronicInteraction.hh"
-#include "G4LElastic.hh"
 
 #include "G4ParticleDefinition.hh"
@@ -62 +59 @@
 #include "G4Neutron.hh"
 
-#include "G4VQCrossSection.hh"
-#include "G4UElasticCrossSection.hh"
+#include "G4WHadronElasticProcess.hh"
+#include "G4VHadronElastic.hh"
+#include "G4CHIPSElastic.hh"
+#include "G4ElasticHadrNucleusHE.hh"
 #include "G4BGGNucleonElasticXS.hh"
 #include "G4BGGPionElasticXS.hh"
+#include "G4NeutronElasticXS.hh"
+#include "G4CHIPSElasticXS.hh"
 
 G4HadronElasticPhysics::G4HadronElasticPhysics(G4int ver)
-  : G4VPhysicsConstructor("elastic"), mname("elastic"),verbose(ver),
-    hpFlag(false), glFlag(false),wasActivated(false)
+  : G4VPhysicsConstructor("hElasticWEL_CHIPS"), verbose(ver), 
+    wasActivated(false)
 {
-  if(verbose > 1) G4cout << "### HadronElasticPhysics" << G4endl;
-  model = 0;
-  neutronModel = 0;
-  neutronHPModel = 0;  
+  if(verbose > 1) { 
+    G4cout << "### G4HadronElasticPhysics: " << GetPhysicsName() 
+           << G4endl; 
+  }
 }
 
-G4HadronElasticPhysics::G4HadronElasticPhysics(
-    const G4String& name,  G4int ver, G4bool hp, G4bool glauber)
-  : G4VPhysicsConstructor(name), mname(name), verbose(ver), hpFlag(hp), 
-    glFlag(glauber),wasActivated(false)
+G4HadronElasticPhysics::G4HadronElasticPhysics(const G4String&,
+    G4int ver, G4bool, const G4String&)
+  : G4VPhysicsConstructor("hElasticWEL_CHIPS"), verbose(ver), 
+    wasActivated(false)
 {
-  if(verbose > 1) G4cout << "### HadronElasticPhysics" << G4endl;
-  model = 0;
-  neutronModel = 0;
-  neutronHPModel = 0;  
+  if(verbose > 1) { 
+    G4cout << "### G4HadronElasticPhysics: " << GetPhysicsName() 
+           << G4endl; 
+  }
 }
 
 G4HadronElasticPhysics::~G4HadronElasticPhysics()
-{
-  delete model;
-  delete neutronModel;
-  delete neutronHPModel;
-}
+{}
 
 void G4HadronElasticPhysics::ConstructParticle()
 {
-// G4cout << "G4HadronElasticPhysics::ConstructParticle" << G4endl;
+  // G4cout << "G4HadronElasticPhysics::ConstructParticle" << G4endl;
   G4MesonConstructor pMesonConstructor;
   pMesonConstructor.ConstructParticle();
@@ -111 +108 @@
 void G4HadronElasticPhysics::ConstructProcess()
 {
-  if(wasActivated) return;
+  if(wasActivated) { return; }
   wasActivated = true;
 
+  G4double elimit = 1.0*GeV;
   if(verbose > 1) {
-    G4cout << "### HadronElasticPhysics Construct Processes with the model <" 
-           << mname << ">" << G4endl;
+    G4cout << "### HadronElasticPhysics Construct Processes with HE limit " 
+           << elimit << " MeV" << G4endl;
   }
-  G4HadronicProcess* hel = 0;
-  G4VQCrossSection* man = 0; 
 
-  if(mname == "elastic") {
-    G4HadronElastic* he = new G4HadronElastic();
-    model = he;
-    man = he->GetCS();
-    he->SetQModelLowLimit(0.0);
-    he->SetLowestEnergyLimit(0.0);
-  } else {
-    model = new G4LElastic();
-  }
+  G4VHadronElastic* plep0 = new G4VHadronElastic();
+  G4VHadronElastic* plep1 = new G4VHadronElastic();
+  plep1->SetMaxEnergy(elimit);
+
+  G4CHIPSElastic* chipsp = new G4CHIPSElastic();
+  G4CHIPSElastic* chipsn = new G4CHIPSElastic();
+
+  G4ElasticHadrNucleusHE* he = new G4ElasticHadrNucleusHE(); 
+  he->SetMinEnergy(elimit);
 
   theParticleIterator->reset();
@@ -135 +131 @@
   {
     G4ParticleDefinition* particle = theParticleIterator->value();
-    G4ProcessManager* pmanager = particle->GetProcessManager();
     G4String pname = particle->GetParticleName();
     if(pname == "anti_lambda"  ||
@@ -151 +146 @@
        pname == "lambda"    || 
        pname == "omega-"    || 
+       pname == "pi-"       || 
+       pname == "pi+"       || 
+       pname == "proton"    || 
        pname == "sigma-"    || 
        pname == "sigma+"    || 
@@ -158 +156 @@
        pname == "triton") {
       
-      if(mname == "elastic") {
-        G4UHadronElasticProcess* h = new G4UHadronElasticProcess("hElastic");
-        h->SetQElasticCrossSection(man);
-        hel = h;
-        if(glFlag) hel->AddDataSet(new G4UElasticCrossSection(particle));
-      } else {                   
-        hel = new G4HadronElasticProcess("hElastic");
+      G4ProcessManager* pmanager = particle->GetProcessManager();
+      G4WHadronElasticProcess* hel = new G4WHadronElasticProcess();
+      if(pname == "proton") { 
+        //hel->AddDataSet(new G4BGGNucleonElasticXS(particle));
+        hel->AddDataSet(new G4CHIPSElasticXS());
+        hel->RegisterMe(chipsp);
+      } else if (pname == "pi+" || pname == "pi-") { 
+        hel->AddDataSet(new G4BGGPionElasticXS(particle));
+        hel->RegisterMe(plep1);
+        hel->RegisterMe(he);
+      } else {
+        hel->RegisterMe(plep0);
       }
-      hel->RegisterMe(model);
       pmanager->AddDiscreteProcess(hel);
-      if(verbose > 1)
-        G4cout << "### HadronElasticPhysics added for " 
-               << particle->GetParticleName() << G4endl;
-
-      // proton case
-    } else if(pname == "proton") {
-      if(mname == "elastic") {
-        G4UHadronElasticProcess* h = new G4UHadronElasticProcess("hElastic");
-        h->SetQElasticCrossSection(man);
-        hel = h;
-        if(glFlag) hel->AddDataSet(new G4BGGNucleonElasticXS(particle));
-      } else {                   
-        hel = new G4HadronElasticProcess("hElastic");
+      if(verbose > 1) {
+        G4cout << "### HadronElasticPhysics: " << hel->GetProcessName()
+               << " added for " << particle->GetParticleName() << G4endl;
       }
-      hel->RegisterMe(model);
-      pmanager->AddDiscreteProcess(hel);
-      if(verbose > 1)
-        G4cout << "### HadronElasticPhysics added for " 
-               << particle->GetParticleName() << G4endl;
 
       // neutron case
     } else if(pname == "neutron") {   
 
-      if(mname == "elastic") {
-        G4UHadronElasticProcess* h = new G4UHadronElasticProcess("hElastic");
-        G4HadronElastic* nhe = new G4HadronElastic();
-        nhe->SetQModelLowLimit(0.0);
-        nhe->SetLowestEnergyLimit(0.0);
-        neutronModel = nhe;
-        h->SetQElasticCrossSection(nhe->GetCS());
-        hel = h;
-        if(glFlag) hel->AddDataSet(new G4BGGNucleonElasticXS(particle));
-      } else {                   
-        hel = new G4HadronElasticProcess("hElastic");
-        neutronModel = new G4LElastic();
-      }
+      G4ProcessManager* pmanager = particle->GetProcessManager();
+      G4WHadronElasticProcess* hel = new G4WHadronElasticProcess();
+      //hel->AddDataSet(new G4BGGNucleonElasticXS(particle));
+      hel->AddDataSet(new G4CHIPSElasticXS());
+      hel->RegisterMe(chipsn);
 
-      if(hpFlag) {
-        neutronModel->SetMinEnergy(19.5*MeV);
-        neutronHPModel = new G4NeutronHPElastic();
-        hel->RegisterMe(neutronHPModel);
-        hel->AddDataSet(new G4NeutronHPElasticData());
-      }
-
-      hel->RegisterMe(neutronModel);
       pmanager->AddDiscreteProcess(hel);
 
-      if(verbose > 1)
-        G4cout << "### HadronElasticPhysics added for " 
-               << particle->GetParticleName() << G4endl;
-
-      // pion case
-    } else if(pname == "pi+" || pname == "pi-") {
-      if(mname == "elastic") {
-        G4UHadronElasticProcess* h = new G4UHadronElasticProcess("hElastic");
-        h->SetQElasticCrossSection(man);
-        hel = h;
-        if(glFlag) hel->AddDataSet(new G4BGGPionElasticXS(particle));
-      } else {                   
-        hel = new G4HadronElasticProcess("hElastic");
+      if(verbose > 1) {
+        G4cout << "### HadronElasticPhysics: " << hel->GetProcessName()
+               << " added for " << particle->GetParticleName() << G4endl;
       }
-      hel->RegisterMe(model);
-      pmanager->AddDiscreteProcess(hel);
-
-      if(verbose > 1)
-        G4cout << "### HadronElasticPhysics added for " 
-               << particle->GetParticleName() << G4endl;
     }
   }

trunk/source/physics_lists/builders/src/G4HadronElasticPhysicsHP.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4HadronElasticPhysicsHP.cc,v 1.2 2010/06/03 14:28:32 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4HadronElasticPhysicsHP.cc,v 1.3 2010/09/23 18:53:20 vnivanch Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -64 +64 @@
 #include "G4BGGPionElasticXS.hh"
 #include "G4NeutronElasticXS.hh"
+#include "G4CHIPSElasticXS.hh"
 
 #include "G4NeutronHPElastic.hh"
@@ -149 +150 @@
       if(pname == "proton") { 
         hel->AddDataSet(new G4BGGNucleonElasticXS(particle));
+        hel->AddDataSet(new G4CHIPSElasticXS());
         hel->RegisterMe(chipsp);
       } else if (pname == "pi+" || pname == "pi-") { 
@@ -169 +171 @@
       G4WHadronElasticProcess* hel = new G4WHadronElasticProcess();
       hel->AddDataSet(new G4BGGNucleonElasticXS(particle));
+      hel->AddDataSet(new G4CHIPSElasticXS());
       hel->RegisterMe(chipsn);
 

trunk/source/physics_lists/builders/src/G4HadronHElasticPhysics.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4HadronHElasticPhysics.cc,v 1.9 2010/06/03 14:28:32 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4HadronHElasticPhysics.cc,v 1.10 2010/07/29 10:52:14 vnivanch Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -68 +68 @@
     wasActivated(false)
 {
-  if(verbose > 1) { 
-    G4cout << "### G4HadronHElasticPhysics: " << GetPhysicsName() 
-           << G4endl; 
-  }
+  //  if(verbose > 1) { 
+  G4cout << "### G4HadronHElasticPhysics: " << GetPhysicsName() 
+         << " is obsolete and soon will be removed" << G4endl; 
 }
 

trunk/source/physics_lists/builders/src/G4IonBinaryCascadePhysics.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4IonBinaryCascadePhysics.cc,v 1.3 2010/06/03 15:03:53 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4IonBinaryCascadePhysics.cc,v 1.4 2010/07/30 14:20:08 vnivanch Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -51 +51 @@
 #include "G4TripathiLightCrossSection.hh"
 #include "G4IonsShenCrossSection.hh"
+#include "G4IonProtonCrossSection.hh"
 
 #include "G4ParticleDefinition.hh"
@@ -84 +85 @@
     delete fTripathiLight;
     delete fShen;
+    delete fIonH;
     delete fLEDModel;
     delete fLETModel;
@@ -97 +99 @@
 void G4IonBinaryCascadePhysics::ConstructProcess()
 {
-  if(wasActivated) return;
+  if(wasActivated) { return; }
   wasActivated = true;
 
@@ -105 +107 @@
   fTripathi = new G4TripathiCrossSection;
   fTripathiLight = new G4TripathiLightCrossSection;
+  fIonH = new G4IonProtonCrossSection;
 
   fLEDModel = new G4LEDeuteronInelastic();
@@ -130 +133 @@
   hadi->AddDataSet(fTripathi);
   hadi->AddDataSet(fTripathiLight);
+  if(p == G4GenericIon::GenericIon()) { hadi->AddDataSet(fIonH); }
   hmodel->SetMinEnergy(eminBIC);
   hmodel->SetMaxEnergy(emax);

trunk/source/physics_lists/builders/src/G4IonQMDPhysics.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4IonQMDPhysics.cc,v 1.2 2010/06/03 15:03:53 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4IonQMDPhysics.cc,v 1.4 2010/09/30 21:23:05 gunter Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -118 +118 @@
   fLEAModel = new G4LEAlphaInelastic();
 
-  AddProcess("dInelastic", G4Deuteron::Deuteron(), fBC,0, fLEDModel);
-  AddProcess("tInelastic",G4Triton::Triton(),      fBC,0, fLETModel);
-  AddProcess("He3Inelastic",G4He3::He3(),          fBC,0, 0);
-  AddProcess("alphaInelastic", G4Alpha::Alpha(),   fBC,0, fLEAModel);
+  AddProcess("dInelastic", G4Deuteron::Deuteron(), fBC, fQMD, fLEDModel );
+  AddProcess("tInelastic",G4Triton::Triton(),      fBC, fQMD, fLETModel );
+  AddProcess("He3Inelastic",G4He3::He3(),          fBC, fQMD, 0 );
+  AddProcess("alphaInelastic", G4Alpha::Alpha(),   fBC, fQMD, fLEAModel );
   AddProcess("ionInelastic",G4GenericIon::GenericIon(), fBC, fQMD, 0);
 
@@ -147 +147 @@
   if(QMD) {
     QMD->SetMinEnergy(eminQMD);
-    BIC->SetMaxEnergy(eminQMD-overlap);
+    BIC->SetMaxEnergy(eminQMD+overlap);
     QMD->SetMaxEnergy(emaxQMD);
     hadi->RegisterMe(QMD);

trunk/source/physics_lists/builders/src/G4NeutronCrossSectionXS.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4NeutronCrossSectionXS.cc,v 1.3 2010/06/03 15:09:54 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4NeutronCrossSectionXS.cc,v 1.4 2010/07/29 10:52:14 vnivanch Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -41 +41 @@
 
 #include "G4NeutronCrossSectionXS.hh"
+#include "G4DataQuestionaire.hh"
 
 #include "G4NeutronInelasticXS.hh"
@@ -55 +56 @@
 G4NeutronCrossSectionXS::G4NeutronCrossSectionXS(G4int ver) :
   G4VPhysicsConstructor("NeutronXS"), verbose(ver) 
-{}
+{
+  G4DataQuestionaire q(no,no,no,no,no,neutronxs);
+}
 
 G4NeutronCrossSectionXS::~G4NeutronCrossSectionXS() 

trunk/source/physics_lists/builders/src/G4OpticalPhysics.cc

@@ -52 +52 @@
     fOpAbsorptionProcess(0),
     fOpRayleighScatteringProcess(0),
+    fOpMieHGScatteringProcess(0),
     fOpBoundaryProcess(0),
     fMaxNumPhotons(100),
@@ -59 +60 @@
     fSurfaceModel(unified),
     fProfile("delta"),
-    fTrackSecondariesFirst(true)
+    fTrackSecondariesFirst(true),
+    fScintillationByParticleType(false)
 {
   verboseLevel = verbose;
@@ -74 +76 @@
     fOpAbsorptionProcess(0),
     fOpRayleighScatteringProcess(0),
+    fOpMieHGScatteringProcess(0),
     fOpBoundaryProcess(0),
     fMaxNumPhotons(100),
@@ -81 +84 @@
     fSurfaceModel(unified),
     fProfile("delta"),
-    fTrackSecondariesFirst(true)
+    fTrackSecondariesFirst(true),
+    fScintillationByParticleType(false)
 {
   verboseLevel = verbose;
@@ -101 +105 @@
      delete fOpAbsorptionProcess;
      delete fOpRayleighScatteringProcess;
+     delete fOpMieHGScatteringProcess;
      delete fOpBoundaryProcess;
 
@@ -136 +141 @@
   fOpAbsorptionProcess  = new G4OpAbsorption();
   fOpRayleighScatteringProcess = new G4OpRayleigh();
+  fOpMieHGScatteringProcess = new G4OpMieHG();
 
   fOpBoundaryProcess    = new G4OpBoundaryProcess();
@@ -151 +157 @@
      G4Exception("G4OpticalPhysics::ConstructProcess()","",
                   FatalException,o.str().c_str());
+     return;
   }
 
   pManager->AddDiscreteProcess(fOpAbsorptionProcess);
   pManager->AddDiscreteProcess(fOpRayleighScatteringProcess);
+  pManager->AddDiscreteProcess(fOpMieHGScatteringProcess);
   pManager->AddDiscreteProcess(fOpBoundaryProcess);
   pManager->AddDiscreteProcess(fOpWLSProcess);
@@ -162 +170 @@
   fScintillationProcess->SetScintillationExcitationRatio(fExcitationRatio);
   fScintillationProcess->SetTrackSecondariesFirst(fTrackSecondariesFirst);
+  fScintillationProcess->SetScintillationByParticleType(fScintillationByParticleType);
 
   // Use Birks Correction in the Scintillation process
@@ -272 +281 @@
 }
 
+void G4OpticalPhysics::SetScintillationByParticleType(G4bool scintillationByParticleType)
+{
+  fScintillationByParticleType = scintillationByParticleType;
+
+  if (fScintillationProcess)
+     fScintillationProcess->SetScintillationByParticleType(scintillationByParticleType);
+}
+
 void G4OpticalPhysics::SetTrackSecondariesFirst(G4bool trackSecondariesFirst)
 {

trunk/source/physics_lists/builders/src/G4OpticalPhysicsMessenger.cc

@@ -55 +55 @@
     fSetCerenkovMaxBetaChangeCmd(0),
     fSetScintillationYieldFactorCmd(0),
+    fSetScintillationByParticleTypeCmd(0),
     fSetOpticalSurfaceModelCmd(0),
     fSetWLSTimeProfileCmd(0),
@@ -105 +106 @@
   fSetScintillationYieldFactorCmd->SetRange("ScintillationYieldFactor>=0");
   fSetScintillationYieldFactorCmd->AvailableForStates(G4State_Idle,G4State_GeomClosed,G4State_EventProc);
+
+  fSetScintillationByParticleTypeCmd
+   = new G4UIcmdWithABool("/optics_engine/setScintillationByParticleType", this);
+  fSetScintillationByParticleTypeCmd->SetGuidance("Activate/Inactivate scintillation process by particle type");
+  fSetScintillationByParticleTypeCmd->SetParameterName("ScintillationByParticleTypeActivation", false);
+  fSetScintillationByParticleTypeCmd->AvailableForStates(G4State_Idle,G4State_GeomClosed,G4State_EventProc);
 
   fSetOpticalSurfaceModelCmd 
@@ -141 +148 @@
   delete fSetCerenkovMaxBetaChangeCmd;
   delete fSetScintillationYieldFactorCmd;
+  delete fSetScintillationByParticleTypeCmd;
   delete fSetOpticalSurfaceModelCmd;
   delete fSetWLSTimeProfileCmd;
@@ -160 +168 @@
     else if ( newValue == "OpRayleigh" )    fSelectedProcess = fOpticalPhysics->
                                             GetOpRayleighProcess();
+    else if ( newValue == "OpMieHG" )       fSelectedProcess = fOpticalPhysics->
+                                            GetOpMieHGProcess();
     else if ( newValue == "OpBoundary" )    fSelectedProcess = fOpticalPhysics->
                                             GetOpBoundaryProcess();
@@ -208 +218 @@
       ->SetScintillationYieldFactor(
           fSetScintillationYieldFactorCmd->GetNewDoubleValue(newValue));
-  }  
+  }
+  else if (command == fSetScintillationByParticleTypeCmd) {
+    fOpticalPhysics
+      ->SetScintillationByParticleType(
+         fSetScintillationByParticleTypeCmd->GetNewBoolValue(newValue));
+  }
   else if (command == fSetOpticalSurfaceModelCmd) {
     if ( newValue == "glisur" ) {

trunk/source/physics_lists/lists/CVS/Entries

@@ -1 +1 @@
 D/include////
 D/src////
-/GNUmakefile/1.7/Thu Sep 30 06:15:17 2010//Tgeant4-09-04-beta-01
+/CMakeLists.txt/1.1/Wed Sep 29 18:51:11 2010//Tphys-lists-V09-03-34
+/GNUmakefile/1.7/Thu Sep 30 06:15:17 2010//Tphys-lists-V09-03-34
+/sources.cmake/1.1/Wed Sep 29 18:51:19 2010//Tphys-lists-V09-03-34

trunk/source/physics_lists/lists/CVS/Tag

@@ -1 @@
-Ngeant4-09-04-beta-01
+Nphys-lists-V09-03-34

trunk/source/physics_lists/lists/include/CHIPS.icc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: CHIPS.icc,v 1.10 2010/06/04 16:05:04 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: CHIPS.icc,v 1.11 2010/08/16 07:14:44 kurasige Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -35 +35 @@
 // Modified:
 // 04.06.2010 G.Folger: Use new ctor for builders
+// 16.08.2010 H.Kurashige: Remove inclusion of G4ParticleWithCuts 
 //
 //----------------------------------------------------------------------------
 //
 #include "globals.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4ParticleWithCuts.hh"
 #include "G4ProcessManager.hh"
 #include "G4ProcessVector.hh"

trunk/source/physics_lists/lists/include/CVS/Entries

@@ -1 @@
-/CHIPS.hh/1.1/Thu Sep 30 06:15:20 2010//Tgeant4-09-04-beta-01
-/CHIPS.icc/1.10/Thu Sep 30 06:15:20 2010//Tgeant4-09-04-beta-01
-/FTFC.hh/1.1/Thu Sep 30 06:15:20 2010//Tgeant4-09-04-beta-01
-/FTFC.icc/1.8/Thu Sep 30 06:15:20 2010//Tgeant4-09-04-beta-01
-/FTFP.hh/1.1/Thu Sep 30 06:15:20 2010//Tgeant4-09-04-beta-01
-/FTFP.icc/1.8/Thu Sep 30 06:15:20 2010//Tgeant4-09-04-beta-01
-/FTFP_BERT.hh/1.1/Thu Sep 30 06:15:20 2010//Tgeant4-09-04-beta-01
-/FTFP_BERT.icc/1.6/Thu Sep 30 06:15:20 2010//Tgeant4-09-04-beta-01
-/FTFP_BERT_EMV.hh/1.1/Thu Sep 30 06:15:20 2010//Tgeant4-09-04-beta-01
-/FTFP_BERT_EMV.icc/1.5/Thu Sep 30 06:15:21 2010//Tgeant4-09-04-beta-01
-/FTFP_BERT_EMX.hh/1.1/Thu Sep 30 06:15:21 2010//Tgeant4-09-04-beta-01
-/FTFP_BERT_EMX.icc/1.4/Thu Sep 30 06:15:21 2010//Tgeant4-09-04-beta-01
-/FTFP_BERT_TRV.hh/1.1/Thu Sep 30 06:15:21 2010//Tgeant4-09-04-beta-01
-/FTFP_BERT_TRV.icc/1.4/Thu Sep 30 06:15:21 2010//Tgeant4-09-04-beta-01
-/FTF_BIC.hh/1.1/Thu Sep 30 06:15:21 2010//Tgeant4-09-04-beta-01
-/FTF_BIC.icc/1.7/Thu Sep 30 06:15:21 2010//Tgeant4-09-04-beta-01
-/G4HadronInelasticQBBC.hh/1.14/Thu Sep 30 06:15:21 2010//Tgeant4-09-04-beta-01
-/G4HadronInelasticQLHEP.hh/1.2/Thu Sep 30 06:15:28 2010//Tgeant4-09-04-beta-01
-/G4PhysListFactory.hh/1.2/Thu Sep 30 06:15:28 2010//Tgeant4-09-04-beta-01
-/G4VHadronPhysics.hh/1.1/Thu Sep 30 06:15:28 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsCHIPS.hh/1.3/Thu Sep 30 06:15:28 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsFTFC.hh/1.4/Thu Sep 30 06:15:28 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsFTFP.hh/1.4/Thu Sep 30 06:15:28 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsFTFP_BERT.hh/1.5/Thu Sep 30 06:15:28 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsFTFP_BERT_TRV.hh/1.2/Thu Sep 30 06:15:28 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsFTF_BIC.hh/1.4/Thu Sep 30 06:15:28 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsLHEP.hh/1.2/Thu Sep 30 06:15:29 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsLHEP_BERT.hh/1.2/Thu Sep 30 06:15:29 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsLHEP_BERT_HP.hh/1.2/Thu Sep 30 06:15:29 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsLHEP_EMV.hh/1.2/Thu Sep 30 06:15:29 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsLHEP_PRECO_HP.hh/1.2/Thu Sep 30 06:15:29 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsQGSC.hh/1.3/Thu Sep 30 06:15:29 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsQGSC_BERT.hh/1.3/Thu Sep 30 06:15:29 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsQGSC_CHIPS.hh/1.7/Thu Sep 30 06:15:29 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsQGSC_EFLOW.hh/1.3/Thu Sep 30 06:15:30 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsQGSC_QGSC.hh/1.5/Thu Sep 30 06:15:30 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsQGSP.hh/1.5/Thu Sep 30 06:15:30 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsQGSP_BERT.hh/1.4/Thu Sep 30 06:15:30 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsQGSP_BERT_CHIPS.hh/1.2/Thu Sep 30 06:15:30 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsQGSP_BERT_HP.hh/1.5/Thu Sep 30 06:15:30 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsQGSP_BERT_NOLEP.hh/1.2/Thu Sep 30 06:15:30 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsQGSP_BERT_TRV.hh/1.2/Thu Sep 30 06:15:30 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsQGSP_BIC.hh/1.3/Thu Sep 30 06:15:30 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsQGSP_BIC_HP.hh/1.3/Thu Sep 30 06:15:30 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsQGSP_FTFP_BERT.hh/1.3/Thu Sep 30 06:15:30 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsQGSP_INCL_ABLA.hh/1.2/Thu Sep 30 06:15:30 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsQGS_BIC.hh/1.2/Thu Sep 30 06:15:30 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsShielding.hh/1.1/Thu Sep 30 06:15:30 2010//Tgeant4-09-04-beta-01
-/LBE.hh/1.2/Thu Sep 30 06:15:30 2010//Tgeant4-09-04-beta-01
-/LBE.icc/1.4/Thu Sep 30 06:15:31 2010//Tgeant4-09-04-beta-01
-/LHEP.hh/1.1/Thu Sep 30 06:15:31 2010//Tgeant4-09-04-beta-01
-/LHEP.icc/1.5/Thu Sep 30 06:15:31 2010//Tgeant4-09-04-beta-01
-/LHEP_BERT.hh/1.1/Thu Sep 30 06:15:39 2010//Tgeant4-09-04-beta-01
-/LHEP_BERT.icc/1.5/Thu Sep 30 06:15:39 2010//Tgeant4-09-04-beta-01
-/LHEP_BERT_HP.hh/1.1/Thu Sep 30 06:15:39 2010//Tgeant4-09-04-beta-01
-/LHEP_BERT_HP.icc/1.5/Thu Sep 30 06:15:39 2010//Tgeant4-09-04-beta-01
-/LHEP_EMV.hh/1.1/Thu Sep 30 06:15:39 2010//Tgeant4-09-04-beta-01
-/LHEP_EMV.icc/1.5/Thu Sep 30 06:15:39 2010//Tgeant4-09-04-beta-01
-/LHEP_PRECO_HP.hh/1.1/Thu Sep 30 06:15:39 2010//Tgeant4-09-04-beta-01
-/LHEP_PRECO_HP.icc/1.5/Thu Sep 30 06:15:39 2010//Tgeant4-09-04-beta-01
-/MaxTimeCuts.hh/1.1/Thu Sep 30 06:15:39 2010//Tgeant4-09-04-beta-01
-/MinEkineCuts.hh/1.1/Thu Sep 30 06:15:40 2010//Tgeant4-09-04-beta-01
-/QBBC.hh/1.3/Thu Sep 30 06:15:40 2010//Tgeant4-09-04-beta-01
-/QGSC.hh/1.1/Thu Sep 30 06:15:40 2010//Tgeant4-09-04-beta-01
-/QGSC.icc/1.10/Thu Sep 30 06:15:40 2010//Tgeant4-09-04-beta-01
-/QGSC_BERT.hh/1.1/Thu Sep 30 06:15:40 2010//Tgeant4-09-04-beta-01
-/QGSC_BERT.icc/1.3/Thu Sep 30 06:15:40 2010//Tgeant4-09-04-beta-01
-/QGSC_CHIPS.hh/1.3/Thu Sep 30 06:15:40 2010//Tgeant4-09-04-beta-01
-/QGSC_CHIPS.icc/1.5/Thu Sep 30 06:15:40 2010//Tgeant4-09-04-beta-01
-/QGSC_EMV.hh/1.1/Thu Sep 30 06:15:40 2010//Tgeant4-09-04-beta-01
-/QGSC_EMV.icc/1.6/Thu Sep 30 06:15:40 2010//Tgeant4-09-04-beta-01
-/QGSC_QGSC.hh/1.3/Thu Sep 30 06:15:40 2010//Tgeant4-09-04-beta-01
-/QGSC_QGSC.icc/1.3/Thu Sep 30 06:15:40 2010//Tgeant4-09-04-beta-01
-/QGSP.hh/1.1/Thu Sep 30 06:15:40 2010//Tgeant4-09-04-beta-01
-/QGSP.icc/1.11/Thu Sep 30 06:15:40 2010//Tgeant4-09-04-beta-01
-/QGSP_BERT.hh/1.1/Thu Sep 30 06:15:40 2010//Tgeant4-09-04-beta-01
-/QGSP_BERT.icc/1.7/Thu Sep 30 06:15:40 2010//Tgeant4-09-04-beta-01
-/QGSP_BERT_CHIPS.hh/1.1/Thu Sep 30 06:15:40 2010//Tgeant4-09-04-beta-01
-/QGSP_BERT_CHIPS.icc/1.4/Thu Sep 30 06:15:40 2010//Tgeant4-09-04-beta-01
-/QGSP_BERT_DIF.hh/1.1/Thu Sep 30 06:15:40 2010//Tgeant4-09-04-beta-01
-/QGSP_BERT_DIF.icc/1.4/Thu Sep 30 06:15:40 2010//Tgeant4-09-04-beta-01
-/QGSP_BERT_EMV.hh/1.1/Thu Sep 30 06:15:40 2010//Tgeant4-09-04-beta-01
-/QGSP_BERT_EMV.icc/1.6/Thu Sep 30 06:15:40 2010//Tgeant4-09-04-beta-01
-/QGSP_BERT_EMX.hh/1.1/Thu Sep 30 06:15:40 2010//Tgeant4-09-04-beta-01
-/QGSP_BERT_EMX.icc/1.4/Thu Sep 30 06:15:40 2010//Tgeant4-09-04-beta-01
-/QGSP_BERT_HP.hh/1.1/Thu Sep 30 06:15:40 2010//Tgeant4-09-04-beta-01
-/QGSP_BERT_HP.icc/1.6/Thu Sep 30 06:15:40 2010//Tgeant4-09-04-beta-01
-/QGSP_BERT_NOLEP.hh/1.1/Thu Sep 30 06:15:40 2010//Tgeant4-09-04-beta-01
-/QGSP_BERT_NOLEP.icc/1.5/Thu Sep 30 06:15:41 2010//Tgeant4-09-04-beta-01
-/QGSP_BERT_NQE.hh/1.1/Thu Sep 30 06:15:41 2010//Tgeant4-09-04-beta-01
-/QGSP_BERT_NQE.icc/1.4/Thu Sep 30 06:15:41 2010//Tgeant4-09-04-beta-01
-/QGSP_BERT_TRV.hh/1.1/Thu Sep 30 06:15:41 2010//Tgeant4-09-04-beta-01
-/QGSP_BERT_TRV.icc/1.6/Thu Sep 30 06:15:41 2010//Tgeant4-09-04-beta-01
-/QGSP_BIC.hh/1.1/Thu Sep 30 06:15:41 2010//Tgeant4-09-04-beta-01
-/QGSP_BIC.icc/1.7/Thu Sep 30 06:15:41 2010//Tgeant4-09-04-beta-01
-/QGSP_BIC_EMY.hh/1.1/Thu Sep 30 06:15:41 2010//Tgeant4-09-04-beta-01
-/QGSP_BIC_EMY.icc/1.4/Thu Sep 30 06:15:41 2010//Tgeant4-09-04-beta-01
-/QGSP_BIC_HP.hh/1.1/Thu Sep 30 06:15:41 2010//Tgeant4-09-04-beta-01
-/QGSP_BIC_HP.icc/1.7/Thu Sep 30 06:15:41 2010//Tgeant4-09-04-beta-01
-/QGSP_DIF.hh/1.1/Thu Sep 30 06:15:41 2010//Tgeant4-09-04-beta-01
-/QGSP_DIF.icc/1.3/Thu Sep 30 06:15:41 2010//Tgeant4-09-04-beta-01
-/QGSP_EMV.hh/1.1/Thu Sep 30 06:15:41 2010//Tgeant4-09-04-beta-01
-/QGSP_EMV.icc/1.8/Thu Sep 30 06:15:41 2010//Tgeant4-09-04-beta-01
-/QGSP_EMV_NQE.hh/1.1/Thu Sep 30 06:15:41 2010//Tgeant4-09-04-beta-01
-/QGSP_EMV_NQE.icc/1.4/Thu Sep 30 06:15:41 2010//Tgeant4-09-04-beta-01
-/QGSP_FTFP_BERT.hh/1.1/Thu Sep 30 06:15:41 2010//Tgeant4-09-04-beta-01
-/QGSP_FTFP_BERT.icc/1.5/Thu Sep 30 06:15:41 2010//Tgeant4-09-04-beta-01
-/QGSP_INCL_ABLA.hh/1.1/Thu Sep 30 06:15:41 2010//Tgeant4-09-04-beta-01
-/QGSP_INCL_ABLA.icc/1.5/Thu Sep 30 06:15:41 2010//Tgeant4-09-04-beta-01
-/QGSP_NQE.hh/1.1/Thu Sep 30 06:15:41 2010//Tgeant4-09-04-beta-01
-/QGSP_NQE.icc/1.4/Thu Sep 30 06:15:41 2010//Tgeant4-09-04-beta-01
-/QGSP_QEL.hh/1.1/Thu Sep 30 06:15:41 2010//Tgeant4-09-04-beta-01
-/QGSP_QEL.icc/1.5/Thu Sep 30 06:15:41 2010//Tgeant4-09-04-beta-01
-/QGS_BIC.hh/1.1/Thu Sep 30 06:15:41 2010//Tgeant4-09-04-beta-01
-/QGS_BIC.icc/1.4/Thu Sep 30 06:15:42 2010//Tgeant4-09-04-beta-01
-/Shielding.hh/1.1/Thu Sep 30 06:15:42 2010//Tgeant4-09-04-beta-01
-/Shielding.icc/1.1/Thu Sep 30 06:15:42 2010//Tgeant4-09-04-beta-01
-/SpecialCuts.hh/1.1/Thu Sep 30 06:15:42 2010//Tgeant4-09-04-beta-01
+/CHIPS.hh/1.1/Thu Sep 30 06:15:20 2010//Tphys-lists-V09-03-34
+/FTFC.hh/1.1/Thu Sep 30 06:15:20 2010//Tphys-lists-V09-03-34
+/FTFP.hh/1.1/Thu Sep 30 06:15:20 2010//Tphys-lists-V09-03-34
+/FTFP_BERT.hh/1.1/Thu Sep 30 06:15:20 2010//Tphys-lists-V09-03-34
+/FTFP_BERT_EMV.hh/1.1/Thu Sep 30 06:15:20 2010//Tphys-lists-V09-03-34
+/FTFP_BERT_EMX.hh/1.1/Thu Sep 30 06:15:21 2010//Tphys-lists-V09-03-34
+/FTFP_BERT_TRV.hh/1.1/Thu Sep 30 06:15:21 2010//Tphys-lists-V09-03-34
+/FTF_BIC.hh/1.1/Thu Sep 30 06:15:21 2010//Tphys-lists-V09-03-34
+/G4HadronInelasticQBBC.hh/1.14/Thu Sep 30 06:15:21 2010//Tphys-lists-V09-03-34
+/G4HadronInelasticQLHEP.hh/1.2/Thu Sep 30 06:15:28 2010//Tphys-lists-V09-03-34
+/G4PhysListFactory.hh/1.2/Thu Sep 30 06:15:28 2010//Tphys-lists-V09-03-34
+/G4VHadronPhysics.hh/1.1/Thu Sep 30 06:15:28 2010//Tphys-lists-V09-03-34
+/HadronPhysicsCHIPS.hh/1.3/Thu Sep 30 06:15:28 2010//Tphys-lists-V09-03-34
+/HadronPhysicsFTFC.hh/1.4/Thu Sep 30 06:15:28 2010//Tphys-lists-V09-03-34
+/HadronPhysicsFTFP.hh/1.4/Thu Sep 30 06:15:28 2010//Tphys-lists-V09-03-34
+/HadronPhysicsFTFP_BERT.hh/1.5/Thu Sep 30 06:15:28 2010//Tphys-lists-V09-03-34
+/HadronPhysicsFTFP_BERT_TRV.hh/1.2/Thu Sep 30 06:15:28 2010//Tphys-lists-V09-03-34
+/HadronPhysicsFTF_BIC.hh/1.4/Thu Sep 30 06:15:28 2010//Tphys-lists-V09-03-34
+/HadronPhysicsLHEP.hh/1.2/Thu Sep 30 06:15:29 2010//Tphys-lists-V09-03-34
+/HadronPhysicsLHEP_BERT.hh/1.2/Thu Sep 30 06:15:29 2010//Tphys-lists-V09-03-34
+/HadronPhysicsLHEP_BERT_HP.hh/1.2/Thu Sep 30 06:15:29 2010//Tphys-lists-V09-03-34
+/HadronPhysicsLHEP_EMV.hh/1.2/Thu Sep 30 06:15:29 2010//Tphys-lists-V09-03-34
+/HadronPhysicsLHEP_PRECO_HP.hh/1.2/Thu Sep 30 06:15:29 2010//Tphys-lists-V09-03-34
+/HadronPhysicsQGSC.hh/1.3/Thu Sep 30 06:15:29 2010//Tphys-lists-V09-03-34
+/HadronPhysicsQGSC_BERT.hh/1.3/Thu Sep 30 06:15:29 2010//Tphys-lists-V09-03-34
+/HadronPhysicsQGSC_CHIPS.hh/1.7/Thu Sep 30 06:15:29 2010//Tphys-lists-V09-03-34
+/HadronPhysicsQGSC_EFLOW.hh/1.3/Thu Sep 30 06:15:30 2010//Tphys-lists-V09-03-34
+/HadronPhysicsQGSC_QGSC.hh/1.5/Thu Sep 30 06:15:30 2010//Tphys-lists-V09-03-34
+/HadronPhysicsQGSP.hh/1.5/Thu Sep 30 06:15:30 2010//Tphys-lists-V09-03-34
+/HadronPhysicsQGSP_BERT.hh/1.4/Thu Sep 30 06:15:30 2010//Tphys-lists-V09-03-34
+/HadronPhysicsQGSP_BERT_CHIPS.hh/1.2/Thu Sep 30 06:15:30 2010//Tphys-lists-V09-03-34
+/HadronPhysicsQGSP_BERT_HP.hh/1.5/Thu Sep 30 06:15:30 2010//Tphys-lists-V09-03-34
+/HadronPhysicsQGSP_BERT_NOLEP.hh/1.2/Thu Sep 30 06:15:30 2010//Tphys-lists-V09-03-34
+/HadronPhysicsQGSP_BERT_TRV.hh/1.2/Thu Sep 30 06:15:30 2010//Tphys-lists-V09-03-34
+/HadronPhysicsQGSP_BIC.hh/1.3/Thu Sep 30 06:15:30 2010//Tphys-lists-V09-03-34
+/HadronPhysicsQGSP_BIC_HP.hh/1.3/Thu Sep 30 06:15:30 2010//Tphys-lists-V09-03-34
+/HadronPhysicsQGSP_FTFP_BERT.hh/1.3/Thu Sep 30 06:15:30 2010//Tphys-lists-V09-03-34
+/HadronPhysicsQGSP_INCL_ABLA.hh/1.2/Thu Sep 30 06:15:30 2010//Tphys-lists-V09-03-34
+/HadronPhysicsQGS_BIC.hh/1.2/Thu Sep 30 06:15:30 2010//Tphys-lists-V09-03-34
+/HadronPhysicsShielding.hh/1.1/Thu Sep 30 06:15:30 2010//Tphys-lists-V09-03-34
+/LBE.hh/1.2/Thu Sep 30 06:15:30 2010//Tphys-lists-V09-03-34
+/LBE.icc/1.6/Thu Nov  4 14:51:32 2010//Tphys-lists-V09-03-34
+/LHEP.hh/1.1/Thu Sep 30 06:15:31 2010//Tphys-lists-V09-03-34
+/LHEP_BERT.hh/1.1/Thu Sep 30 06:15:39 2010//Tphys-lists-V09-03-34
+/LHEP_BERT_HP.hh/1.1/Thu Sep 30 06:15:39 2010//Tphys-lists-V09-03-34
+/LHEP_EMV.hh/1.1/Thu Sep 30 06:15:39 2010//Tphys-lists-V09-03-34
+/LHEP_PRECO_HP.hh/1.1/Thu Sep 30 06:15:39 2010//Tphys-lists-V09-03-34
+/MaxTimeCuts.hh/1.1/Thu Sep 30 06:15:39 2010//Tphys-lists-V09-03-34
+/MinEkineCuts.hh/1.1/Thu Sep 30 06:15:40 2010//Tphys-lists-V09-03-34
+/QBBC.hh/1.3/Thu Sep 30 06:15:40 2010//Tphys-lists-V09-03-34
+/QGSC.hh/1.1/Thu Sep 30 06:15:40 2010//Tphys-lists-V09-03-34
+/QGSC_BERT.hh/1.1/Thu Sep 30 06:15:40 2010//Tphys-lists-V09-03-34
+/QGSC_CHIPS.hh/1.3/Thu Sep 30 06:15:40 2010//Tphys-lists-V09-03-34
+/QGSC_EMV.hh/1.1/Thu Sep 30 06:15:40 2010//Tphys-lists-V09-03-34
+/QGSC_QGSC.hh/1.3/Thu Sep 30 06:15:40 2010//Tphys-lists-V09-03-34
+/QGSP.hh/1.1/Thu Sep 30 06:15:40 2010//Tphys-lists-V09-03-34
+/QGSP_BERT.hh/1.1/Thu Sep 30 06:15:40 2010//Tphys-lists-V09-03-34
+/QGSP_BERT_CHIPS.hh/1.1/Thu Sep 30 06:15:40 2010//Tphys-lists-V09-03-34
+/QGSP_BERT_DIF.hh/1.1/Thu Sep 30 06:15:40 2010//Tphys-lists-V09-03-34
+/QGSP_BERT_EMV.hh/1.1/Thu Sep 30 06:15:40 2010//Tphys-lists-V09-03-34
+/QGSP_BERT_EMX.hh/1.1/Thu Sep 30 06:15:40 2010//Tphys-lists-V09-03-34
+/QGSP_BERT_HP.hh/1.1/Thu Sep 30 06:15:40 2010//Tphys-lists-V09-03-34
+/QGSP_BERT_NOLEP.hh/1.1/Thu Sep 30 06:15:40 2010//Tphys-lists-V09-03-34
+/QGSP_BERT_NQE.hh/1.1/Thu Sep 30 06:15:41 2010//Tphys-lists-V09-03-34
+/QGSP_BERT_TRV.hh/1.1/Thu Sep 30 06:15:41 2010//Tphys-lists-V09-03-34
+/QGSP_BIC.hh/1.1/Thu Sep 30 06:15:41 2010//Tphys-lists-V09-03-34
+/QGSP_BIC_EMY.hh/1.1/Thu Sep 30 06:15:41 2010//Tphys-lists-V09-03-34
+/QGSP_BIC_HP.hh/1.1/Thu Sep 30 06:15:41 2010//Tphys-lists-V09-03-34
+/QGSP_DIF.hh/1.1/Thu Sep 30 06:15:41 2010//Tphys-lists-V09-03-34
+/QGSP_EMV.hh/1.1/Thu Sep 30 06:15:41 2010//Tphys-lists-V09-03-34
+/QGSP_EMV_NQE.hh/1.1/Thu Sep 30 06:15:41 2010//Tphys-lists-V09-03-34
+/QGSP_FTFP_BERT.hh/1.1/Thu Sep 30 06:15:41 2010//Tphys-lists-V09-03-34
+/QGSP_INCL_ABLA.hh/1.1/Thu Sep 30 06:15:41 2010//Tphys-lists-V09-03-34
+/QGSP_NQE.hh/1.1/Thu Sep 30 06:15:41 2010//Tphys-lists-V09-03-34
+/QGSP_QEL.hh/1.1/Thu Sep 30 06:15:41 2010//Tphys-lists-V09-03-34
+/QGS_BIC.hh/1.1/Thu Sep 30 06:15:41 2010//Tphys-lists-V09-03-34
+/Shielding.hh/1.1/Thu Sep 30 06:15:42 2010//Tphys-lists-V09-03-34
+/SpecialCuts.hh/1.1/Thu Sep 30 06:15:42 2010//Tphys-lists-V09-03-34
+/CHIPS.icc/1.11/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/FTFC.icc/1.9/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/FTFP.icc/1.9/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/FTFP_BERT.icc/1.7/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/FTFP_BERT_EMV.icc/1.6/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/FTFP_BERT_EMX.icc/1.5/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/FTFP_BERT_TRV.icc/1.5/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/FTF_BIC.icc/1.8/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/LHEP.icc/1.6/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/LHEP_BERT.icc/1.6/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/LHEP_BERT_HP.icc/1.6/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/LHEP_EMV.icc/1.6/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/LHEP_PRECO_HP.icc/1.6/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/QGSC.icc/1.11/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/QGSC_BERT.icc/1.4/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/QGSC_CHIPS.icc/1.6/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/QGSC_EMV.icc/1.7/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/QGSC_QGSC.icc/1.4/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/QGSP.icc/1.12/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/QGSP_BERT.icc/1.8/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/QGSP_BERT_CHIPS.icc/1.5/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/QGSP_BERT_DIF.icc/1.5/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/QGSP_BERT_EMV.icc/1.8/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/QGSP_BERT_EMX.icc/1.5/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/QGSP_BERT_HP.icc/1.7/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/QGSP_BERT_NOLEP.icc/1.6/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/QGSP_BERT_NQE.icc/1.5/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/QGSP_BERT_TRV.icc/1.7/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/QGSP_BIC.icc/1.8/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/QGSP_BIC_EMY.icc/1.5/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/QGSP_BIC_HP.icc/1.8/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/QGSP_DIF.icc/1.4/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/QGSP_EMV.icc/1.9/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/QGSP_EMV_NQE.icc/1.5/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/QGSP_FTFP_BERT.icc/1.6/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/QGSP_INCL_ABLA.icc/1.6/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/QGSP_NQE.icc/1.5/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/QGSP_QEL.icc/1.6/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/QGS_BIC.icc/1.5/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/Shielding.icc/1.2/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
 D

trunk/source/physics_lists/lists/include/CVS/Tag

@@ -1 @@
-Ngeant4-09-04-beta-01
+Nphys-lists-V09-03-34

trunk/source/physics_lists/lists/include/FTFC.icc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: FTFC.icc,v 1.8 2010/06/03 15:46:04 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: FTFC.icc,v 1.9 2010/08/16 07:14:44 kurasige Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -43 +43 @@
 // 16.05.2007 V.Ivanchenko: rename EM builders
 // 19.06.2008 G.Folger: don't use chips quasielastic for FTF 
+// 16.08.2010 H.Kurashige: Remove inclusion of G4ParticleWithCuts 
 //
 //----------------------------------------------------------------------------
@@ -48 +49 @@
  
 #include "globals.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4ParticleWithCuts.hh"
 #include "G4ProcessManager.hh"
 #include "G4ProcessVector.hh"

trunk/source/physics_lists/lists/include/FTFP.icc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: FTFP.icc,v 1.8 2010/06/03 15:46:04 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: FTFP.icc,v 1.9 2010/08/16 07:14:44 kurasige Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -43 +43 @@
 // 19.06.2008 G.Folger: don't use chips quasielastic in FTF
 // 27.11.2009 G.Folger: Mark as obsolete
+// 16.08.2010 H.Kurashige: Remove inclusion of G4ParticleWithCuts 
 //
 //----------------------------------------------------------------------------
@@ -48 +49 @@
 
 #include "globals.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4ParticleWithCuts.hh"
 #include "G4ProcessManager.hh"
 #include "G4ProcessVector.hh"

trunk/source/physics_lists/lists/include/FTFP_BERT.icc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: FTFP_BERT.icc,v 1.6 2010/06/04 16:05:04 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: FTFP_BERT.icc,v 1.7 2010/08/16 07:14:44 kurasige Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -39 +39 @@
 // 27.11.2009 G.Folger: Remobe experimental status
 // 04.06.2010 G.Folger: Use new ctor for builders
+// 16.08.2010 H.Kurashige: Remove inclusion of G4ParticleWithCuts 
 //
 //----------------------------------------------------------------------------
@@ -44 +45 @@
 
 #include "globals.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4ParticleWithCuts.hh"
 #include "G4ProcessManager.hh"
 #include "G4ProcessVector.hh"

trunk/source/physics_lists/lists/include/FTFP_BERT_EMV.icc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: FTFP_BERT_EMV.icc,v 1.5 2010/06/08 08:58:16 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: FTFP_BERT_EMV.icc,v 1.6 2010/08/16 07:14:44 kurasige Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -37 +37 @@
 // 27.11.2009 G.Folger: Remove experimental status
 // 04.06.2010 G.Folger: Use new ctor for builders
+// 16.08.2010 H.Kurashige: Remove inclusion of G4ParticleWithCuts 
 //
 //----------------------------------------------------------------------------
@@ -42 +43 @@
 
 #include "globals.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4ParticleWithCuts.hh"
 #include "G4ProcessManager.hh"
 #include "G4ProcessVector.hh"

trunk/source/physics_lists/lists/include/FTFP_BERT_EMX.icc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: FTFP_BERT_EMX.icc,v 1.4 2010/06/08 08:58:31 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: FTFP_BERT_EMX.icc,v 1.5 2010/08/16 07:14:44 kurasige Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -36 +36 @@
 // Modified:
 // 04.06.2010 G.Folger: Use new ctor for builders
+// 16.08.2010 H.Kurashige: Remove inclusion of G4ParticleWithCuts 
 //
 //----------------------------------------------------------------------------
@@ -41 +42 @@
 
 #include "globals.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4ParticleWithCuts.hh"
 #include "G4ProcessManager.hh"
 #include "G4ProcessVector.hh"

trunk/source/physics_lists/lists/include/FTFP_BERT_TRV.icc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: FTFP_BERT_TRV.icc,v 1.4 2010/06/04 16:05:04 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: FTFP_BERT_TRV.icc,v 1.5 2010/08/16 07:14:44 kurasige Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -34 +34 @@
 //
 //   created from FTFP_BERT - simple variant changing inelastic thresholds
+// 16.08.2010 H.Kurashige: Remove inclusion of G4ParticleWithCuts 
+//
 //
 //----------------------------------------------------------------------------
@@ -39 +41 @@
 
 #include "globals.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4ParticleWithCuts.hh"
 #include "G4ProcessManager.hh"
 #include "G4ProcessVector.hh"

trunk/source/physics_lists/lists/include/FTF_BIC.icc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: FTF_BIC.icc,v 1.7 2010/06/04 16:05:04 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: FTF_BIC.icc,v 1.8 2010/08/16 07:14:44 kurasige Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -36 +36 @@
 // 19.06.2008 G.Folger: don't use chips quasielastic in FTF
 // 04.06.2010 G.Folger: Use new ctor for builders
+// 16.08.2010 H.Kurashige: Remove inclusion of G4ParticleWithCuts 
 //
 //----------------------------------------------------------------------------
 //
 #include "globals.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4ParticleWithCuts.hh"
 #include "G4ProcessManager.hh"
 #include "G4ProcessVector.hh"

trunk/source/physics_lists/lists/include/LBE.icc

@@ -46 +46 @@
 //
 // 14-02-03 Fix bugs in msc and hIon instanciation + cut per region
-//
+// 16-08-10 Remove inclusion of obsolete class of G4ParticleWithCuts 
+// 20-10-10 Migrate LowEnergy process to Livermore models, LP
+// 
 // --------------------------------------------------------------
 
@@ -54 +56 @@
 #include "G4ProcessVector.hh"
 
-#include "G4ParticleDefinition.hh"
-#include "G4ParticleWithCuts.hh"
 #include "G4ParticleTypes.hh"
 #include "G4ParticleTable.hh"
@@ -235 +235 @@
 #include "G4hMultipleScattering.hh"
 
-// gamma
-#include "G4LowEnergyRayleigh.hh" 
-#include "G4LowEnergyPhotoElectric.hh"
-#include "G4LowEnergyCompton.hh"  
-#include "G4LowEnergyGammaConversion.hh" 
+// gamma. Use Livermore models
+#include "G4PhotoElectricEffect.hh"
+#include "G4LivermorePhotoElectricModel.hh"
+#include "G4ComptonScattering.hh"
+#include "G4LivermoreComptonModel.hh"
+#include "G4GammaConversion.hh"
+#include "G4LivermoreGammaConversionModel.hh"
+#include "G4RayleighScattering.hh" 
+#include "G4LivermoreRayleighModel.hh"
 
 
 // e-
-#include "G4LowEnergyIonisation.hh" 
-#include "G4LowEnergyBremsstrahlung.hh" 
+#include "G4eMultipleScattering.hh"
+#include "G4UniversalFluctuation.hh"
+#include "G4UrbanMscModel93.hh"
+
+#include "G4eIonisation.hh"
+#include "G4LivermoreIonisationModel.hh"
+
+#include "G4eBremsstrahlung.hh"
+#include "G4LivermoreBremsstrahlungModel.hh"
 
 // e+
-#include "G4eIonisation.hh" 
-#include "G4eBremsstrahlung.hh" 
 #include "G4eplusAnnihilation.hh"
 
 
 // alpha and GenericIon and deuterons, triton, He3:
-#include "G4hLowEnergyIonisation.hh"
+#include "G4ionIonisation.hh"
+#include "G4hIonisation.hh"
+#include "G4hBremsstrahlung.hh"
+//
+#include "G4IonParametrisedLossModel.hh"
+#include "G4NuclearStopping.hh"
 #include "G4EnergyLossTables.hh"
-// hLowEnergyIonisation uses Ziegler 1988 as the default
+
+
+// msc models
+#include "G4UrbanMscModel93.hh"
 
 
@@ -269 +286 @@
  template<class T> void TLBE<T>::ConstructEM() {
 
-// processes:
-
-  G4LowEnergyPhotoElectric* lowePhot = new G4LowEnergyPhotoElectric();
-  G4LowEnergyIonisation* loweIon  = new G4LowEnergyIonisation();
-  G4LowEnergyBremsstrahlung* loweBrem = new G4LowEnergyBremsstrahlung();
-
-  // note LowEIon uses proton as basis for its data-base, therefore
-  // cannot specify different LowEnergyIonisation models for different
-  // particles, but can change model globally for Ion, Alpha and Proton.
-
-
-  //fluorescence apply specific cut for fluorescence from photons, electrons
-  //and bremsstrahlung photons:
-  G4double fluorcut = 250*eV;
-  lowePhot->SetCutForLowEnSecPhotons(fluorcut);
-  loweIon->SetCutForLowEnSecPhotons(fluorcut);
-  loweBrem->SetCutForLowEnSecPhotons(fluorcut);
-  
-  // setting tables explicitly for electronic stopping power
-  //  ahadronLowEIon->SetElectronicStoppingPowerModel
-  //  (G4GenericIon::GenericIonDefinition(), "ICRU_R49p") ;
-  //  ahadronLowEIon->SetElectronicStoppingPowerModel
-  //  (G4Proton::ProtonDefinition(), "ICRU_R49p") ;
-
-  // Switch off the Barkas and Bloch corrections
-  //  ahadronLowEIon->SetBarkasOff();
-
-
+ // models & processes:
+ // Use Livermore models up to 20 MeV, and standard 
+ // models for higher energy
+ G4double LivermoreHighEnergyLimit = 20*MeV;
+ //
   this->theParticleIterator->reset();
   while( (*(this->theParticleIterator))() ){
@@ -307 +301 @@
     if (particleName == "gamma") 
       {
-        //gamma
-        pmanager->AddDiscreteProcess(new G4LowEnergyRayleigh());
-        pmanager->AddDiscreteProcess(lowePhot);
-        pmanager->AddDiscreteProcess(new G4LowEnergyCompton());
-        pmanager->AddDiscreteProcess(new G4LowEnergyGammaConversion());
+      G4PhotoElectricEffect* thePhotoElectricEffect = new G4PhotoElectricEffect();
+      G4LivermorePhotoElectricModel* theLivermorePhotoElectricModel = 
+        new G4LivermorePhotoElectricModel();
+      theLivermorePhotoElectricModel->SetHighEnergyLimit(LivermoreHighEnergyLimit);
+      thePhotoElectricEffect->AddEmModel(0, theLivermorePhotoElectricModel);
+      pmanager->AddDiscreteProcess(thePhotoElectricEffect);
+
+      G4ComptonScattering* theComptonScattering = new G4ComptonScattering();
+      G4LivermoreComptonModel* theLivermoreComptonModel = 
+        new G4LivermoreComptonModel();
+      theLivermoreComptonModel->SetHighEnergyLimit(LivermoreHighEnergyLimit);
+      theComptonScattering->AddEmModel(0, theLivermoreComptonModel);
+      pmanager->AddDiscreteProcess(theComptonScattering);
+
+      G4GammaConversion* theGammaConversion = new G4GammaConversion();
+      G4LivermoreGammaConversionModel* theLivermoreGammaConversionModel = 
+        new G4LivermoreGammaConversionModel();
+      theLivermoreGammaConversionModel->SetHighEnergyLimit(LivermoreHighEnergyLimit);
+      theGammaConversion->AddEmModel(0, theLivermoreGammaConversionModel);
+      pmanager->AddDiscreteProcess(theGammaConversion);
+
+      G4RayleighScattering* theRayleigh = new G4RayleighScattering();
+      G4LivermoreRayleighModel* theRayleighModel = new G4LivermoreRayleighModel();
+      theRayleighModel->SetHighEnergyLimit(LivermoreHighEnergyLimit);
+      theRayleigh->AddEmModel(0, theRayleighModel);
+      pmanager->AddDiscreteProcess(theRayleigh);
+
       } 
     else if (particleName == "e-") 
       {
-        //electron
-        // process ordering: AddProcess(name, at rest, along step, post step)
-        // -1 = not implemented, then ordering
-        G4eMultipleScattering* aMultipleScattering = new G4eMultipleScattering();
-        pmanager->AddProcess(aMultipleScattering,     -1, 1, 1);
-        pmanager->AddProcess(loweIon,                 -1, 2, 2);
-        pmanager->AddProcess(loweBrem,                -1,-1, 3);
+       //electron
+       // process ordering: AddProcess(name, at rest, along step, post step)
+       // -1 = not implemented, then ordering
+        G4eMultipleScattering* msc = new G4eMultipleScattering();     
+        msc->AddEmModel(0, new G4UrbanMscModel93());
+        msc->SetStepLimitType(fUseDistanceToBoundary);
+        pmanager->AddProcess(msc,                   -1, 1, 1);
+      
+       // Ionisation
+       G4eIonisation* eIoni = new G4eIonisation();
+       G4LivermoreIonisationModel* theIoniLivermore = new
+        G4LivermoreIonisationModel();
+       theIoniLivermore->SetHighEnergyLimit(1*MeV); 
+       eIoni->AddEmModel(0, theIoniLivermore, new G4UniversalFluctuation() );
+       eIoni->SetStepFunction(0.2, 100*um); //     
+       pmanager->AddProcess(eIoni,                 -1, 2, 2);
+      
+       // Bremsstrahlung
+       G4eBremsstrahlung* eBrem = new G4eBremsstrahlung();
+       G4LivermoreBremsstrahlungModel* theBremLivermore = new
+         G4LivermoreBremsstrahlungModel();
+       theBremLivermore->SetHighEnergyLimit(LivermoreHighEnergyLimit);
+       eBrem->AddEmModel(0, theBremLivermore);
+       pmanager->AddProcess(eBrem, -1,-3, 3);   
       } 
     else if (particleName == "e+") 
       {
         //positron
-        G4eMultipleScattering* aMultipleScattering = new G4eMultipleScattering();
-        pmanager->AddProcess(aMultipleScattering,     -1, 1, 1);
-        pmanager->AddProcess(new G4eIonisation(),     -1, 2, 2);
-        pmanager->AddProcess(new G4eBremsstrahlung(), -1,-1, 3);
-        pmanager->AddProcess(new G4eplusAnnihilation(),0,-1, 4);      
+      G4eMultipleScattering* msc = new G4eMultipleScattering();
+      msc->AddEmModel(0, new G4UrbanMscModel93());      
+      msc->SetStepLimitType(fUseDistanceToBoundary);
+      pmanager->AddProcess(msc,                   -1, 1, 1);
+      G4eIonisation* eIoni = new G4eIonisation();
+      eIoni->SetStepFunction(0.2, 100*um);      
+      pmanager->AddProcess(eIoni,                 -1, 2, 2);
+      pmanager->AddProcess(new G4eBremsstrahlung, -1,-3, 3);      
+      pmanager->AddProcess(new G4eplusAnnihilation,0,-1, 4);
       } 
     else if( particleName == "mu+" || 
@@ -344 +381 @@
           pmanager->AddProcess(new G4MuonMinusCaptureAtRest(), 0,-1,-1);
       } 
-    else if (particleName == "proton"     ||
-             particleName == "alpha"      ||
+    else if (particleName == "GenericIon")
+    {
+      pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
+      G4ionIonisation* ionIoni = new G4ionIonisation();
+      ionIoni->SetEmModel(new G4IonParametrisedLossModel());
+      ionIoni->SetStepFunction(0.1, 10*um);
+      pmanager->AddProcess(ionIoni,                   -1, 2, 2);
+      pmanager->AddProcess(new G4NuclearStopping(),   -1, 3,-1);        
+    }
+    else if (particleName == "alpha" || particleName == "He3")
+    {
+      //MSC, ion-Ionisation, Nuclear Stopping
+      pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
+
+      G4ionIonisation* ionIoni = new G4ionIonisation();
+      ionIoni->SetStepFunction(0.1, 20*um);
+      pmanager->AddProcess(ionIoni,                   -1, 2, 2);
+      pmanager->AddProcess(new G4NuclearStopping(),   -1, 3,-1);
+    }
+    else if (particleName == "proton"     ||      
              particleName == "deuteron"   ||
              particleName == "triton"     ||
-             particleName == "He3"        ||
-             particleName == "GenericIon" || 
-             (particleType == "nucleus" && charge != 0)) 
+             particleName == "pi+" ||
+             particleName == "pi-" ||
+             particleName == "kaon+" ||
+             particleName == "kaon-") 
       {
-        // OBJECT may be dynamically created as either a GenericIon or nucleus
-        // G4Nucleus exists and therefore has particle type nucleus
-        // genericIon:
-        G4hMultipleScattering* aMultipleScattering = new G4hMultipleScattering();
-        G4hLowEnergyIonisation* ahadronLowEIon = new G4hLowEnergyIonisation();
-        pmanager->AddProcess(aMultipleScattering,-1,1,1);
-        pmanager->AddProcess(ahadronLowEIon,-1,2,2); 
-        // ahadronLowEIon->SetNuclearStoppingOff() ;
-        //        ahadronLowEIon->SetNuclearStoppingPowerModel("ICRU_R49") ;
-        //        ahadronLowEIon->SetNuclearStoppingOn() ;
-  
-        //fluorescence switch off for hadrons (for now) PIXE:
-        ahadronLowEIon->SetFluorescence(false);
+       //MSC, h-ionisation, bremsstrahlung
+       pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);      
+       G4hIonisation* hIoni = new G4hIonisation();
+       hIoni->SetStepFunction(0.2, 50*um);
+       pmanager->AddProcess(hIoni,                     -1, 2, 2);      
+       pmanager->AddProcess(new G4hBremsstrahlung,     -1,-3, 3);    
       } 
     else if ((!particle->IsShortLived()) &&
@@ -371 +420 @@
       {
         //all others charged particles except geantino
-        G4hMultipleScattering* aMultipleScattering = new G4hMultipleScattering();
-        G4hLowEnergyIonisation* ahadronLowEIon = new G4hLowEnergyIonisation();
-        pmanager->AddProcess(aMultipleScattering,-1,1,1);
-        pmanager->AddProcess(ahadronLowEIon,       -1,2,2);      
-        //      pmanager->AddProcess(new G4hIonisation(),       -1,2,2);      
+        pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
+        pmanager->AddProcess(new G4hIonisation,         -1, 2, 2);
       }
     

trunk/source/physics_lists/lists/include/LHEP.icc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: LHEP.icc,v 1.5 2010/06/04 16:05:04 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: LHEP.icc,v 1.6 2010/08/16 07:14:44 kurasige Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -40 +40 @@
 // 16.05.2007 V.Ivanchenko: rename EM builders
 // 04.06.2010 G.Folger: Use new ctor for builders
+// 16.08.2010 H.Kurashige: Remove inclusion of G4ParticleWithCuts 
 //
 //----------------------------------------------------------------------------
 //
 #include "globals.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4ParticleWithCuts.hh"
 #include "G4ProcessManager.hh"
 #include "G4ProcessVector.hh"

trunk/source/physics_lists/lists/include/LHEP_BERT.icc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: LHEP_BERT.icc,v 1.5 2010/06/03 15:46:04 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: LHEP_BERT.icc,v 1.6 2010/08/16 07:14:44 kurasige Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -40 +40 @@
 // 14.06.2006 G.Folger: Migrate to HadronElasticPhysics using G4LElastic
 // 16.05.2007 V.Ivanchenko: rename EM builders
+// 16.08.2010 H.Kurashige: Remove inclusion of G4ParticleWithCuts 
 //
 //----------------------------------------------------------------------------
@@ -45 +46 @@
 
 #include "globals.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4ParticleWithCuts.hh"
 #include "G4ProcessManager.hh"
 #include "G4ProcessVector.hh"

trunk/source/physics_lists/lists/include/LHEP_BERT_HP.icc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: LHEP_BERT_HP.icc,v 1.5 2010/06/03 15:46:04 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: LHEP_BERT_HP.icc,v 1.6 2010/08/16 07:14:44 kurasige Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -40 +40 @@
 // 14.06.2006 G.Folger: Migrate to HadronElasticPhysics using G4LElastic
 // 16.05.2007 V.Ivanchenko: rename EM builders
+// 16.08.2010 H.Kurashige: Remove inclusion of G4ParticleWithCuts 
 //
 //----------------------------------------------------------------------------
@@ -45 +46 @@
 
 #include "globals.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4ParticleWithCuts.hh"
 #include "G4ProcessManager.hh"
 #include "G4ProcessVector.hh"

trunk/source/physics_lists/lists/include/LHEP_EMV.icc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: LHEP_EMV.icc,v 1.5 2010/06/04 16:05:04 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: LHEP_EMV.icc,v 1.6 2010/08/16 07:14:44 kurasige Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -39 +39 @@
 // 16.05.2007 V.Ivanchenko: rename EM builders
 // 04.06.2010 G.Folger: Use new ctor for builders
+// 16.08.2010 H.Kurashige: Remove inclusion of G4ParticleWithCuts 
 //
 //----------------------------------------------------------------------------
@@ -44 +45 @@
 
 #include "globals.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4ParticleWithCuts.hh"
 #include "G4ProcessManager.hh"
 #include "G4ProcessVector.hh"

trunk/source/physics_lists/lists/include/LHEP_PRECO_HP.icc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: LHEP_PRECO_HP.icc,v 1.5 2010/06/03 15:46:04 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: LHEP_PRECO_HP.icc,v 1.6 2010/08/16 07:14:44 kurasige Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -39 +39 @@
 // 14.06.2006 G.Folger: Migrate to HadronElasticPhysics using G4LElastic
 // 16.05.2007 V.Ivanchenko: rename EM builders
+// 16.08.2010 H.Kurashige: Remove inclusion of G4ParticleWithCuts 
 //
 //----------------------------------------------------------------------------
@@ -44 +45 @@
 
 #include "globals.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4ParticleWithCuts.hh"
 #include "G4ProcessManager.hh"
 #include "G4ProcessVector.hh"

trunk/source/physics_lists/lists/include/QGSC.icc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: QGSC.icc,v 1.10 2010/06/03 15:46:04 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: QGSC.icc,v 1.11 2010/08/16 07:14:44 kurasige Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -44 +44 @@
 // 16.05.2007 V.Ivanchenko: rename EM builders
 // 27.11.2009 G.Folger: Mark as obsolete
+// 16.08.2010 H.Kurashige: Remove inclusion of G4ParticleWithCuts 
+//
 //
 //----------------------------------------------------------------------------
 //
 #include "globals.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4ParticleWithCuts.hh"
 #include "G4ProcessManager.hh"
 #include "G4ProcessVector.hh"

trunk/source/physics_lists/lists/include/QGSC_BERT.icc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: QGSC_BERT.icc,v 1.3 2010/06/04 16:05:04 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: QGSC_BERT.icc,v 1.4 2010/08/16 07:14:44 kurasige Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -36 +36 @@
 // Modified:
 // 04.06.2010 G.Folger: Use new ctor for builders
+// 16.08.2010 H.Kurashige: Remove inclusion of G4ParticleWithCuts 
 //
 //----------------------------------------------------------------------------
 //
 #include "globals.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4ParticleWithCuts.hh"
 #include "G4ProcessManager.hh"
 #include "G4ProcessVector.hh"

trunk/source/physics_lists/lists/include/QGSC_CHIPS.icc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: QGSC_CHIPS.icc,v 1.5 2010/06/07 15:34:32 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: QGSC_CHIPS.icc,v 1.6 2010/08/16 07:14:44 kurasige Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -35 +35 @@
 // Modified:
 // 27.11.2009 G.Folger: Mark as obsolete
+// 16.08.2010 H.Kurashige: Remove inclusion of G4ParticleWithCuts 
 //
 //-------------------------------------------------------------------------------
@@ -46 +47 @@
 //  interaction is temporary taken from the QGSC algorithm, which is not expected
 //  to work at low energies, but temporary can be used as an interface to CHIPS.
-//-------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 
 #include "globals.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4ParticleWithCuts.hh"
 #include "G4ProcessManager.hh"
 #include "G4ProcessVector.hh"

trunk/source/physics_lists/lists/include/QGSC_EMV.icc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: QGSC_EMV.icc,v 1.6 2010/06/03 15:46:04 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: QGSC_EMV.icc,v 1.7 2010/08/16 07:14:44 kurasige Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -41 +41 @@
 // 16.05.2007 V.Ivanchenko: rename EM builders
 // 27.11.2009 G.Folger: Mark as obsolete
+// 16.08.2010 H.Kurashige: Remove inclusion of G4ParticleWithCuts 
 //
 //----------------------------------------------------------------------------
 //
 #include "globals.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4ParticleWithCuts.hh"
 #include "G4ProcessManager.hh"
 #include "G4ProcessVector.hh"

trunk/source/physics_lists/lists/include/QGSC_QGSC.icc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: QGSC_QGSC.icc,v 1.3 2010/06/03 15:46:04 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: QGSC_QGSC.icc,v 1.4 2010/08/16 07:14:44 kurasige Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -35 +35 @@
 // Modified:
 // 27.11.2009 G.Folger: Mark as obsolete
+// 16.08.2010 H.Kurashige: Remove inclusion of G4ParticleWithCuts 
 //
 //----------------------------------------------------------------------------
 //
 #include "globals.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4ParticleWithCuts.hh"
 #include "G4ProcessManager.hh"
 #include "G4ProcessVector.hh"

trunk/source/physics_lists/lists/include/QGSP.icc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: QGSP.icc,v 1.11 2010/06/07 15:34:32 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: QGSP.icc,v 1.12 2010/08/16 07:14:44 kurasige Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -43 +43 @@
 // 27.11.2009 G.Folger: Mark as obsolete
 // 04.06.2010 G.Folger: Mark as replaced, use new ctor for Builders
+// 16.08.2010 H.Kurashige: Remove inclusion of G4ParticleWithCuts 
 //
 //----------------------------------------------------------------------------
@@ -48 +49 @@
 
 #include "globals.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4ParticleWithCuts.hh"
 #include "G4ProcessManager.hh"
 #include "G4ProcessVector.hh"

trunk/source/physics_lists/lists/include/QGSP_BERT.icc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: QGSP_BERT.icc,v 1.7 2010/06/04 16:05:04 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: QGSP_BERT.icc,v 1.8 2010/08/16 07:14:44 kurasige Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -43 +43 @@
 // 16.05.2007 V.Ivanchenko: rename EM builders
 // 04.06.2010 G.Folger: Use new ctor for builders
+// 16.08.2010 H.Kurashige: Remove inclusion of G4ParticleWithCuts 
 //
 //----------------------------------------------------------------------------
@@ -48 +49 @@
 
 #include "globals.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4ParticleWithCuts.hh"
 #include "G4ProcessManager.hh"
 #include "G4ProcessVector.hh"

trunk/source/physics_lists/lists/include/QGSP_BERT_CHIPS.icc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: QGSP_BERT_CHIPS.icc,v 1.4 2010/06/04 16:05:04 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: QGSP_BERT_CHIPS.icc,v 1.5 2010/08/16 07:14:44 kurasige Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -36 +36 @@
 // Modified:
 // 04.06.2010 G.Folger: Use new ctor for builders
+// 16.08.2010 H.Kurashige: Remove inclusion of G4ParticleWithCuts 
 //
 //----------------------------------------------------------------------------
@@ -41 +42 @@
 
 #include "globals.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4ParticleWithCuts.hh"
 #include "G4ProcessManager.hh"
 #include "G4ProcessVector.hh"

trunk/source/physics_lists/lists/include/QGSP_BERT_DIF.icc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: QGSP_BERT_DIF.icc,v 1.4 2010/06/03 15:46:04 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: QGSP_BERT_DIF.icc,v 1.5 2010/08/16 07:14:44 kurasige Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -36 +36 @@
 // Modified:
 // 18.05.2009 G.Folger: obsoleted
+// 16.08.2010 H.Kurashige: Remove inclusion of G4ParticleWithCuts 
 //
 //----------------------------------------------------------------------------
@@ -41 +42 @@
 
 #include "globals.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4ParticleWithCuts.hh"
 #include "G4ProcessManager.hh"
 #include "G4ProcessVector.hh"

trunk/source/physics_lists/lists/include/QGSP_BERT_EMV.icc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: QGSP_BERT_EMV.icc,v 1.6 2010/06/07 15:34:32 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: QGSP_BERT_EMV.icc,v 1.8 2010/08/16 07:14:44 kurasige Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -36 +36 @@
 // Modified:
 // 04.06.2010 G.Folger: Use new ctor for builders
+// 16.08.2010 H.Kurashige: Remove inclusion of G4ParticleWithCuts 
 //
 //----------------------------------------------------------------------------
@@ -41 +42 @@
 
 #include "globals.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4ParticleWithCuts.hh"
 #include "G4ProcessManager.hh"
 #include "G4ProcessVector.hh"
@@ -59 +58 @@
 #include "G4QStoppingPhysics.hh"
 #include "G4HadronElasticPhysics.hh"
-#include "G4HadronHElasticPhysics.hh"
 #include "G4NeutronTrackingCut.hh"
 
@@ -85 +83 @@
 
    // Hadron Elastic scattering
-  this->RegisterPhysics( new G4HadronHElasticPhysics(ver) );
+  this->RegisterPhysics( new G4HadronElasticPhysics(ver) );
 
   // Hadron Physics

trunk/source/physics_lists/lists/include/QGSP_BERT_EMX.icc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: QGSP_BERT_EMX.icc,v 1.4 2010/06/04 16:05:04 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: QGSP_BERT_EMX.icc,v 1.5 2010/08/16 07:14:44 kurasige Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -37 +37 @@
 // 27.11.2009 G.Folger: Mark as experimental
 // 04.06.2010 G.Folger: Use new ctor for builders
+// 16.08.2010 H.Kurashige: Remove inclusion of G4ParticleWithCuts 
 //
 //----------------------------------------------------------------------------
@@ -42 +43 @@
 
 #include "globals.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4ParticleWithCuts.hh"
 #include "G4ProcessManager.hh"
 #include "G4ProcessVector.hh"

trunk/source/physics_lists/lists/include/QGSP_BERT_HP.icc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: QGSP_BERT_HP.icc,v 1.6 2010/06/04 16:05:04 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: QGSP_BERT_HP.icc,v 1.7 2010/08/16 07:14:44 kurasige Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -41 +41 @@
 // 16.05.2007 V.Ivanchenko: rename EM builders
 // 04.06.2010 G.Folger: Use new ctor for builders
-// 
+// 16.08.2010 H.Kurashige: Remove inclusion of G4ParticleWithCuts 
+//
+//----------------------------------------------------------------------------
+//
 
 #include "globals.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4ParticleWithCuts.hh"
 #include "G4ProcessManager.hh"
 #include "G4ProcessVector.hh"

trunk/source/physics_lists/lists/include/QGSP_BERT_NOLEP.icc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: QGSP_BERT_NOLEP.icc,v 1.5 2010/06/07 15:34:32 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: QGSP_BERT_NOLEP.icc,v 1.6 2010/08/16 07:14:44 kurasige Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -38 +38 @@
 // 27.11.2009 G.Folger, Use QElastic directly
 // 04.06.2010 G.Folger: Use new ctor for builders
+// 16.08.2010 H.Kurashige: Remove inclusion of G4ParticleWithCuts 
 //
 //----------------------------------------------------------------------------
@@ -43 +44 @@
 
 #include "globals.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4ParticleWithCuts.hh"
 #include "G4ProcessManager.hh"
 #include "G4ProcessVector.hh"

trunk/source/physics_lists/lists/include/QGSP_BERT_NQE.icc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: QGSP_BERT_NQE.icc,v 1.4 2010/06/03 15:46:04 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: QGSP_BERT_NQE.icc,v 1.5 2010/08/16 07:14:44 kurasige Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -37 +37 @@
 // 18.05.2009 G.Folger: obsoleted
 // 16.05.2007 V.Ivanchenko: rename EM builders
+// 16.08.2010 H.Kurashige: Remove inclusion of G4ParticleWithCuts 
 //
 //----------------------------------------------------------------------------
@@ -42 +43 @@
 
 #include "globals.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4ParticleWithCuts.hh"
 #include "G4ProcessManager.hh"
 #include "G4ProcessVector.hh"

trunk/source/physics_lists/lists/include/QGSP_BERT_TRV.icc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: QGSP_BERT_TRV.icc,v 1.6 2010/06/07 15:34:32 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: QGSP_BERT_TRV.icc,v 1.7 2010/08/16 07:14:44 kurasige Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -38 +38 @@
 // 27.11.2009 G.Folger: Mark as experimental
 // 04.06.2010 G.Folger: Use new ctor for builders
+// 16.08.2010 H.Kurashige: Remove inclusion of G4ParticleWithCuts 
 //
 //----------------------------------------------------------------------------
@@ -43 +44 @@
 
 #include "globals.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4ParticleWithCuts.hh"
 #include "G4ProcessManager.hh"
 #include "G4ProcessVector.hh"

trunk/source/physics_lists/lists/include/QGSP_BIC.icc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: QGSP_BIC.icc,v 1.7 2010/06/04 16:05:04 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: QGSP_BIC.icc,v 1.8 2010/08/16 07:14:44 kurasige Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -43 +43 @@
 // 26.04.2007 G.Folger: Enable quasielastic for QGS string model
 // 16.05.2007 V.Ivanchenko: rename EM builders
+// 16.08.2010 H.Kurashige: Remove inclusion of G4ParticleWithCuts 
 //
 //----------------------------------------------------------------------------
 //
 #include "globals.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4ParticleWithCuts.hh"
 #include "G4ProcessManager.hh"
 #include "G4ProcessVector.hh"

trunk/source/physics_lists/lists/include/QGSP_BIC_EMY.icc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: QGSP_BIC_EMY.icc,v 1.4 2010/06/07 15:34:32 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: QGSP_BIC_EMY.icc,v 1.5 2010/08/16 07:14:44 kurasige Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -36 +36 @@
 // Modified:
 // 04.06.2010 G.Folger: Use new ctor for builders
+// 16.08.2010 H.Kurashige: Remove inclusion of G4ParticleWithCuts 
 //
 //----------------------------------------------------------------------------
 //
 #include "globals.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4ParticleWithCuts.hh"
 #include "G4ProcessManager.hh"
 #include "G4ProcessVector.hh"

trunk/source/physics_lists/lists/include/QGSP_BIC_HP.icc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: QGSP_BIC_HP.icc,v 1.7 2010/06/04 16:05:04 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: QGSP_BIC_HP.icc,v 1.8 2010/08/16 07:14:44 kurasige Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -38 +38 @@
 // 16.05.2007 V.Ivanchenko: rename EM builders
 // 04.06.2010 G.Folger: Use new ctor for builders
+// 16.08.2010 H.Kurashige: Remove inclusion of G4ParticleWithCuts 
 //
 //----------------------------------------------------------------------------
 //
 #include "globals.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4ParticleWithCuts.hh"
 #include "G4ProcessManager.hh"
 #include "G4ProcessVector.hh"

trunk/source/physics_lists/lists/include/QGSP_DIF.icc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: QGSP_DIF.icc,v 1.3 2010/06/03 15:46:04 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: QGSP_DIF.icc,v 1.4 2010/08/16 07:14:44 kurasige Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -36 +36 @@
 // Modified:
 // 18.05.2009 G.Folger: obsoleted
+// 16.08.2010 H.Kurashige: Remove inclusion of G4ParticleWithCuts 
 //
 //----------------------------------------------------------------------------
@@ -41 +42 @@
 
 #include "globals.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4ParticleWithCuts.hh"
 #include "G4ProcessManager.hh"
 #include "G4ProcessVector.hh"

trunk/source/physics_lists/lists/include/QGSP_EMV.icc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: QGSP_EMV.icc,v 1.8 2010/06/03 15:46:04 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: QGSP_EMV.icc,v 1.9 2010/08/16 07:14:44 kurasige Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -47 +47 @@
 //    - use HadronPhysicsQGSP, not HadronPhysicsQGSP_EMV, code is equivalent
 // 16.05.2007 V.Ivanchenko: rename EM builders
+// 16.08.2010 H.Kurashige: Remove inclusion of G4ParticleWithCuts 
 //
 //----------------------------------------------------------------------------
@@ -52 +53 @@
 
 #include "globals.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4ParticleWithCuts.hh"
 #include "G4ProcessManager.hh"
 #include "G4ProcessVector.hh"

trunk/source/physics_lists/lists/include/QGSP_EMV_NQE.icc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: QGSP_EMV_NQE.icc,v 1.4 2010/06/03 15:46:04 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: QGSP_EMV_NQE.icc,v 1.5 2010/08/16 07:14:44 kurasige Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -37 +37 @@
 // 18.05.2009 G.Folger: obsoleted
 // 16.05.2007 V.Ivanchenko: rename EM builders
+// 16.08.2010 H.Kurashige: Remove inclusion of G4ParticleWithCuts 
 //
 //----------------------------------------------------------------------------
@@ -42 +43 @@
 
 #include "globals.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4ParticleWithCuts.hh"
 #include "G4ProcessManager.hh"
 #include "G4ProcessVector.hh"

trunk/source/physics_lists/lists/include/QGSP_FTFP_BERT.icc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: QGSP_FTFP_BERT.icc,v 1.5 2010/06/04 16:05:04 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: QGSP_FTFP_BERT.icc,v 1.6 2010/08/16 07:14:44 kurasige Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -37 +37 @@
 // 04.06.2010 G.Folger: Use new ctor for builders
 // 04.06.2010 G.Folger: Remove experimental status
+// 16.08.2010 H.Kurashige: Remove inclusion of G4ParticleWithCuts 
 //
 //----------------------------------------------------------------------------
@@ -42 +43 @@
 
 #include "globals.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4ParticleWithCuts.hh"
 #include "G4ProcessManager.hh"
 #include "G4ProcessVector.hh"

trunk/source/physics_lists/lists/include/QGSP_INCL_ABLA.icc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: QGSP_INCL_ABLA.icc,v 1.5 2010/06/04 16:05:04 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: QGSP_INCL_ABLA.icc,v 1.6 2010/08/16 07:14:44 kurasige Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -37 +37 @@
 // 27.11.2009 G.Folger: Mark as experimental
 // 04.06.2010 G.Folger: Use new ctor for builders
+// 16.08.2010 H.Kurashige: Remove inclusion of G4ParticleWithCuts 
 //
 //----------------------------------------------------------------------------
@@ -42 +43 @@
 
 #include "globals.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4ParticleWithCuts.hh"
 #include "G4ProcessManager.hh"
 #include "G4ProcessVector.hh"

trunk/source/physics_lists/lists/include/QGSP_NQE.icc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: QGSP_NQE.icc,v 1.4 2010/06/03 15:46:04 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: QGSP_NQE.icc,v 1.5 2010/08/16 07:14:44 kurasige Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -37 +37 @@
 // 18.05.2009 G.Folger: obsoleted
 // 16.05.2007 V.Ivanchenko: rename EM builders
+// 16.08.2010 H.Kurashige: Remove inclusion of G4ParticleWithCuts 
 //
 //----------------------------------------------------------------------------
@@ -42 +43 @@
 
 #include "globals.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4ParticleWithCuts.hh"
 #include "G4ProcessManager.hh"
 #include "G4ProcessVector.hh"

trunk/source/physics_lists/lists/include/QGSP_QEL.icc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: QGSP_QEL.icc,v 1.5 2010/06/03 15:46:04 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: QGSP_QEL.icc,v 1.6 2010/08/16 07:14:44 kurasige Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -39 +39 @@
 // 26.04.2007 G.Folger: Enable quasielastic for QGS string model
 // 16.05.2007 V.Ivanchenko: rename EM builders
+// 16.08.2010 H.Kurashige: Remove inclusion of G4ParticleWithCuts 
 //
 //----------------------------------------------------------------------------
@@ -44 +45 @@
 
 #include "globals.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4ParticleWithCuts.hh"
 #include "G4ProcessManager.hh"
 #include "G4ProcessVector.hh"

trunk/source/physics_lists/lists/include/QGS_BIC.icc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: QGS_BIC.icc,v 1.4 2010/06/04 16:05:04 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: QGS_BIC.icc,v 1.5 2010/08/16 07:14:44 kurasige Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -36 +36 @@
 // Modified:
 // 04.06.2010 G.Folger: Use new ctor for builders
+// 16.08.2010 H.Kurashige: Remove inclusion of G4ParticleWithCuts 
 //
 //----------------------------------------------------------------------------
 //
 #include "globals.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4ParticleWithCuts.hh"
 #include "G4ProcessManager.hh"
 #include "G4ProcessVector.hh"

trunk/source/physics_lists/lists/src/CVS/Entries

@@ -1 @@
-/G4HadronInelasticQBBC.cc/1.28/Thu Sep 30 06:15:42 2010//Tgeant4-09-04-beta-01
-/G4HadronInelasticQLHEP.cc/1.4/Thu Sep 30 06:15:45 2010//Tgeant4-09-04-beta-01
-/G4PhysListFactory.cc/1.14/Thu Sep 30 06:15:45 2010//Tgeant4-09-04-beta-01
-/G4VHadronPhysics.cc/1.3/Thu Sep 30 06:15:45 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsCHIPS.cc/1.3/Thu Sep 30 06:15:45 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsFTFC.cc/1.3/Thu Sep 30 06:15:45 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsFTFP.cc/1.3/Thu Sep 30 06:15:46 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsFTFP_BERT.cc/1.4/Thu Sep 30 06:15:46 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsFTFP_BERT_TRV.cc/1.2/Thu Sep 30 06:15:46 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsFTF_BIC.cc/1.3/Thu Sep 30 06:15:46 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsLHEP.cc/1.2/Thu Sep 30 06:15:46 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsLHEP_BERT.cc/1.2/Thu Sep 30 06:15:46 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsLHEP_BERT_HP.cc/1.2/Thu Sep 30 06:15:48 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsLHEP_EMV.cc/1.2/Thu Sep 30 06:15:48 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsLHEP_PRECO_HP.cc/1.2/Thu Sep 30 06:15:48 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsQGSC.cc/1.4/Thu Sep 30 06:15:48 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsQGSC_BERT.cc/1.2/Thu Sep 30 06:15:48 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsQGSC_CHIPS.cc/1.7/Thu Sep 30 06:15:48 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsQGSC_EFLOW.cc/1.3/Thu Sep 30 06:15:48 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsQGSC_QGSC.cc/1.5/Thu Sep 30 06:15:49 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsQGSP.cc/1.5/Thu Sep 30 06:15:49 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsQGSP_BERT.cc/1.5/Thu Sep 30 06:15:49 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsQGSP_BERT_CHIPS.cc/1.2/Thu Sep 30 06:15:49 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsQGSP_BERT_HP.cc/1.3/Thu Sep 30 06:15:49 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsQGSP_BERT_NOLEP.cc/1.2/Thu Sep 30 06:15:49 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsQGSP_BERT_TRV.cc/1.3/Thu Sep 30 06:15:49 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsQGSP_BIC.cc/1.3/Thu Sep 30 06:15:49 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsQGSP_BIC_HP.cc/1.4/Thu Sep 30 06:15:49 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsQGSP_FTFP_BERT.cc/1.4/Thu Sep 30 06:15:49 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsQGSP_INCL_ABLA.cc/1.2/Thu Sep 30 06:15:49 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsQGS_BIC.cc/1.2/Thu Sep 30 06:15:49 2010//Tgeant4-09-04-beta-01
-/HadronPhysicsShielding.cc/1.1/Thu Sep 30 06:15:49 2010//Tgeant4-09-04-beta-01
-/MaxTimeCuts.cc/1.1/Thu Sep 30 06:15:49 2010//Tgeant4-09-04-beta-01
-/MinEkineCuts.cc/1.2/Thu Sep 30 06:15:49 2010//Tgeant4-09-04-beta-01
-/QBBC.cc/1.7/Thu Sep 30 06:15:49 2010//Tgeant4-09-04-beta-01
-/SpecialCuts.cc/1.1/Thu Sep 30 06:15:49 2010//Tgeant4-09-04-beta-01
+/G4HadronInelasticQBBC.cc/1.28/Thu Sep 30 06:15:42 2010//Tphys-lists-V09-03-34
+/G4HadronInelasticQLHEP.cc/1.4/Thu Sep 30 06:15:45 2010//Tphys-lists-V09-03-34
+/G4VHadronPhysics.cc/1.3/Thu Sep 30 06:15:45 2010//Tphys-lists-V09-03-34
+/HadronPhysicsCHIPS.cc/1.3/Thu Sep 30 06:15:45 2010//Tphys-lists-V09-03-34
+/HadronPhysicsFTFC.cc/1.3/Thu Sep 30 06:15:45 2010//Tphys-lists-V09-03-34
+/HadronPhysicsFTFP.cc/1.3/Thu Sep 30 06:15:46 2010//Tphys-lists-V09-03-34
+/HadronPhysicsFTFP_BERT.cc/1.4/Thu Sep 30 06:15:46 2010//Tphys-lists-V09-03-34
+/HadronPhysicsFTFP_BERT_TRV.cc/1.2/Thu Sep 30 06:15:46 2010//Tphys-lists-V09-03-34
+/HadronPhysicsFTF_BIC.cc/1.3/Thu Sep 30 06:15:46 2010//Tphys-lists-V09-03-34
+/HadronPhysicsLHEP.cc/1.2/Thu Sep 30 06:15:46 2010//Tphys-lists-V09-03-34
+/HadronPhysicsLHEP_BERT.cc/1.2/Thu Sep 30 06:15:46 2010//Tphys-lists-V09-03-34
+/HadronPhysicsLHEP_BERT_HP.cc/1.2/Thu Sep 30 06:15:48 2010//Tphys-lists-V09-03-34
+/HadronPhysicsLHEP_EMV.cc/1.2/Thu Sep 30 06:15:48 2010//Tphys-lists-V09-03-34
+/HadronPhysicsLHEP_PRECO_HP.cc/1.2/Thu Sep 30 06:15:48 2010//Tphys-lists-V09-03-34
+/HadronPhysicsQGSC.cc/1.4/Thu Sep 30 06:15:48 2010//Tphys-lists-V09-03-34
+/HadronPhysicsQGSC_BERT.cc/1.2/Thu Sep 30 06:15:48 2010//Tphys-lists-V09-03-34
+/HadronPhysicsQGSC_CHIPS.cc/1.7/Thu Sep 30 06:15:48 2010//Tphys-lists-V09-03-34
+/HadronPhysicsQGSC_EFLOW.cc/1.3/Thu Sep 30 06:15:48 2010//Tphys-lists-V09-03-34
+/HadronPhysicsQGSC_QGSC.cc/1.5/Thu Sep 30 06:15:49 2010//Tphys-lists-V09-03-34
+/HadronPhysicsQGSP.cc/1.5/Thu Sep 30 06:15:49 2010//Tphys-lists-V09-03-34
+/HadronPhysicsQGSP_BERT.cc/1.5/Thu Sep 30 06:15:49 2010//Tphys-lists-V09-03-34
+/HadronPhysicsQGSP_BERT_CHIPS.cc/1.2/Thu Sep 30 06:15:49 2010//Tphys-lists-V09-03-34
+/HadronPhysicsQGSP_BERT_HP.cc/1.3/Thu Sep 30 06:15:49 2010//Tphys-lists-V09-03-34
+/HadronPhysicsQGSP_BERT_NOLEP.cc/1.2/Thu Sep 30 06:15:49 2010//Tphys-lists-V09-03-34
+/HadronPhysicsQGSP_BERT_TRV.cc/1.3/Thu Sep 30 06:15:49 2010//Tphys-lists-V09-03-34
+/HadronPhysicsQGSP_BIC.cc/1.3/Thu Sep 30 06:15:49 2010//Tphys-lists-V09-03-34
+/HadronPhysicsQGSP_BIC_HP.cc/1.4/Thu Sep 30 06:15:49 2010//Tphys-lists-V09-03-34
+/HadronPhysicsQGSP_FTFP_BERT.cc/1.4/Thu Sep 30 06:15:49 2010//Tphys-lists-V09-03-34
+/HadronPhysicsQGSP_INCL_ABLA.cc/1.2/Thu Sep 30 06:15:49 2010//Tphys-lists-V09-03-34
+/HadronPhysicsQGS_BIC.cc/1.2/Thu Sep 30 06:15:49 2010//Tphys-lists-V09-03-34
+/HadronPhysicsShielding.cc/1.1/Thu Sep 30 06:15:49 2010//Tphys-lists-V09-03-34
+/MaxTimeCuts.cc/1.1/Thu Sep 30 06:15:49 2010//Tphys-lists-V09-03-34
+/MinEkineCuts.cc/1.2/Thu Sep 30 06:15:49 2010//Tphys-lists-V09-03-34
+/SpecialCuts.cc/1.1/Thu Sep 30 06:15:49 2010//Tphys-lists-V09-03-34
+/G4PhysListFactory.cc/1.15/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
+/QBBC.cc/1.9/Thu Nov  4 14:51:36 2010//Tphys-lists-V09-03-34
 D

trunk/source/physics_lists/lists/src/CVS/Tag

@@ -1 @@
-Ngeant4-09-04-beta-01
+Nphys-lists-V09-03-34

trunk/source/physics_lists/lists/src/G4PhysListFactory.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4PhysListFactory.cc,v 1.14 2010/06/08 16:06:18 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4PhysListFactory.cc,v 1.15 2010/09/23 18:53:20 vnivanch Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -82 +82 @@
     "Shielding"};
 
-  for(size_t i=0; i<nlists; i++) {
+  for(size_t i=0; i<nlists; ++i) {
     listnames.push_back(s[i]);
   }
@@ -148 +148 @@
            << " is instantiated" 
            << G4endl;
-    p = new QGSP_BERT();
+    //    p = new QGSP_BERT();
   }
   return p;

trunk/source/physics_lists/lists/src/QBBC.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: QBBC.cc,v 1.7 2010/06/04 13:34:42 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: QBBC.cc,v 1.9 2010/08/17 14:08:38 vnivanch Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-34 $
 //
 //---------------------------------------------------------------------------
@@ -53 +53 @@
 #include "G4HadronInelasticQBBC.hh"
 #include "G4HadronElasticPhysics.hh"
+#include "G4HadronElasticPhysics93.hh"
 #include "G4HadronElasticPhysicsXS.hh"
 #include "G4HadronElasticPhysicsHP.hh"
 #include "G4HadronDElasticPhysics.hh"
-#include "G4HadronHElasticPhysics.hh"
 #include "G4ChargeExchangePhysics.hh"
 #include "G4IonBinaryCascadePhysics.hh"
@@ -63 +63 @@
 QBBC::QBBC( G4int ver, const G4String& type )
 {
-  G4DataQuestionaire it(photon, neutron);
+  G4DataQuestionaire it(photon, neutron, no, no, no, neutronxs);
   G4cout << "<<< Geant4 Physics List simulation engine: QBBC of type <"
          << type <<">" <<G4endl;        
@@ -82 +82 @@
    // Hadron Physics
   if(type == "QBBC") {
+    RegisterPhysics( new G4HadronElasticPhysicsXS(ver) );
+  } else if(type == "QBBC_XGG") { 
     RegisterPhysics( new G4HadronElasticPhysics(ver) );
-  } else if(type == "QBBC_XGG") { 
-    RegisterPhysics( new G4HadronHElasticPhysics(ver) );
   } else if(type == "QBBC_XGGSN") { 
-    RegisterPhysics( new G4HadronElasticPhysicsXS(ver) );
+    RegisterPhysics( new G4HadronElasticPhysics93(ver) );
   } else if(type == "QBBC_HP") { 
     RegisterPhysics( new G4HadronElasticPhysicsHP(ver) );