Changeset 1273 for trunk/source/physics_lists/builders/src
- Timestamp:
- May 27, 2010, 10:22:31 AM (14 years ago)
- Location:
- trunk/source/physics_lists/builders/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/physics_lists/builders/src/G4FTFBuilder.cc
r1228 r1273 24 24 // ******************************************************************** 25 25 // 26 // $Id: G4FTFBuilder.cc,v 1. 2 2009/11/25 19:33:18vnivanch Exp $27 // GEANT4 tag $Name: geant4-09-03 $26 // $Id: G4FTFBuilder.cc,v 1.3 2009/12/29 17:54:25 vnivanch Exp $ 27 // GEANT4 tag $Name: phys-lists-V09-03-03 $ 28 28 // 29 29 //--------------------------------------------------------------------------- … … 46 46 #include "G4LundStringFragmentation.hh" 47 47 #include "G4BinaryCascade.hh" 48 #include "G4PreCompoundModel.hh" 48 49 49 50 50 G4FTFBuilder::G4FTFBuilder(const G4String& aName) : G4VHadronModelBuilder(aName) 51 G4FTFBuilder::G4FTFBuilder(const G4String& aName, G4PreCompoundModel* p) 52 : G4VHadronModelBuilder(aName), thePreCompound(p) 51 53 {} 52 54 … … 54 56 { 55 57 delete theStringDecay; 56 //delete theStringModel; // is deleted by the model57 58 } 58 59 … … 65 66 theFTFModel->SetHighEnergyGenerator(theStringModel); 66 67 67 if(GetName() == "FTFP") { 68 theFTFModel->SetTransport(new G4GeneratorPrecompoundInterface()); 69 } else if(GetName() == "FTFC") { 68 if(!thePreCompound) { 69 thePreCompound = new G4PreCompoundModel(new G4ExcitationHandler()); 70 } 71 72 if(GetName() == "FTFC") { 70 73 theFTFModel->SetTransport(new G4QStringChipsParticleLevelInterface()); 74 71 75 } else if(GetName() == "FTFB") { 72 theFTFModel->SetTransport(new G4BinaryCascade()); 76 G4BinaryCascade* bic = new G4BinaryCascade(); 77 bic->SetDeExcitation(thePreCompound); 78 theFTFModel->SetTransport(bic); 79 73 80 } else { 74 theFTFModel->SetTransport(new G4GeneratorPrecompoundInterface()); 81 G4GeneratorPrecompoundInterface* pint = new G4GeneratorPrecompoundInterface(); 82 pint->SetDeExcitation(thePreCompound); 83 theFTFModel->SetTransport(pint); 75 84 } 76 85 -
trunk/source/physics_lists/builders/src/G4QGSBuilder.cc
r1228 r1273 24 24 // ******************************************************************** 25 25 // 26 // $Id: G4QGSBuilder.cc,v 1. 1 2009/10/04 16:29:54vnivanch Exp $27 // GEANT4 tag $Name: geant4-09-03 $26 // $Id: G4QGSBuilder.cc,v 1.2 2009/12/29 17:54:25 vnivanch Exp $ 27 // GEANT4 tag $Name: phys-lists-V09-03-03 $ 28 28 // 29 29 //--------------------------------------------------------------------------- … … 48 48 #include "G4ExcitedStringDecay.hh" 49 49 #include "G4BinaryCascade.hh" 50 #include "G4PreCompoundModel.hh" 51 #include "G4ExcitationHandler.hh" 50 52 51 53 52 G4QGSBuilder::G4QGSBuilder(const G4String& aName, G4bool quasiel, G4bool diff) 53 : G4VHadronModelBuilder(aName), quasielFlag(quasiel), diffFlag(diff) 54 G4QGSBuilder::G4QGSBuilder(const G4String& aName, G4PreCompoundModel* p, 55 G4bool quasiel, G4bool diff) 56 : G4VHadronModelBuilder(aName), thePreCompound(p), 57 quasielFlag(quasiel), diffFlag(diff) 54 58 { 55 59 theProjectileDiffraction = 0; … … 82 86 } 83 87 84 if(GetName() == "QGSP") { 85 theQGSModel->SetTransport(new G4GeneratorPrecompoundInterface()); 86 } else if(GetName() == "QGSC") { 88 if(!thePreCompound) { 89 thePreCompound = new G4PreCompoundModel(new G4ExcitationHandler()); 90 } 91 92 if(GetName() == "QGSC") { 87 93 theQGSModel->SetTransport(new G4QStringChipsParticleLevelInterface()); 94 88 95 } else if(GetName() == "QGSB") { 89 theQGSModel->SetTransport(new G4BinaryCascade()); 96 G4BinaryCascade* bic = new G4BinaryCascade(); 97 bic->SetDeExcitation(thePreCompound); 98 theQGSModel->SetTransport(bic); 99 90 100 } else { 91 theQGSModel->SetTransport(new G4GeneratorPrecompoundInterface()); 101 G4GeneratorPrecompoundInterface* pint = new G4GeneratorPrecompoundInterface(); 102 pint->SetDeExcitation(thePreCompound); 103 theQGSModel->SetTransport(pint); 92 104 } 93 105
Note: See TracChangeset
for help on using the changeset viewer.