Changeset 1055 for trunk/source/processes/hadronic/models/rpg
- Timestamp:
- May 28, 2009, 4:26:57 PM (15 years ago)
- Location:
- trunk/source/processes/hadronic/models/rpg
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/processes/hadronic/models/rpg/History
r962 r1055 15 15 --------------------------------------------------------------- 16 16 17 25 May 2009 - Dennis Wright (hadr-rpg-V09-02-00) 18 ------------------------------------------------ 19 G4RPGInelastic: fix MAC complaint about initialization order: 20 remove static array of G4ParticleDefinition pointers and 21 replace with local array 22 17 23 9 June 2008 - Dennis Wright (hadr-rpg-V09-01-03) 18 24 ------------------------------------------------- -
trunk/source/processes/hadronic/models/rpg/include/G4RPGInelastic.hh
r1007 r1055 24 24 // ******************************************************************** 25 25 // 26 // $Id: G4RPGInelastic.hh,v 1. 3 2008/02/22 22:17:25dennis Exp $27 // GEANT4 tag $Name: geant4-09-0 2$26 // $Id: G4RPGInelastic.hh,v 1.4 2009/05/25 19:06:59 dennis Exp $ 27 // GEANT4 tag $Name: geant4-09-03-beta-cand-01 $ 28 28 // 29 29 // Author: D. H. Wright … … 55 55 public: // with description 56 56 57 G4RPGInelastic(const G4String& modelName = "RPGInelastic") 58 : G4HadronicInteraction(modelName) 59 { cache = 0.0;} 57 G4RPGInelastic(const G4String& modelName = "RPGInelastic"); 60 58 61 59 virtual ~G4RPGInelastic() … … 124 122 lam, sp, s0, sm, xi0, xim, om, ap, an}; 125 123 126 static G4ParticleDefinition* particleDef[18]; 124 protected: 125 126 G4ParticleDefinition* particleDef[18]; 127 127 128 128 private: -
trunk/source/processes/hadronic/models/rpg/include/G4RPGNucleonInelastic.hh
r1007 r1055 24 24 // ******************************************************************** 25 25 // 26 // $Id: G4RPGNucleonInelastic.hh,v 1. 1 2008/01/04 23:27:45dennis Exp $27 // GEANT4 tag $Name: geant4-09-0 2$26 // $Id: G4RPGNucleonInelastic.hh,v 1.2 2009/05/25 19:05:19 dennis Exp $ 27 // GEANT4 tag $Name: geant4-09-03-beta-cand-01 $ 28 28 // 29 29 // Author: D. H. Wright … … 48 48 49 49 ~G4RPGNucleonInelastic() { } 50 51 // void printCrossSections() const; 50 52 51 53 protected: -
trunk/source/processes/hadronic/models/rpg/include/G4RPGPionInelastic.hh
r1007 r1055 24 24 // ******************************************************************** 25 25 // 26 // $Id: G4RPGPionInelastic.hh,v 1. 1 2008/01/05 00:14:03dennis Exp $27 // GEANT4 tag $Name: geant4-09-0 2$26 // $Id: G4RPGPionInelastic.hh,v 1.2 2009/05/25 19:05:34 dennis Exp $ 27 // GEANT4 tag $Name: geant4-09-03-beta-cand-01 $ 28 28 // 29 29 // Author: D. H. Wright … … 48 48 49 49 ~G4RPGPionInelastic() { } 50 51 // void printCrossSections() const; 50 52 51 53 protected: -
trunk/source/processes/hadronic/models/rpg/src/G4RPGInelastic.cc
r1007 r1055 24 24 // ******************************************************************** 25 25 // 26 // $Id: G4RPGInelastic.cc,v 1. 6 2008/03/22 00:03:24dennis Exp $27 // GEANT4 tag $Name: geant4-09-0 2$26 // $Id: G4RPGInelastic.cc,v 1.7 2009/05/25 19:07:15 dennis Exp $ 27 // GEANT4 tag $Name: geant4-09-03-beta-cand-01 $ 28 28 // 29 29 … … 34 34 #include "G4RPGTwoBody.hh" 35 35 36 36 37 G4RPGInelastic::G4RPGInelastic(const G4String& modelName) 38 : G4HadronicInteraction(modelName) 39 { 40 cache = 0.0; 41 particleDef[0] = G4PionZero::PionZero(); 42 particleDef[1] = G4PionPlus::PionPlus(); 43 particleDef[2] = G4PionMinus::PionMinus(); 44 particleDef[3] = G4KaonPlus::KaonPlus(); 45 particleDef[4] = G4KaonMinus::KaonMinus(); 46 particleDef[5] = G4KaonZero::KaonZero(); 47 particleDef[6] = G4AntiKaonZero::AntiKaonZero(); 48 particleDef[7] = G4Proton::Proton(); 49 particleDef[8] = G4Neutron::Neutron(); 50 particleDef[9] = G4Lambda::Lambda(); 51 particleDef[10] = G4SigmaPlus::SigmaPlus(); 52 particleDef[11] = G4SigmaZero::SigmaZero(); 53 particleDef[12] = G4SigmaMinus::SigmaMinus(); 54 particleDef[13] = G4XiZero::XiZero(); 55 particleDef[14] = G4XiMinus::XiMinus(); 56 particleDef[15] = G4OmegaMinus::OmegaMinus(); 57 particleDef[16] = G4AntiProton::AntiProton(); 58 particleDef[17] = G4AntiNeutron::AntiNeutron(); 59 } 60 61 37 62 G4double G4RPGInelastic::Pmltpc(G4int np, G4int nm, G4int nz, 38 63 G4int n, G4double b, G4double c) … … 568 593 2.4, 3.2, 4.2, 5.6, 7.5, 10.0, 13.0, 18.0, 24.0, 32.0 }; 569 594 570 G4ParticleDefinition* p0 = G4PionZero::PionZero();571 G4ParticleDefinition* p1 = G4PionPlus::PionPlus();572 G4ParticleDefinition* p2 = G4PionMinus::PionMinus();573 G4ParticleDefinition* p3 = G4KaonPlus::KaonPlus();574 G4ParticleDefinition* p4 = G4KaonMinus::KaonMinus();575 G4ParticleDefinition* p5 = G4KaonZero::KaonZero();576 G4ParticleDefinition* p6 = G4AntiKaonZero::AntiKaonZero();577 G4ParticleDefinition* p7 = G4Proton::Proton();578 G4ParticleDefinition* p8 = G4Neutron::Neutron();579 G4ParticleDefinition* p9 = G4Lambda::Lambda();580 G4ParticleDefinition* p10 = G4SigmaPlus::SigmaPlus();581 G4ParticleDefinition* p11 = G4SigmaZero::SigmaZero();582 G4ParticleDefinition* p12 = G4SigmaMinus::SigmaMinus();583 G4ParticleDefinition* p13 = G4XiZero::XiZero();584 G4ParticleDefinition* p14 = G4XiMinus::XiMinus();585 G4ParticleDefinition* p15 = G4OmegaMinus::OmegaMinus();586 G4ParticleDefinition* p16 = G4AntiProton::AntiProton();587 G4ParticleDefinition* p17 = G4AntiNeutron::AntiNeutron();588 589 G4ParticleDefinition* G4RPGInelastic::particleDef[18] = {590 p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14,591 p15, p16, p17 };592 595 593 596 /* end of file */ -
trunk/source/processes/hadronic/models/rpg/src/G4RPGNucleonInelastic.cc
r1007 r1055 24 24 // ******************************************************************** 25 25 // 26 // $Id: G4RPGNucleonInelastic.cc,v 1. 1 2008/01/04 23:28:10dennis Exp $27 // GEANT4 tag $Name: geant4-09-0 2$26 // $Id: G4RPGNucleonInelastic.cc,v 1.2 2009/05/25 19:06:03 dennis Exp $ 27 // GEANT4 tag $Name: geant4-09-03-beta-cand-01 $ 28 28 // 29 29 … … 70 70 } 71 71 } 72 73 // printCrossSections(); 72 74 73 75 } 76 77 /* 78 void G4RPGNucleonInelastic::printCrossSections() const 79 { 80 G4cout << " pp total cross sections (mb) " << G4endl; 81 for (G4int i = 0; i < 5; i++) { 82 G4int istart = i*6; 83 G4int istop = istart + 6; 84 for (G4int t = istart; t < istop; t++) G4cout << pPtot[t] << " " ; 85 G4cout << G4endl; 86 } 87 G4cout << G4endl; 88 89 G4cout << " pn total cross sections (mb) " << G4endl; 90 for (G4int i = 0; i < 5; i++) { 91 G4int istart = i*6; 92 G4int istop = istart + 6; 93 for (G4int t = istart; t < istop; t++) G4cout << pNtot[t] << " " ; 94 G4cout << G4endl; 95 } 96 } 97 */ 74 98 75 99 -
trunk/source/processes/hadronic/models/rpg/src/G4RPGPionInelastic.cc
r1007 r1055 24 24 // ******************************************************************** 25 25 // 26 // $Id: G4RPGPionInelastic.cc,v 1. 1 2008/01/05 00:15:12dennis Exp $27 // GEANT4 tag $Name: geant4-09-0 2$26 // $Id: G4RPGPionInelastic.cc,v 1.2 2009/05/25 19:05:47 dennis Exp $ 27 // GEANT4 tag $Name: geant4-09-03-beta-cand-01 $ 28 28 // 29 29 … … 71 71 } 72 72 73 // printCrossSections(); 74 73 75 } 76 77 78 /* 79 void G4RPGPionInelastic::printCrossSections() const 80 { 81 G4cout << " pi+ p total cross sections (mb) " << G4endl; 82 for (G4int i = 0; i < 5; i++) { 83 G4int istart = i*6; 84 G4int istop = istart + 6; 85 for (G4int t = istart; t < istop; t++) G4cout << pipPtot[t] << " " ; 86 G4cout << G4endl; 87 } 88 G4cout << G4endl; 89 90 G4cout << " pi- p total cross sections (mb) " << G4endl; 91 for (G4int i = 0; i < 5; i++) { 92 G4int istart = i*6; 93 G4int istop = istart + 6; 94 for (G4int t = istart; t < istop; t++) G4cout << pimPtot[t] << " " ; 95 G4cout << G4endl; 96 } 97 } 98 */ 74 99 75 100
Note: See TracChangeset
for help on using the changeset viewer.