Changeset 1273 for trunk/source/physics_lists/builders

Timestamp:

May 27, 2010, 10:22:31 AM (14 years ago)

Author:

garnier

Message:

cvs update phys-lists-V09-03-03

Location:

trunk/source/physics_lists/builders

Files:

• include/G4FTFBuilder.hh (modified) (4 diffs)
• include/G4QGSBuilder.hh (modified) (4 diffs)
• src/G4FTFBuilder.cc (modified) (4 diffs)
• src/G4QGSBuilder.cc (modified) (3 diffs)

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4FTFBuilder.hh,v 1.1 2009/10/04 16:29:54 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4FTFBuilder.hh,v 1.2 2009/12/29 17:54:25 vnivanch Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-03 $
 //
 //---------------------------------------------------------------------------
@@ -45 +45 @@
 class G4FTFModel;
 class G4ExcitedStringDecay;
+class G4PreCompoundModel;
 
 class G4FTFBuilder : public G4VHadronModelBuilder
@@ -50 +51 @@
 public: 
 
-  G4FTFBuilder(const G4String& name ="");
+  G4FTFBuilder(const G4String& name ="",
+               G4PreCompoundModel* p = 0); 
 
   virtual ~G4FTFBuilder();
@@ -66 +68 @@
   G4FTFModel*            theStringModel;
   G4ExcitedStringDecay*  theStringDecay;
-
+  G4PreCompoundModel*    thePreCompound;
 };
 

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4QGSBuilder.hh,v 1.1 2009/10/04 16:29:54 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4QGSBuilder.hh,v 1.2 2009/12/29 17:54:25 vnivanch Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-03 $
 //
 //---------------------------------------------------------------------------
@@ -47 +47 @@
 class G4ExcitedStringDecay;
 class G4QuasiElasticChannel;
+class G4PreCompoundModel;
 class G4ProjectileDiffractiveChannel;
 
@@ -53 +54 @@
 public: 
 
-  G4QGSBuilder(const G4String& name ="", 
+  G4QGSBuilder(const G4String& name ="",
+               G4PreCompoundModel* p = 0,
                G4bool quasiElastic=true,
                G4bool projectileDiffraction=false);
@@ -75 +77 @@
 
   G4ProjectileDiffractiveChannel* theProjectileDiffraction;
+  G4PreCompoundModel* thePreCompound;
 
   G4bool quasielFlag;

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4FTFBuilder.cc,v 1.2 2009/11/25 19:33:18 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4FTFBuilder.cc,v 1.3 2009/12/29 17:54:25 vnivanch Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-03 $
 //
 //---------------------------------------------------------------------------
@@ -46 +46 @@
 #include "G4LundStringFragmentation.hh"
 #include "G4BinaryCascade.hh"
+#include "G4PreCompoundModel.hh"
 
 
-G4FTFBuilder::G4FTFBuilder(const G4String& aName) : G4VHadronModelBuilder(aName)
+G4FTFBuilder::G4FTFBuilder(const G4String& aName, G4PreCompoundModel* p) 
+  : G4VHadronModelBuilder(aName), thePreCompound(p)
 {}
 
@@ -54 +56 @@
 {
   delete theStringDecay;
-  //delete theStringModel; // is deleted by the model
 }                                     
 
@@ -65 +66 @@
   theFTFModel->SetHighEnergyGenerator(theStringModel);
 
-  if(GetName() == "FTFP") {
-    theFTFModel->SetTransport(new G4GeneratorPrecompoundInterface());
-  } else if(GetName() == "FTFC") {
+  if(!thePreCompound) {
+    thePreCompound = new G4PreCompoundModel(new G4ExcitationHandler());
+  }
+
+  if(GetName() == "FTFC") {
     theFTFModel->SetTransport(new G4QStringChipsParticleLevelInterface());
+
   } else if(GetName() == "FTFB") {
-    theFTFModel->SetTransport(new G4BinaryCascade());
+    G4BinaryCascade* bic = new G4BinaryCascade();
+    bic->SetDeExcitation(thePreCompound);
+    theFTFModel->SetTransport(bic);
+
   } else {
-    theFTFModel->SetTransport(new G4GeneratorPrecompoundInterface());
+    G4GeneratorPrecompoundInterface* pint = new G4GeneratorPrecompoundInterface();
+    pint->SetDeExcitation(thePreCompound);
+    theFTFModel->SetTransport(pint);
   }
 

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4QGSBuilder.cc,v 1.1 2009/10/04 16:29:54 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4QGSBuilder.cc,v 1.2 2009/12/29 17:54:25 vnivanch Exp $
+// GEANT4 tag $Name: phys-lists-V09-03-03 $
 //
 //---------------------------------------------------------------------------
@@ -48 +48 @@
 #include "G4ExcitedStringDecay.hh"
 #include "G4BinaryCascade.hh"
+#include "G4PreCompoundModel.hh"
+#include "G4ExcitationHandler.hh"
 
 
-G4QGSBuilder::G4QGSBuilder(const G4String& aName, G4bool quasiel, G4bool diff) 
-  : G4VHadronModelBuilder(aName), quasielFlag(quasiel), diffFlag(diff)
+G4QGSBuilder::G4QGSBuilder(const G4String& aName, G4PreCompoundModel* p,
+                           G4bool quasiel, G4bool diff) 
+  : G4VHadronModelBuilder(aName), thePreCompound(p), 
+    quasielFlag(quasiel), diffFlag(diff)
 {
   theProjectileDiffraction = 0;
@@ -82 +86 @@
   } 
 
-  if(GetName() == "QGSP") {
-    theQGSModel->SetTransport(new G4GeneratorPrecompoundInterface());
-  } else if(GetName() == "QGSC") {
+  if(!thePreCompound) {
+    thePreCompound = new G4PreCompoundModel(new G4ExcitationHandler());
+  }
+
+  if(GetName() == "QGSC") {
     theQGSModel->SetTransport(new G4QStringChipsParticleLevelInterface());
+
   } else if(GetName() == "QGSB") {
-    theQGSModel->SetTransport(new G4BinaryCascade());
+    G4BinaryCascade* bic = new G4BinaryCascade();
+    bic->SetDeExcitation(thePreCompound);
+    theQGSModel->SetTransport(bic);
+
   } else {
-    theQGSModel->SetTransport(new G4GeneratorPrecompoundInterface());
+    G4GeneratorPrecompoundInterface* pint = new G4GeneratorPrecompoundInterface();
+    pint->SetDeExcitation(thePreCompound);
+    theQGSModel->SetTransport(pint);
   }