Ignore:
Timestamp:
Sep 10, 2008, 5:40:37 PM (16 years ago)
Author:
garnier
Message:

geant4.8.2 beta

Location:
trunk/source/physics_lists/lists/src
Files:
22 edited

Legend:

Unmodified
Added
Removed

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

    r825 r850  
    2424// ********************************************************************
    2525//
    26 // $Id: G4HadronInelasticQBBC.cc,v 1.7 2007/11/26 19:31:16 vnivanch Exp $
    27 // GEANT4 tag $Name: $
     26// $Id: G4HadronInelasticQBBC.cc,v 1.9 2008/08/05 10:25:00 vnivanch Exp $
     27// GEANT4 tag $Name: HEAD $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    7171#include "G4NeutronHPCapture.hh"
    7272
    73 #include "G4HadronProcessStore.hh"
    7473#include "G4UInelasticCrossSection.hh"
    7574
    … …  
    8079{
    8180  if(verbose > -1) G4cout << "### HadronInelasticQBBC" << G4endl;
    82   store = G4HadronProcessStore::Instance();
     81  //  store = G4HadronProcessStore::Instance();
    8382  theHPXSecI = 0;
    8483  theHPXSecC = 0;
    … …  
    124123    G4cout << "### HadronInelasticQBBC Construct Process" << G4endl;
    125124
    126   G4double minEstring  = 6.0*GeV;
    127   G4double maxEcascade = 9.0*GeV;
     125  G4double minEstring  = 4.0*GeV;
     126  G4double maxEcascade = 6.0*GeV;
    128127  //  G4double minFtf      = 7.5*GeV;
    129128
    … …  
    144143
    145144  //QGS
    146   //theCascade = new G4BinaryCascade;
     145  theCascade = new G4BinaryCascade;
    147146  theCHIPSCascade = new G4QStringChipsParticleLevelInterface;
    148147  G4TheoFSGenerator* theQGSModel = new G4TheoFSGenerator();
    … …  
    163162  theFTFStringDecay = new G4ExcitedStringDecay(new G4LundStringFragmentation());
    164163  theFTFStringModel->SetFragmentationModel(theFTFStringDecay);
    165   theFTFModel->SetTransport(theCHIPSCascade);
    166   //theFTFModel->SetTransport(theCascade);
     164  //theFTFModel->SetTransport(theCHIPSCascade);
     165  theFTFModel->SetTransport(theCascade);
    167166  theFTFModel->SetHighEnergyGenerator(theFTFStringModel);
    168167  theFTFModel->SetMinEnergy(minEstring);
    169168  theFTFModel->SetMaxEnergy(100*TeV);
    170   theFTFModel->SetQuasiElasticChannel(theQuasiElastic);
     169  //theFTFModel->SetQuasiElasticChannel(theQuasiElastic);
    171170
    172171  theParticleIterator->reset();
    … …  
    205204      if(pname == "proton") {
    206205        hp->AddDataSet(&theXSecP);
    207         if(ftfFlag) Register(particle,hp,theFTFModel,"FTF");
    208         else        Register(particle,hp,theQGSModel,"QGS");
    209 
    210         if(bertFlag) Register(particle,hp,theBERT,"Bertini");
    211         else         Register(particle,hp,theBIC,"Binary");
     206
     207        if(ftfFlag) hp->RegisterMe(theFTFModel);
     208        else        hp->RegisterMe(theQGSModel);
     209 
     210        if(bertFlag) hp->RegisterMe(theBERT);
     211        else         hp->RegisterMe(theBIC);
    212212     
    213213        if(glFlag)
    … …  
    216216      } else if(pname == "neutron") {
    217217        hp->AddDataSet(&theXSecN);
    218         if(ftfFlag) Register(particle,hp,theFTFModel,"FTF");
    219         else        Register(particle,hp,theQGSModel,"QGS");
     218        if(ftfFlag) hp->RegisterMe(theFTFModel);
     219        else        hp->RegisterMe(theQGSModel);
    220220
    221221        G4HadronCaptureProcess* theNeutronCapture =
    … …  
    235235          theNeutronCapture->AddDataSet(theHPXSecC);
    236236          theNeutronFission->AddDataSet(theHPXSecF);
    237           G4NeutronHPInelastic* hpi = new G4NeutronHPInelastic();
    238           G4NeutronHPCapture* hpc = new G4NeutronHPCapture();
    239           G4NeutronHPFission* hpf = new G4NeutronHPFission();
    240           Register(particle,hp,hpi,"HP");
    241           Register(particle,theNeutronCapture,hpc,"HP");
    242           Register(particle,theNeutronFission,hpf,"HP");
     237          hp->RegisterMe(new G4NeutronHPInelastic());
     238          theNeutronCapture->RegisterMe(new G4NeutronHPCapture());
     239          theNeutronFission->RegisterMe(new G4NeutronHPFission());
    243240        }
    244241
    245242        G4HadronicInteraction* theB;
    246         G4String s;
    247         if(bertFlag) {
    248           theB = new G4CascadeInterface();
    249           s = "Bertini";
    250         } else {
    251           theB = new G4BinaryCascade();
    252           s = "Binary";
    253         }
     243        if(bertFlag) theB = new G4CascadeInterface();
     244        else         theB = new G4BinaryCascade();
    254245        theB->SetMinEnergy(emin);
    255246        theB->SetMaxEnergy(maxEcascade);
    256         Register(particle,hp,theB,s);
     247        hp->RegisterMe(theB);
    257248
    258249        if(glFlag)
    259250          hp->AddDataSet(new G4BGGNucleonInelasticXS(particle));
    260        
    261         G4HadronicInteraction* theC = new G4LCapture();
     251
     252        G4HadronicInteraction* theC = new G4LCapture();         
    262253        theC->SetMinEnergy(emin);
    263         Register(particle,theNeutronCapture,theC,"LCapture");
    264 
    265         G4HadronicInteraction* theF = new G4LFission();
     254        theNeutronCapture->RegisterMe(theC);
     255
     256        G4HadronicInteraction* theF = new G4LFission();
    266257        theF->SetMinEnergy(emin);
    267         Register(particle,theNeutronFission,theF,"LFission");
     258        theNeutronFission->RegisterMe(theF);
    268259
    269260      } else if(pname == "pi-" || pname == "pi+") {
    270261        hp->AddDataSet(&thePiCross);
    271         if(ftfFlag) Register(particle,hp,theFTFModel,"FTF");
    272         else        Register(particle,hp,theQGSModel,"QGS");
    273 
    274         Register(particle,hp,theBERT,"Bertini");
    275         //if(bertFlag) Register(particle,hp,theBERT,"Bertini");
    276         //else         Register(particle,hp,theBIC,"Binary");
     262        if(ftfFlag) hp->RegisterMe(theFTFModel);
     263        else        hp->RegisterMe(theQGSModel);
     264
     265        hp->RegisterMe(theBERT);
     266        //if(bertFlag) hp->RegisterMe(theBERT);
     267        //else         hp->RegisterMe(theBIC);
    277268
    278269        if(glFlag)
    … …  
    283274                pname == "kaon0S"    ||
    284275                pname == "kaon0L") {
    285         Register(particle,hp,theFTFModel,"FTF");
    286         Register(particle,hp,theBERT,"Bertini");
     276        hp->RegisterMe(theFTFModel);
     277        hp->RegisterMe(theBERT);
    287278        //hp->AddDataSet(new G4UInelasticCrossSection(particle));
    288279
    … …  
    293284                pname == "xi0") {
    294285
    295         Register(particle,hp,theFTFModel,"FTF");
    296         Register(particle,hp,theBERT,"Bertini");
     286        hp->RegisterMe(theFTFModel);
     287        hp->RegisterMe(theBERT);
    297288        //hp->AddDataSet(new G4UInelasticCrossSection(particle));
    298289
    299290      } else if(pname == "anti_proton" || pname == "anti_neutron") {
    300         Register(particle,hp,theFTFModel,"FTF");
    301         Register(particle,hp,theCHIPS,"CHIPS");
     291        hp->RegisterMe(theFTFModel);
     292        hp->RegisterMe(theCHIPS);
    302293        //hp->AddDataSet(new G4UInelasticCrossSection(particle));
    303294
    304295      } else {
    305         Register(particle,hp,theFTFModel,"FTF");
    306         Register(particle,hp,theCHIPS,"CHIPS");
     296        hp->RegisterMe(theFTFModel);
     297        hp->RegisterMe(theCHIPS);
    307298        //hp->AddDataSet(new G4UInelasticCrossSection(particle));
    308299      }
    … …  
    313304    }
    314305  }
    315   store->Dump(verbose);
    316306}
    317 
    318 void G4HadronInelasticQBBC::Register(G4ParticleDefinition* p,
    319                                      G4HadronicProcess* hp,
    320                                      G4HadronicInteraction* hi,
    321                                      const G4String& m)
    322 {
    323   hp->RegisterMe(hi);
    324   store->Register(hp,p,hi,m);
    325   if(verbose > 1)
    326     G4cout << "### QBBC: Register new model " << m
    327            << " for " << p->GetParticleName() << " and " << hp->GetProcessName()
    328            << " E(GeV) " << hi->GetMinEnergy()/GeV
    329            << " - " << hi->GetMaxEnergy()/GeV << G4endl;
    330 }

  • trunk/source/physics_lists/lists/src/G4HadronInelasticQLHEP.cc

    r825 r850  
    2424// ********************************************************************
    2525//
    26 // $Id: G4HadronInelasticQLHEP.cc,v 1.1 2006/10/31 11:35:10 gunter Exp $
    27 // GEANT4 tag $Name: $
     26// $Id: G4HadronInelasticQLHEP.cc,v 1.2 2008/05/19 10:21:34 vnivanch Exp $
     27// GEANT4 tag $Name: HEAD $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    114114#include "G4HEXiZeroInelastic.hh"
    115115
    116 #include "G4HadronProcessStore.hh"
    117 
    118116G4HadronInelasticQLHEP::G4HadronInelasticQLHEP(const G4String& name,
    119117    G4int ver, G4bool qgs, G4bool bert, G4bool bic, G4bool hp)
    … …  
    122120{
    123121  if(verbose > 1) G4cout << "### HadronInelasticQLHEP" << G4endl;
    124   store = G4HadronProcessStore::Instance();
    125122  theCascade = 0;
    126123  theQGStringDecay = 0;
    … …  
    330327    }
    331328  }
    332   store->Dump(verbose);
    333329}
    334330
    … …  
    422418{
    423419  hp->RegisterMe(hi);
    424   store->Register(hp,p,hi,m);
    425420  if(verbose > 1)
    426421    G4cout << "### QLHEP: Register new model " << m

  • trunk/source/physics_lists/lists/src/HadronPhysicsFTFC.cc

    r825 r850  
    2525//
    2626// $Id: HadronPhysicsFTFC.cc,v 1.2 2007/06/01 15:20:06 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: HEAD $
    2828//
    2929//---------------------------------------------------------------------------

  • trunk/source/physics_lists/lists/src/HadronPhysicsFTFP.cc

    r825 r850  
    2525//
    2626// $Id: HadronPhysicsFTFP.cc,v 1.2 2007/06/01 15:20:06 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: HEAD $
    2828//
    2929//---------------------------------------------------------------------------

  • trunk/source/physics_lists/lists/src/HadronPhysicsFTFP_BERT.cc

    r825 r850  
    2525//
    2626// $Id: HadronPhysicsFTFP_BERT.cc,v 1.1 2007/10/19 15:35:08 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: HEAD $
    2828//
    2929//---------------------------------------------------------------------------

  • trunk/source/physics_lists/lists/src/HadronPhysicsFTF_BIC.cc

    r825 r850  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsFTF_BIC.cc,v 1.1.2.1 2008/04/25 15:47:17 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     26// $Id: HadronPhysicsFTF_BIC.cc,v 1.2 2008/04/25 14:53:34 gunter Exp $
     27// GEANT4 tag $Name: HEAD $
    2828//
    2929//---------------------------------------------------------------------------

  • trunk/source/physics_lists/lists/src/HadronPhysicsLHEP.cc

    r825 r850  
    2525//
    2626// $Id: HadronPhysicsLHEP.cc,v 1.1 2006/10/31 11:35:10 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: HEAD $
    2828//
    2929//---------------------------------------------------------------------------

  • trunk/source/physics_lists/lists/src/HadronPhysicsLHEP_BERT.cc

    r825 r850  
    2525//
    2626// $Id: HadronPhysicsLHEP_BERT.cc,v 1.1 2006/10/31 11:35:10 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: HEAD $
    2828//
    2929//---------------------------------------------------------------------------

  • trunk/source/physics_lists/lists/src/HadronPhysicsLHEP_BERT_HP.cc

    r825 r850  
    2525//
    2626// $Id: HadronPhysicsLHEP_BERT_HP.cc,v 1.1 2006/10/31 11:35:10 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: HEAD $
    2828//
    2929//---------------------------------------------------------------------------

  • trunk/source/physics_lists/lists/src/HadronPhysicsLHEP_EMV.cc

    r825 r850  
    2525//
    2626// $Id: HadronPhysicsLHEP_EMV.cc,v 1.1 2006/10/31 11:35:10 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: HEAD $
    2828//
    2929//---------------------------------------------------------------------------

  • trunk/source/physics_lists/lists/src/HadronPhysicsLHEP_PRECO_HP.cc

    r825 r850  
    2525//
    2626// $Id: HadronPhysicsLHEP_PRECO_HP.cc,v 1.1 2006/10/31 11:35:11 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: HEAD $
    2828//
    2929//---------------------------------------------------------------------------

  • trunk/source/physics_lists/lists/src/HadronPhysicsQGSC.cc

    r825 r850  
    2525//
    2626// $Id: HadronPhysicsQGSC.cc,v 1.2 2007/04/26 14:47:11 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: HEAD $
    2828//
    2929//---------------------------------------------------------------------------

  • trunk/source/physics_lists/lists/src/HadronPhysicsQGSC_BERT.cc

    r825 r850  
    2525//
    2626// $Id: HadronPhysicsQGSC_BERT.cc,v 1.1 2007/11/15 16:58:16 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: HEAD $
    2828//
    2929//---------------------------------------------------------------------------

  • trunk/source/physics_lists/lists/src/HadronPhysicsQGSC_EFLOW.cc

    r825 r850  
    2525//
    2626// $Id: HadronPhysicsQGSC_EFLOW.cc,v 1.2 2007/04/26 14:47:11 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: HEAD $
    2828//
    2929//---------------------------------------------------------------------------

  • trunk/source/physics_lists/lists/src/HadronPhysicsQGSP.cc

    r825 r850  
    2626//
    2727// $Id: HadronPhysicsQGSP.cc,v 1.4 2007/11/13 10:16:11 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//---------------------------------------------------------------------------

  • trunk/source/physics_lists/lists/src/HadronPhysicsQGSP_BERT.cc

    r825 r850  
    2525//
    2626// $Id: HadronPhysicsQGSP_BERT.cc,v 1.3 2007/12/10 17:34:44 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: HEAD $
    2828//
    2929//---------------------------------------------------------------------------

  • trunk/source/physics_lists/lists/src/HadronPhysicsQGSP_BERT_HP.cc

    r825 r850  
    2525//
    2626// $Id: HadronPhysicsQGSP_BERT_HP.cc,v 1.2 2007/04/26 14:47:11 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: HEAD $
    2828//
    2929//---------------------------------------------------------------------------

  • trunk/source/physics_lists/lists/src/HadronPhysicsQGSP_BERT_TRV.cc

    r825 r850  
    2525//
    2626// $Id: HadronPhysicsQGSP_BERT_TRV.cc,v 1.1 2007/05/07 14:34:29 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: HEAD $
    2828//
    2929//---------------------------------------------------------------------------

  • trunk/source/physics_lists/lists/src/HadronPhysicsQGSP_BIC.cc

    r825 r850  
    2525//
    2626// $Id: HadronPhysicsQGSP_BIC.cc,v 1.2 2007/04/26 14:47:11 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: HEAD $
    2828//
    2929//---------------------------------------------------------------------------

  • trunk/source/physics_lists/lists/src/HadronPhysicsQGSP_BIC_HP.cc

    r825 r850  
    2525//
    2626// $Id: HadronPhysicsQGSP_BIC_HP.cc,v 1.3 2007/04/26 14:47:11 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: HEAD $
    2828//
    2929//---------------------------------------------------------------------------

  • trunk/source/physics_lists/lists/src/HadronPhysicsQGS_BIC.cc

    r825 r850  
    2525//
    2626// $Id: HadronPhysicsQGS_BIC.cc,v 1.1 2007/11/13 10:23:24 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: HEAD $
    2828//
    2929//---------------------------------------------------------------------------

  • trunk/source/physics_lists/lists/src/MinEkineCuts.cc

    r825 r850  
    2525//
    2626//
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: HEAD $
    2828//
    2929//
Note: See TracChangeset for help on using the changeset viewer.