Changeset 1228 for trunk/source/processes/hadronic/cross_sections/include

Timestamp:

Jan 8, 2010, 11:56:51 AM (16 years ago)

Author:

garnier

Message:

update geant4.9.3 tag

Location:

trunk/source/processes/hadronic/cross_sections/include

Files:

• G4BGGNucleonElasticXS.hh (modified) (1 diff)
• G4BGGNucleonInelasticXS.hh (modified) (1 diff)
• G4BGGPionElasticXS.hh (modified) (1 diff)
• G4BGGPionInelasticXS.hh (modified) (1 diff)
• G4CrossSectionDataSetRegistry.hh (modified) (1 diff)
• G4CrossSectionDataStore.hh (modified) (1 diff)
• G4ElectroNuclearCrossSection.hh (modified) (1 diff)
• G4GGNuclNuclCrossSection.hh (modified) (2 diffs)
• G4GlauberGribovCrossSection.hh (modified) (1 diff)
• G4HadronCrossSections.hh (modified) (1 diff)
• G4HadronNucleonXsc.hh (modified) (2 diffs)
• G4NeutronCaptureXS.hh (modified) (1 diff)
• G4NeutronElasticXS.hh (modified) (1 diff)
• G4NeutronInelasticCrossSection.hh (modified) (3 diffs)
• G4NeutronInelasticXS.hh (modified) (1 diff)
• G4PhotoNuclearCrossSection.hh (modified) (1 diff)
• G4PiNuclearCrossSection.hh (modified) (2 diffs)
• G4ProtonInelasticCrossSection.hh (modified) (3 diffs)
• G4VCrossSectionDataSet.hh (modified) (1 diff)

trunk/source/processes/hadronic/cross_sections/include/G4BGGNucleonElasticXS.hh

@@ -25 +25 @@
 //
 // $Id: G4BGGNucleonElasticXS.hh,v 1.5 2009/11/19 11:41:30 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------

trunk/source/processes/hadronic/cross_sections/include/G4BGGNucleonInelasticXS.hh

@@ -25 +25 @@
 //
 // $Id: G4BGGNucleonInelasticXS.hh,v 1.6 2009/11/19 11:44:46 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------

trunk/source/processes/hadronic/cross_sections/include/G4BGGPionElasticXS.hh

@@ -25 +25 @@
 //
 // $Id: G4BGGPionElasticXS.hh,v 1.5 2009/11/19 11:46:13 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------

trunk/source/processes/hadronic/cross_sections/include/G4BGGPionInelasticXS.hh

@@ -25 +25 @@
 //
 // $Id: G4BGGPionInelasticXS.hh,v 1.5 2009/11/19 11:47:19 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------

trunk/source/processes/hadronic/cross_sections/include/G4CrossSectionDataSetRegistry.hh

@@ -25 +25 @@
 //
 // $Id: G4CrossSectionDataSetRegistry.hh,v 1.3 2009/08/08 16:21:31 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------

trunk/source/processes/hadronic/cross_sections/include/G4CrossSectionDataStore.hh

@@ -25 +25 @@
 //
 // $Id: G4CrossSectionDataStore.hh,v 1.14 2009/01/24 11:54:47 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------

trunk/source/processes/hadronic/cross_sections/include/G4ElectroNuclearCrossSection.hh

@@ -25 +25 @@
 //
 //
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

trunk/source/processes/hadronic/cross_sections/include/G4GGNuclNuclCrossSection.hh

@@ -92 +92 @@
   G4double GetHadronNucleonXscPDG(const G4DynamicParticle*, G4double At, G4double Zt);
 
-
-
-
   // G4double GetHadronNucleonXscNS(const G4DynamicParticle*, const G4Element*);
   // G4double GetHadronNucleonXscNS(const G4DynamicParticle*,G4double At, G4double Zt);
 
-
-
-
   G4double GetHadronNucleonXscNS(G4ParticleDefinition*,G4double pTkin, G4ParticleDefinition*);
-
-
-
-
-
-
 
   // G4double GetHNinelasticXsc(const G4DynamicParticle*, const G4Element*);
@@ -113 +101 @@
 
   G4double GetHNinelasticXscVU(const G4DynamicParticle*, G4double At, G4double Zt);
-
-  G4double GetHadronNucleonXscMK(G4ParticleDefinition* pParticle, G4double pTkin, 
-                                 G4ParticleDefinition* nucleon  ); 
 
   G4double CalculateEcmValue ( const G4double , const G4double , const G4double ); 

trunk/source/processes/hadronic/cross_sections/include/G4GlauberGribovCrossSection.hh

@@ -98 +98 @@
   G4double GetHNinelasticXsc(const G4DynamicParticle*, G4double At, G4double Zt);
   G4double GetHNinelasticXscVU(const G4DynamicParticle*, G4double At, G4double Zt);
-  G4double GetHadronNucleonXscMK(const G4DynamicParticle* aParticle, 
-                                 const G4ParticleDefinition* nucleon  ); 
 
   G4double CalculateEcmValue ( const G4double , const G4double , const G4double ); 

trunk/source/processes/hadronic/cross_sections/include/G4HadronCrossSections.hh

@@ -25 +25 @@
 //
 //
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

trunk/source/processes/hadronic/cross_sections/include/G4HadronNucleonXsc.hh

@@ -61 +61 @@
   G4bool IsZAApplicable(const G4DynamicParticle* aDP, G4double Z, G4double A);
 
-
-
-
   virtual
   void DumpPhysicsTable(const G4ParticleDefinition&) 
@@ -77 +74 @@
 
   G4double GetHadronNucleonXscVU(const G4DynamicParticle*, const G4ParticleDefinition*);
-
-  G4double GetHadronNucleonXscMK(const G4DynamicParticle*, const G4ParticleDefinition*);
 
   // kinematics and set/get

trunk/source/processes/hadronic/cross_sections/include/G4NeutronCaptureXS.hh

@@ -25 +25 @@
 //
 // $Id: G4NeutronCaptureXS.hh,v 1.1 2009/11/12 00:36:01 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------

trunk/source/processes/hadronic/cross_sections/include/G4NeutronElasticXS.hh

@@ -25 +25 @@
 //
 // $Id: G4NeutronElasticXS.hh,v 1.3 2009/11/19 11:51:46 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------

trunk/source/processes/hadronic/cross_sections/include/G4NeutronInelasticCrossSection.hh

@@ -26 +26 @@
 // by JPW, working, but to be cleaned up. @@@@
 // D. Wright, 23-Dec-2006 Added isotope dependence
+// G.Folger, 25-Nov-2009: extend to 100TeV, using a constant above 20GeV
 //
 
@@ -51 +52 @@
      G4bool result = false;
      if(( aPart->GetDefinition()==G4Neutron::Neutron()) &&
-        ( aPart->GetKineticEnergy()<20*GeV) &&
+        ( aPart->GetKineticEnergy()<100*TeV) &&
           aPart->GetKineticEnergy()>19.9*MeV) result = true;
      if(aEle->GetZ()<2) result = false;
@@ -62 +63 @@
      G4bool result = false;
      if(( aPart->GetDefinition() == G4Neutron::Neutron()) &&
-        ( aPart->GetKineticEnergy() < 20*GeV) &&
+        ( aPart->GetKineticEnergy() < 100*TeV) &&
           aPart->GetKineticEnergy() > 19.9*MeV) result = true;
      if(ZZ < 2) result = false;

trunk/source/processes/hadronic/cross_sections/include/G4NeutronInelasticXS.hh

@@ -25 +25 @@
 //
 // $Id: G4NeutronInelasticXS.hh,v 1.3 2009/11/19 11:52:27 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------

trunk/source/processes/hadronic/cross_sections/include/G4PhotoNuclearCrossSection.hh

@@ -25 +25 @@
 //
 //
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

trunk/source/processes/hadronic/cross_sections/include/G4PiNuclearCrossSection.hh

@@ -48 +48 @@
     if(aParticle->GetDefinition() == G4PionPlus::PionPlus())   result=true;
     if(G4lrint(anElement->GetZ()) == 1) result = false;
-    if(aParticle->GetKineticEnergy() > 999.9*GeV) result=false;
+    if(aParticle->GetKineticEnergy() > 99.9*TeV) result=false;
     return result;
   }
@@ -59 +59 @@
     if(particle->GetDefinition() == G4PionPlus::PionPlus())   result=true;
     if(G4lrint(ZZ) == 1) result = false;
-    if(particle->GetKineticEnergy() > 999.9*GeV) result=false;
+    if(particle->GetKineticEnergy() > 99.9*TeV) result=false;
     return result;
   }

trunk/source/processes/hadronic/cross_sections/include/G4ProtonInelasticCrossSection.hh

@@ -27 +27 @@
 // G.Folger, 29-sept-2006: extend to 1TeV, using a constant above 20GeV
 // D. Wright, 23-Dec-2006: added isotope dependence
+// G.Folger, 25-Nov-2009: extend to 100TeV, using a constant above 20GeV
 //
 
@@ -56 +57 @@
      G4bool result = false;
      if(( aPart->GetDefinition()==G4Proton::Proton()) &&
-        ( aPart->GetKineticEnergy()<1*TeV) ) result = true;
+        ( aPart->GetKineticEnergy()<100*TeV) ) result = true;
      if(aEle->GetZ()<3) result = false;
      return result;
@@ -66 +67 @@
      G4bool result = false;
      if (( aParticle->GetDefinition() == G4Proton::Proton()) &&
-         ( aParticle->GetKineticEnergy() < 1*TeV) ) result = true;
+         ( aParticle->GetKineticEnergy() < 100*TeV) ) result = true;
      if (ZZ < 3) result = false;
      return result;

trunk/source/processes/hadronic/cross_sections/include/G4VCrossSectionDataSet.hh

@@ -25 +25 @@
 //
 // $Id: G4VCrossSectionDataSet.hh,v 1.13 2009/01/24 11:54:47 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------