Changeset 921 for trunk/source/physics_lists/lists/src/G4HadronInelasticQBBC.cc

Timestamp:

Feb 16, 2009, 10:14:30 AM (16 years ago)

Author:

garnier

Message:

en test de gl2ps. Problemes de libraries

File:

• trunk/source/physics_lists/lists/src/G4HadronInelasticQBBC.cc (modified) (12 diffs)

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4HadronInelasticQBBC.cc,v 1.9 2008/08/05 10:25:00 vnivanch Exp $
-// GEANT4 tag $Name: HEAD $
+// $Id: G4HadronInelasticQBBC.cc,v 1.15 2008/11/21 18:42:36 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 //---------------------------------------------------------------------------
@@ -57 +57 @@
 #include "G4QStringChipsParticleLevelInterface.hh"
 #include "G4StringChipsInterface.hh"
+#include "G4GeneratorPrecompoundInterface.hh"
 #include "G4QGSMFragmentation.hh"
 #include "G4LundStringFragmentation.hh"
@@ -78 +79 @@
     chipsFlag(chips), hpFlag(hp), glFlag(glauber), wasActivated(false)
 {
-  if(verbose > -1) G4cout << "### HadronInelasticQBBC" << G4endl;
-  //  store = G4HadronProcessStore::Instance();
+  if(verbose > 1) G4cout << "### HadronInelasticQBBC bertFlag= " <<  bertFlag <<G4endl;
   theHPXSecI = 0;
   theHPXSecC = 0;
   theHPXSecF = 0;
   theCascade = 0;
+  preCompound = 0;
   theCHIPSCascade   = 0;
   theQuasiElastic   = 0;
   theQGStringDecay  = 0;
   theQGStringModel  = 0;
-  theFTFStringDecay = 0;
-  theFTFStringModel = 0;
+  theFTFBStringDecay = 0;
+  theFTFBStringModel = 0;
+  theFTFCStringDecay = 0;
+  theFTFCStringModel = 0;
 }
 
@@ -95 +98 @@
 {
   delete theCascade;
+  delete preCompound;
   delete theCHIPSCascade;
   delete theQuasiElastic;
   delete theQGStringDecay;
   delete theQGStringModel;
-  delete theFTFStringDecay;
-  delete theFTFStringModel;
+  delete theFTFBStringDecay;
+  delete theFTFCStringDecay;
+  delete theFTFBStringModel;
+  delete theFTFCStringModel;
   delete theHPXSecI;
   delete theHPXSecC;
@@ -121 +127 @@
 
   if(verbose > 1) 
-    G4cout << "### HadronInelasticQBBC Construct Process" << G4endl;
-
-  G4double minEstring  = 4.0*GeV;
-  G4double maxEcascade = 6.0*GeV;
-  //  G4double minFtf      = 7.5*GeV;
+    G4cout << "### HadronInelasticQBBC Construct Process"
+           << " ftfFlag= " << ftfFlag << "  bertFlag= " << bertFlag
+           << G4endl;
+
+  G4double minEstring  = 9.5*GeV;
+  G4double maxEcascade = 7.5*GeV;
+  G4double minFTF      = 4.5*GeV;
+  G4double maxFTF      = 25.*GeV;
 
   //Binary
@@ -143 +152 @@
 
   //QGS
-  theCascade = new G4BinaryCascade;
+  theCascade = new G4BinaryCascade();
+  preCompound = new G4GeneratorPrecompoundInterface();
+
   theCHIPSCascade = new G4QStringChipsParticleLevelInterface;
-  G4TheoFSGenerator* theQGSModel = new G4TheoFSGenerator();
+  G4TheoFSGenerator* theQGSModel = new G4TheoFSGenerator("QGSP");
   theQGStringModel  = new G4QGSModel< G4QGSParticipants >;
   theQGStringDecay  = new G4ExcitedStringDecay(new G4QGSMFragmentation());
   theQGStringModel->SetFragmentationModel(theQGStringDecay);
-  theQGSModel->SetTransport(theCHIPSCascade);
-
-  theQuasiElastic = new G4QuasiElasticChannel;
+  theQGSModel->SetTransport(preCompound);
+
+  theQuasiElastic = new G4QuasiElasticChannel();
   theQGSModel->SetQuasiElasticChannel(theQuasiElastic);
   theQGSModel->SetHighEnergyGenerator(theQGStringModel);
@@ -157 +168 @@
   theQGSModel->SetMaxEnergy(100*TeV);
 
-  //FTF
-  G4TheoFSGenerator* theFTFModel = new G4TheoFSGenerator();
-  theFTFStringModel = new G4FTFModel();
-  theFTFStringDecay = new G4ExcitedStringDecay(new G4LundStringFragmentation());
-  theFTFStringModel->SetFragmentationModel(theFTFStringDecay);
-  //theFTFModel->SetTransport(theCHIPSCascade);
-  theFTFModel->SetTransport(theCascade);
-  theFTFModel->SetHighEnergyGenerator(theFTFStringModel);
-  theFTFModel->SetMinEnergy(minEstring);
-  theFTFModel->SetMaxEnergy(100*TeV);
-  //theFTFModel->SetQuasiElasticChannel(theQuasiElastic);
+  //FTFB
+  G4TheoFSGenerator* theFTFBModel = new G4TheoFSGenerator("FTFP");
+  theFTFBStringModel = new G4FTFModel();
+  theFTFBStringDecay = new G4ExcitedStringDecay(new G4LundStringFragmentation());
+  theFTFBStringModel->SetFragmentationModel(theFTFBStringDecay);
+
+  //  theFTFBModel->SetTransport(theCascade);
+  theFTFBModel->SetTransport(preCompound);
+  theFTFBModel->SetHighEnergyGenerator(theFTFBStringModel);
+  theFTFBModel->SetMinEnergy(minFTF);
+  theFTFBModel->SetMaxEnergy(100*TeV);
+
+  //FTFP
+  G4TheoFSGenerator* theFTFCModel = new G4TheoFSGenerator("FTFP");
+  theFTFCStringModel = new G4FTFModel();
+  theFTFCStringDecay = new G4ExcitedStringDecay(new G4LundStringFragmentation());
+  theFTFCStringModel->SetFragmentationModel(theFTFCStringDecay);
+
+  theFTFCModel->SetTransport(preCompound);
+  theFTFCModel->SetHighEnergyGenerator(theFTFCStringModel);
+  theFTFCModel->SetMinEnergy(minFTF);
+  theFTFCModel->SetMaxEnergy(maxFTF);
 
   theParticleIterator->reset();
@@ -205 +227 @@
         hp->AddDataSet(&theXSecP);
 
-        if(ftfFlag) hp->RegisterMe(theFTFModel);
-        else        hp->RegisterMe(theQGSModel);
+        hp->RegisterMe(theQGSModel);
+        hp->RegisterMe(theFTFCModel);
+        //if(ftfFlag) hp->RegisterMe(theFTFCModel);
+        //else        hp->RegisterMe(theQGSModel);
  
         if(bertFlag) hp->RegisterMe(theBERT);
@@ -216 +240 @@
       } else if(pname == "neutron") {
         hp->AddDataSet(&theXSecN);
-        if(ftfFlag) hp->RegisterMe(theFTFModel);
-        else        hp->RegisterMe(theQGSModel);
+        hp->RegisterMe(theQGSModel);
+        hp->RegisterMe(theFTFCModel);
+        //if(ftfFlag) hp->RegisterMe(theFTFCModel);
+        //else        hp->RegisterMe(theQGSModel);
 
         G4HadronCaptureProcess* theNeutronCapture = 
@@ -260 +286 @@
       } else if(pname == "pi-" || pname == "pi+") {
         hp->AddDataSet(&thePiCross);
-        if(ftfFlag) hp->RegisterMe(theFTFModel);
-        else        hp->RegisterMe(theQGSModel);
+        hp->RegisterMe(theQGSModel);
+        hp->RegisterMe(theFTFCModel);
+        //if(ftfFlag) hp->RegisterMe(theFTFCModel);
+        //else        hp->RegisterMe(theQGSModel);
 
         hp->RegisterMe(theBERT);
@@ -274 +302 @@
                 pname == "kaon0S"    || 
                 pname == "kaon0L") {
-        hp->RegisterMe(theFTFModel);
+        hp->RegisterMe(theFTFBModel);
         hp->RegisterMe(theBERT);
         //hp->AddDataSet(new G4UInelasticCrossSection(particle));
@@ -284 +312 @@
                 pname == "xi0") {
 
-        hp->RegisterMe(theFTFModel);
+        hp->RegisterMe(theFTFBModel);
         hp->RegisterMe(theBERT);
         //hp->AddDataSet(new G4UInelasticCrossSection(particle));
 
       } else if(pname == "anti_proton" || pname == "anti_neutron") {
-        hp->RegisterMe(theFTFModel);
+        hp->RegisterMe(theFTFBModel);
         hp->RegisterMe(theCHIPS);
         //hp->AddDataSet(new G4UInelasticCrossSection(particle));
 
       } else {
-        hp->RegisterMe(theFTFModel);
+        hp->RegisterMe(theFTFBModel);
         hp->RegisterMe(theCHIPS);
         //hp->AddDataSet(new G4UInelasticCrossSection(particle));