Ignore:
Timestamp:
Jan 8, 2010, 11:56:51 AM (15 years ago)
Author:
garnier
Message:

update geant4.9.3 tag

Location:
trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QBesIKJY.cc

    r1196 r1228  
    2626//
    2727// $Id: G4QBesIKJY.cc,v 1.4 2009/11/10 17:13:46 mkossov Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//      ---------------- G4QBesIKJY ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QCHIPSWorld.cc

    r1196 r1228  
    2626//
    2727// $Id: G4QCHIPSWorld.cc,v 1.33 2009/02/23 09:49:24 mkossov Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//      ---------------- G4QCHIPSWorld ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QCandidate.cc

    r1196 r1228  
    2626//
    2727// $Id: G4QCandidate.cc,v 1.35 2009/02/23 09:49:24 mkossov Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//      ---------------- G4QCandidate ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QChipolino.cc

    r1196 r1228  
    2626//
    2727// $Id: G4QChipolino.cc,v 1.36 2009/08/10 16:36:53 mkossov Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//      ---------------- G4QChipolino ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QContent.cc

    r1196 r1228  
    2626//
    2727// $Id: G4QContent.cc,v 1.49 2009/08/07 14:20:57 mkossov Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//      ---------------- G4QContent ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QDecayChan.cc

    r1196 r1228  
    2626//
    2727// $Id: G4QDecayChan.cc,v 1.28 2009/02/23 09:49:24 mkossov Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//      ---------------- G4QDecayChan ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QEnvironment.cc

    r1196 r1228  
    2828//
    2929//
    30 // $Id: G4QEnvironment.cc,v 1.157 2009/11/16 18:15:01 mkossov Exp $
    31 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     30// $Id: G4QEnvironment.cc,v 1.160 2009/12/03 18:09:07 mkossov Exp $
     31// GEANT4 tag $Name: geant4-09-03 $
    3232//
    3333//      ---------------- G4QEnvironment ----------------
    … …  
    17371737    //G4int   c3Max = 9;                    // Max#of "no hadrons" steps (reduced below?)
    17381738    //G4int   c3Max = 3;
    1739     G4int   c3Max = 1;
     1739    //G4int   c3Max = 1;
     1740    G4int   c3Max = 0;
    17401741    //G4int   premC = 27;
    17411742    //G4int   premC = 3;
    … …  
    17451746    //if(envA>1&&envA<19) premC = 36/envA;
    17461747    //if(envA>1&&envA<25) premC = 48/envA;
    1747     if(envA>1&&envA<41) premC = 80/envA;
     1748    //if(envA>1&&envA<41) premC = 80/envA;
    17481749    G4int  sumstat= 2;                     // Sum of statuses of all Quasmons
    17491750    G4bool force  = false;                 // Prototype of the Force Major Flag
    17501751    G4int cbR     =0;                      // Counter of the "Stoped by Coulomb Barrier"
    17511752    //
    1752     G4int cbRM    =1;                      // MaxCounter of the "StopedByCoulombBarrier"
     1753    G4int cbRM    =0;                      //** MaxCounter of "StopedByCoulombBarrier" **
     1754    //G4int cbRM    =1;                      // MaxCounter of the "StopedByCoulombBarrier"
    17531755    //G4int cbRM    =3;                      // MaxCounter of the "StopedByCoulombBarrier"
    17541756    //G4int cbRM    =9;                      // MaxCounter of the "Stoped byCoulombBarrier"
    … …  
    17621764    G4bool first=true;                     // Flag of the first interaction (only NucMedia)
    17631765    G4int cAN=0;                           // Counter of the nucleon absorptions
    1764     G4int mcAN=3;                          // Max for the counter of nucleon absorptions
     1766    //G4int mcAN=27;                         // Max for the counter of nucleon absorptions
     1767    G4int mcAN=9;                          // Max for the counter of nucleon absorptions
     1768    //G4int mcAN=3;                          // Max for the counter of nucleon absorptions
     1769    //G4int mcAN=1;                          // Max for the counter of nucleon absorptions
    17651770    while (sumstat||totC<totCM)            // ===***=== The MAIN "FOREVER" LOOP ===***===
    17661771    {

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QException.cc

    r1196 r1228  
    2626//
    2727// $Id: G4QException.cc,v 1.10 2009/02/23 09:49:24 mkossov Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//      ---------------- G4QException ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QHadron.cc

    r1196 r1228  
    2626//
    2727// $Id: G4QHadron.cc,v 1.64 2009/09/02 15:45:19 mkossov Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//      ---------------- G4QHadron ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QInteraction.cc

    r1196 r1228  
    2626//
    2727// $Id: G4QInteraction.cc,v 1.6 2009/08/28 14:49:10 mkossov Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// ------------------------------------------------------------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QIsotope.cc

    r1196 r1228  
    2626//
    2727// $Id: G4QIsotope.cc,v 1.13 2009/08/28 14:49:10 mkossov Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//      ---------------- G4QIsotope class ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QNucleus.cc

    r1196 r1228  
    2525//
    2626//
    27 // $Id: G4QNucleus.cc,v 1.115 2009/11/04 10:52:34 mkossov Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// $Id: G4QNucleus.cc,v 1.116 2009/12/14 16:41:52 mkossov Exp $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//      ---------------- G4QNucleus ----------------
    … …  
    59905990      G4cerr<<"***G4QN::DecDiBar: badPDG="<<qPDG<<" or smallM="<<qM<<",2mP="<<dProt
    59915991            <<",2mN="<<dNeut<<G4endl;
    5992       throw G4QException("G4QNucleus::DecayDibar: Unknown PDG code or small Mass of DB");
     5992      // @@ Nothing to do. Just 2 GeV disappears... Very rare! Just to avoid the exception.
     5993      //throw G4QException("G4QNucleus::DecayDibar: Unknown PDG code or small Mass of DB");
    59935994    }
    59945995  }

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QPDGCode.cc

    r1196 r1228  
    2626//
    2727// $Id: G4QPDGCode.cc,v 1.63 2009/11/03 16:13:37 mkossov Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//      ---------------- G4QPDGCode ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QParentCluster.cc

    r1196 r1228  
    2626//
    2727// $Id: G4QParentCluster.cc,v 1.26 2009/02/23 09:49:24 mkossov Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//      ---------------- G4QParentCluster ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QParticle.cc

    r1196 r1228  
    2626//
    2727// $Id: G4QParticle.cc,v 1.34 2009/02/23 09:49:24 mkossov Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//      ---------------- G4QParticle ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QParton.cc

    r1196 r1228  
    2626//
    2727// $Id: G4QParton.cc,v 1.9 2009/07/17 16:54:57 mkossov Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// ------------------------------------------------------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QPartonPair.cc

    r1196 r1228  
    2727//
    2828// $Id: G4QPartonPair.cc,v 1.2 2009/02/23 09:49:24 mkossov Exp $
    29 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     29// GEANT4 tag $Name: geant4-09-03 $
    3030//
    3131// ------------------------------------------------------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QProbability.cc

    r1197 r1228  
    2626//
    2727// $Id: G4QProbability.cc,v 1.3 2009/09/04 16:13:19 mkossov Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// ------------------------------------------------------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QString.cc

    r1196 r1228  
    2626//
    2727// $Id: G4QString.cc,v 1.17 2009/09/04 14:38:00 mkossov Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030// ------------------------------------------------------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4Quasmon.cc

    r1196 r1228  
    2828//
    2929//
    30 // $Id: G4Quasmon.cc,v 1.119 2009/11/16 18:15:01 mkossov Exp $
    31 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     30// $Id: G4Quasmon.cc,v 1.121 2009/12/03 18:09:07 mkossov Exp $
     31// GEANT4 tag $Name: geant4-09-03 $
    3232//
    3333//      ---------------- G4Quasmon ----------------
    … …  
    537537    }
    538538    G4ThreeVector totBoost = tot4M.boostVector(); // BoostVector for TotalSystem (backward)
    539     G4ThreeVector totRBoost= -totBoost;    // Boost vector for Total System (forward)
     539    G4ThreeVector totRBoost= -totBoost;   // Boost vector for Total System (forward)
    540540    G4int    iniPDG =valQ.GetSPDGCode();
    541541    G4int    iniBN  =valQ.GetBaryonNumber();
    … …  
    548548#endif
    549549    G4QNucleus iniRN(iniP,iniN-1,iniS);
    550     G4double iniRM = iniRN.GetMZNS();      // Mass of Residual Quasmon when neutron is rad
     550    G4double iniRM = iniRN.GetMZNS();     // Mass of Residual Quasmon when neutron is rad
    551551    if(iniBN<2||envA>0) iniRM=0.;
    552552    G4double iniQM =G4QPDGCode(iniPDG).GetMass();  // Minimum mass of Quasmon
    … …  
    565565          <<envQC<<",Q+E="<<quen<<",tM="<<totPDG<<totQC<<totM<<"<"<<totMass<<G4endl;
    566566#endif
    567     G4int tQ    = valQ.GetTot();           // Total number of quarks for current Quasmon
     567    G4int tQ    = valQ.GetTot();          // Total number of quarks for current Quasmon
    568568    G4int bQ    = abs(valQ.GetBaryonNumber()); // Baryon number of the current Quasmon
    569     G4QContent cQ = valQ;                  // Temporary copy of Quasmon QC
    570     G4int   s   = 4;                       // Mesonic
    571     if (bQ) s   = 3*bQ + 2;                // Barionic
    572     if (tQ> s) cQ.DecQAQ((tQ-s)/2);        // Reduce QC to minimum QC
    573 #ifdef debug
    574     G4int rsPDG = cQ.GetSPDGCode();        // PDG for the lowest residual Quasmon state
     569    G4QContent cQ = valQ;                 // Temporary copy of Quasmon QC
     570    G4int   s   = 4;                      // Mesonic
     571    if (bQ) s   = 3*bQ + 2;               // Barionic
     572    if (tQ> s) cQ.DecQAQ((tQ-s)/2);       // Reduce QC to minimum QC
     573#ifdef debug
     574    G4int rsPDG = cQ.GetSPDGCode();       // PDG for the lowest residual Quasmon state
    575575    G4cout<<"G4Q::HQ:eN="<<envN<<",eZ="<<envZ<<",Q="<<rsPDG<<cQ<<",piF="<<piF<<",gaF="<<gaF
    576576         <<G4endl;
    577577#endif
    578     theEnvironment.UpdateClusters(false);// New A-clusters are calculated
     578    theEnvironment.UpdateClusters(false); // New A-clusters are calculated
    579579    //theEnvironment.PrepareCandidates(theQCandidates,false,false);//Calc.PrePreprob's of C
    580580    //G4bool fF=piF||gaF;
    581581    // piF,piF or gaF,gaF is correct. Made to avoid theSpecificInteractionTimeClusterChoice
    582582    theEnvironment.PrepareCandidates(theQCandidates,piF,piF);// Calc.PrePreprob of Candid's
    583     ModifyInMatterCandidates();            // Calculate InMediaMasses of Cand. & Possibil.
    584     G4double kMom = 0.;                    // Energy of primary qParton in Q-CMS
    585     G4double minK = 0.;                    // k_min for randomization
    586     G4double maxK = quasM/2.;              // k_max for randomization
    587     G4double kLS  = 0;                     // Energy of primary qParton in LS
    588     G4double cost = 0.;                    // Cos(theta) of k in QS InRespecTo Q direction
    589     G4bool   kCond = true;                 // k choice condition
    590     G4bool   qCond = true;                 // q choice condition
    591     G4bool   pCond = true;                 // Not adoptable parent cluster choice condition
    592     G4bool   fskip=false;                  // Flag to skip when sucked
    593     G4bool   fred =false;                  // Flag of Environment reduction
    594     //G4bool   ffdc =true;                   // Flag of not successful decay in fragment
    595     G4LorentzVector k4Mom=zeroLV;          // 4-momentum prototype for k
    596     G4LorentzVector cr4Mom=zeroLV;         // 4-momentum prototype for the ColResQuasmon
    597     G4int kCount =0;                       // Counter of attempts of k for hadronization
     583    ModifyInMatterCandidates();           // Calculate InMediaMasses of Cand. & Possibil.
     584    G4double kMom = 0.;                   // Energy of primary qParton in Q-CMS
     585    G4double minK = 0.;                   // k_min for randomization
     586    G4double maxK = quasM/2.;             // k_max for randomization
     587    G4double kLS  = 0;                    // Energy of primary qParton in LS
     588    G4double cost = 0.;                   // Cos(theta) of k in QS InRespecTo Q direction
     589    G4bool   kCond = true;                // k choice condition
     590    G4bool   qCond = true;                // q choice condition
     591    G4bool   pCond = true;                // Not adoptable parent cluster choice condition
     592    G4bool   fskip=false;                 // Flag to skip when sucked
     593    G4bool   fred =false;                 // Flag of Environment reduction
     594    //G4bool   ffdc =true;                  // Flag of not successful decay in fragment
     595    G4LorentzVector k4Mom=zeroLV;         // 4-momentum prototype for k
     596    G4LorentzVector cr4Mom=zeroLV;        // 4-momentum prototype for the ColResQuasmon
     597    G4int kCount =0;                      // Counter of attempts of k for hadronization
    598598    //G4int kCountMax=27;
    599599    //G4int kCountMax=9;
    600     //G4int kCountMax=3;                     // Try different k if they are below minK
    601     G4int kCountMax=1;                     // "No reson to increase it"
    602     //G4int kCountMax=0;                   //@@ *** Close search for the minimum k ***
     600    //G4int kCountMax=3;                    // Try different k if they are below minK
     601    G4int kCountMax=1;                    // "No reson to increase it"
     602    //G4int kCountMax=0;                    //@@ *** Close search for the minimum k ***
    603603    //
    604     G4int qCountMax=27;                   // Try different q to come over CoulBar or SepE
     604    //G4int qCountMax=27;                   // Try different q to come over CoulBar or SepE
     605    G4int qCountMax=12;                   // Try different q to come over CoulBar or SepE
    605606    //G4int qCountMax=9;                    // Try different q to come over CoulBar or SepE
    606607    //G4int qCountMax=3;                    // Try different q to come over CoulBar or SepE
    … …  
    612613    G4int pCountMax=1;                    //Try differentHadrons(Parents) forBetterRecoil
    613614    //if(envA>0) pCountMax=3;
    614     if(envA>0&&envA<31)
     615    //if(envA>0&&envA<31)
     616    if(envA>0&&envA<61)
    615617    {
    616       pCountMax=60/envA;
    617       kCountMax=pCountMax;
     618      //pCountMax=60/envA;
     619      pCountMax=120/envA;
     620      //kCountMax=pCountMax;                // See above !
    618621    }
    619622    G4bool gintFlag=false;                // Flag of gamma interaction with one quark
Note: See TracChangeset for help on using the changeset viewer.