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

geant4.8.2 beta

Location:
trunk/source/particles/management/src
Files:
30 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/particles/management/src/G4DalitzDecayChannel.cc

    r824 r850  
    2626//
    2727// $Id: G4DalitzDecayChannel.cc,v 1.8 2006/06/29 19:24:58 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//

  • trunk/source/particles/management/src/G4DecayProducts.cc

    r824 r850  
    2626//
    2727// $Id: G4DecayProducts.cc,v 1.16 2007/10/06 06:49:29 kurasige Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//

  • trunk/source/particles/management/src/G4DecayTable.cc

    r824 r850  
    2626//
    2727// $Id: G4DecayTable.cc,v 1.8 2006/06/29 19:25:02 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//

  • trunk/source/particles/management/src/G4DecayTableMessenger.cc

    r824 r850  
    2626//
    2727// $Id: G4DecayTableMessenger.cc,v 1.6 2006/06/29 19:25:04 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//

  • trunk/source/particles/management/src/G4DynamicParticle.cc

    r824 r850  
    2626//
    2727// $Id: G4DynamicParticle.cc,v 1.25 2007/03/11 07:17:35 kurasige Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//

  • trunk/source/particles/management/src/G4ElectronOccupancy.cc

    r824 r850  
    2626//
    2727// $Id: G4ElectronOccupancy.cc,v 1.9 2006/06/29 19:25:24 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//

  • trunk/source/particles/management/src/G4HyperNucleiProperties.cc

    r824 r850  
    2525//
    2626// $Id: G4HyperNucleiProperties.cc,v 1.3 2007/12/10 16:30:47 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: HEAD $
    2828//
    2929// ------------------------------------------------------------

  • trunk/source/particles/management/src/G4IonTable.cc

    r824 r850  
    2525//
    2626//
    27 // $Id: G4IonTable.cc,v 1.48.2.1 2008/04/25 12:21:52 kurasige Exp $
    28 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     27// $Id: G4IonTable.cc,v 1.51 2008/06/08 12:55:45 kurasige Exp $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
    … …  
    8181    }
    8282    fIsotopeTableList->clear();
    83   }
    84   delete fIsotopeTableList;
     83    delete fIsotopeTableList;
     84  }
    8585  fIsotopeTableList =0;
    8686
    … …  
    686686  if (IsIon(particle)) {
    687687    fIonList->push_back(particle);
    688   } else {
    689     //#ifdef G4VERBOSE
    690     //if (GetVerboseLevel()>1) {
    691     //  G4cout << "G4IonTable::Insert :" << particle->GetParticleName() ;
    692     //  G4cout << " is not ions" << G4endl;
    693     //}
    694     //#endif
    695688  }
    696689}
    … …  
    709702  } else {
    710703#ifdef G4VERBOSE
    711     if (GetVerboseLevel()>0) {
     704    if (GetVerboseLevel()>1) {
    712705      G4cout << "G4IonTable::Remove :" << particle->GetParticleName() ;
    713706      G4cout << " is not ions" << G4endl;
    … …  
    715708#endif
    716709  }
    717 
     710 
    718711}
    719712

  • trunk/source/particles/management/src/G4Ions.cc

    r824 r850  
    2525//
    2626//
    27 // $Id: G4Ions.cc,v 1.12 2007/03/11 07:17:35 kurasige Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: G4Ions.cc,v 1.13 2008/06/08 12:43:19 kurasige Exp $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
    … …  
    6868   SetAtomicNumber( G4int(GetPDGCharge()/eplus) );
    6969   SetAtomicMass( GetBaryonNumber() );
     70
     71   //G4cout << "G4Ions::" << GetParticleName() << G4endl;
    7072}
     73
     74
     75G4Ions::~G4Ions()
     76{
     77
     78  //G4cout << "G4Ions::" << GetParticleName() << G4endl;
     79}
     80
    7181
    7282G4Ions* G4Ions::IonsDefinition()

  • trunk/source/particles/management/src/G4IsotopeProperty.cc

    r824 r850  
    2626//
    2727// $Id: G4IsotopeProperty.cc,v 1.7 2007/03/16 05:25:08 kurasige Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//

  • trunk/source/particles/management/src/G4KL3DecayChannel.cc

    r824 r850  
    2626//
    2727// $Id: G4KL3DecayChannel.cc,v 1.8 2006/06/29 19:25:32 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//

  • trunk/source/particles/management/src/G4MuonDecayChannel.cc

    r824 r850  
    2626//
    2727// $Id: G4MuonDecayChannel.cc,v 1.17 2006/06/29 19:25:34 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//

  • trunk/source/particles/management/src/G4NeutronBetaDecayChannel.cc

    r824 r850  
    2626//
    2727// $Id: G4NeutronBetaDecayChannel.cc,v 1.7 2006/06/29 19:25:38 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//

  • trunk/source/particles/management/src/G4NucleiProperties.cc

    r824 r850  
    2626//
    2727// $Id: G4NucleiProperties.cc,v 1.13 2007/09/14 07:04:09 kurasige Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//

  • trunk/source/particles/management/src/G4NucleiPropertiesTableA.cc

    r824 r850  
    2626//
    2727// $Id: G4NucleiPropertiesTableA.cc,v 1.10 2006/06/29 19:25:42 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// -------------------------------------------------------------------

  • trunk/source/particles/management/src/G4NucleiPropertiesTableB.cc

    r824 r850  
    2626//
    2727// $Id: G4NucleiPropertiesTableB.cc,v 1.9 2006/06/29 19:25:44 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// -------------------------------------------------------------------

  • trunk/source/particles/management/src/G4NucleiPropertiesTheoreticalTableA.cc

    r824 r850  
    2626//
    2727// $Id: G4NucleiPropertiesTheoreticalTableA.cc,v 1.8 2006/06/29 19:25:46 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//

  • trunk/source/particles/management/src/G4PDGCodeChecker.cc

    r824 r850  
    2525//
    2626//
    27 // $Id: G4PDGCodeChecker.cc,v 1.10 2007/11/14 02:22:08 kurasige Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: G4PDGCodeChecker.cc,v 1.11 2008/06/08 12:43:19 kurasige Exp $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
    … …  
    4545{
    4646  code = 0;
    47   verboseLevel = 3;
     47  verboseLevel = 1;
    4848}
    4949
    … …  
    101101  if ((quark1==0)||(quark2==0)||(quark3==0)){
    102102#ifdef G4VERBOSE
    103     if (verboseLevel>1) {
     103    if (verboseLevel>0) {
    104104      G4cout << " G4PDGCodeChecker::CheckPDGCode : ";
    105105      G4cout << " meson has three quark ";
    … …  
    161161  if ((quark1<quark2)||(quark2<quark3)||(quark1<quark3)) {
    162162#ifdef G4VERBOSE
    163     if (verboseLevel>1) {
     163    if (verboseLevel>0) {
    164164      G4cout << " G4PDGCodeChecker::CheckPDGCode : ";
    165165      G4cout << " illegal code for baryon ";
    … …  
    171171  if (quark1> NumberOfQuarkFlavor) {
    172172#ifdef G4VERBOSE
    173     if (verboseLevel>1) {
     173    if (verboseLevel>0) {
    174174      G4cout << " G4PDGCodeChecker::CheckPDGCode : ";
    175175      G4cout << " ??? unknown quark ";
    … …  
    211211  if ((quark1 !=0)||(quark2==0)||(quark3==0)){
    212212#ifdef G4VERBOSE
    213     if (verboseLevel>1) {
     213    if (verboseLevel>0) {
    214214      G4cout << " G4PDGCodeChecker::CheckPDGCode : ";
    215215      G4cout << " meson has only quark and anti-quark pair";
    … …  
    221221  if (quark2<quark3) {
    222222#ifdef G4VERBOSE
    223     if (verboseLevel>1) {
     223    if (verboseLevel>0) {
    224224      G4cout << " G4PDGCodeChecker::CheckPDGCode : ";
    225225      G4cout << " illegal code for meson ";
    … …  
    233233  if (quark2> NumberOfQuarkFlavor){
    234234#ifdef G4VERBOSE
    235     if (verboseLevel>1) {
     235    if (verboseLevel>0) {
    236236      G4cout << " G4PDGCodeChecker::CheckPDGCode : ";
    237237      G4cout << " ??? unknown quark ";
    … …  
    282282  } else if (quark2>NumberOfQuarkFlavor){
    283283#ifdef G4VERBOSE
    284     if (verboseLevel>1) {
     284    if (verboseLevel>0) {
    285285      G4cout << " G4PDGCodeChecker::CheckPDGCode : ";
    286286      G4cout << " ??? unknown quark ";
    … …  
    309309  if ( std::abs(quark1)>NumberOfQuarkFlavor ) {
    310310#ifdef G4VERBOSE
    311     if (verboseLevel>1) {
     311    if (verboseLevel>0) {
    312312      G4cout << " G4PDGCodeChecker::CheckPDGCode : ";
    313313      G4cout << " ??? unknown quark ";
    … …  
    345345  if (std::abs(totalCharge-thePDGCharge)>0.1*eplus) {
    346346#ifdef G4VERBOSE
    347     if (verboseLevel>1) {
     347    if (verboseLevel>0) {
    348348      G4cout << " G4PDGCodeChecker::CheckCharge  : ";
    349349      G4cout << " illegal electric charge " << thePDGCharge/eplus;
    … …  
    374374  if (A < 2 || Z > A-L || L>A || Z<=0 ) {
    375375#ifdef G4VERBOSE
    376     if (verboseLevel>1) {
     376    if (verboseLevel>0) {
    377377      G4cout << " G4PDGCodeChecker::CheckPDGCode : ";
    378378      G4cout << " ???  Illegal PDG encoding for nucleus ";

  • trunk/source/particles/management/src/G4ParticleDefinition.cc

    r824 r850  
    2525//
    2626//
    27 // $Id: G4ParticleDefinition.cc,v 1.30 2007/11/14 02:22:08 kurasige Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: G4ParticleDefinition.cc,v 1.31 2008/06/08 12:43:19 kurasige Exp $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
    … …  
    113113   theParticleTable = G4ParticleTable::GetParticleTable();
    114114   theParticleTable->Insert(this);
     115   
     116   //set verboseLevel equal to ParticleTable
     117   verboseLevel = theParticleTable->GetVerboseLevel();
    115118
    116119   if (anti_encoding !=0) theAntiPDGEncoding = anti_encoding;
    … …  
    180183
    181184  G4PDGCodeChecker checker;
     185  checker.SetVerboseLevel(verboseLevel);
    182186
    183187  G4int temp = checker.CheckPDGCode(thePDGEncoding, theParticleType);
    … …  
    193197        temp = 0;
    194198#ifdef G4VERBOSE
    195         if (verboseLevel>1) {
     199        if (verboseLevel>0) {
    196200          G4cout << "G4ParticleDefinition::FillQuarkContents  : ";
    197201          G4cout << " illegal charge (" << thePDGCharge/eplus;
    … …  
    204208        temp=0;
    205209#ifdef G4VERBOSE
    206         if (verboseLevel>1) {
     210        if (verboseLevel>0) {
    207211          G4cout << "G4ParticleDefinition::FillQuarkContents  : ";
    208212          G4cout << " illegal SPIN (" << thePDGiSpin << "/2";

  • trunk/source/particles/management/src/G4ParticleMessenger.cc

    r824 r850  
    2525//
    2626//
    27 // $Id: G4ParticleMessenger.cc,v 1.9 2007/03/15 06:53:27 kurasige Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: G4ParticleMessenger.cc,v 1.10 2008/06/08 12:43:19 kurasige Exp $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
    … …  
    9090  findCmd->SetParameterName("encoding", false);
    9191
     92  // -- particle/property/Verbose ---
     93  verboseCmd = new G4UIcmdWithAnInteger("/particle/verbose",this);
     94  verboseCmd->SetGuidance("Set Verbose level of particle table.");
     95  verboseCmd->SetGuidance(" 0 : Silent (default)");
     96  verboseCmd->SetGuidance(" 1 : Display warning messages");
     97  verboseCmd->SetGuidance(" 2 : Display more");
     98  verboseCmd->SetParameterName("verbose_level",true);
     99  verboseCmd->SetDefaultValue(0);
     100  verboseCmd->SetRange("verbose_level >=0");
     101
    92102  currentParticle = 0;
    93103
    … …  
    100110{
    101111  delete fParticlePropertyMessenger;
     112
    102113  delete listCmd;
    103114  delete selectCmd;
     115  delete findCmd;
     116  delete verboseCmd;
     117
    104118  delete thisDirectory;
    105   delete findCmd;
    106119}
    107120
    … …  
    154167      tmp->DumpTable();
    155168    }
     169  } else if( command==verboseCmd ) {
     170    //Commnad   /particle/verbose
     171    theParticleTable->SetVerboseLevel(verboseCmd->GetNewIntValue(newValues));
    156172  }   
    157173}
    … …  
    179195      return currentParticle->GetParticleName();
    180196    }
     197  } else if( command==verboseCmd ){
     198    //Commnad   /particle/verbose
     199    return verboseCmd->ConvertToString(theParticleTable->GetVerboseLevel());
    181200  }
    182201  return "";

  • trunk/source/particles/management/src/G4ParticlePropertyMessenger.cc

    r824 r850  
    2626//
    2727// $Id: G4ParticlePropertyMessenger.cc,v 1.7 2006/06/29 19:25:59 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//

  • trunk/source/particles/management/src/G4ParticleTable.cc

    r824 r850  
    2525//
    2626//
    27 // $Id: G4ParticleTable.cc,v 1.29.2.1 2008/04/25 12:21:52 kurasige Exp $
    28 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     27// $Id: G4ParticleTable.cc,v 1.33 2008/06/08 12:55:45 kurasige Exp $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// class G4ParticleTable
    … …  
    5959////////////////////
    6060G4ParticleTable::G4ParticleTable()
    61      :verboseLevel(0),fParticleMessenger(0),
     61     :verboseLevel(1),fParticleMessenger(0),
    6262      noName(" "),
    6363      readyToUse(false)
    … …  
    174174  piter -> reset();
    175175  while( (*piter)() ){
     176#ifdef G4VERBOSE
     177    if (verboseLevel>2){
     178      G4cout << "Delete " << (piter->value())->GetParticleName()
     179             << " " << (piter->value()) << G4endl;
     180    }
     181#endif
    176182    delete (piter->value());
    177183  }
    … …  
    259265        fShortLivedTable->Insert(particle);
    260266      }
     267
     268      // set Verbose Level same as ParticleTable
     269      particle->SetVerboseLevel(verboseLevel);
     270
     271#ifdef G4VERBOSE
     272      if (verboseLevel>3){
     273        G4cout << "The particle "<< particle->GetParticleName()
     274               << " is inserted in the ParticleTable " << G4endl;
     275      }
     276#endif
    261277
    262278      return particle;
    … …  
    291307  }
    292308
     309#ifdef G4VERBOSE
     310  if (verboseLevel>3){
     311    G4cout << "The particle "<< particle->GetParticleName()
     312           << " is removed from the ParticleTable " << G4endl;
     313  }
     314#endif
     315
    293316  return particle;
    294317}
    … …  
    357380      counter++;
    358381    }
    359   }
    360 #ifdef G4VERBOSE
    361   if (verboseLevel>0){
     382  } 
     383#ifdef G4VERBOSE
     384  if (verboseLevel>1){
    362385    G4cout << " G4ParticleTable::GetParticle";
    363386    G4cout << " invalid index (=" << index << ")" << G4endl;
    … …  
    370393G4ParticleDefinition* G4ParticleTable::FindParticle(const G4ParticleDefinition *particle)
    371394{
    372    CheckReadiness();
     395  CheckReadiness();
    373396  G4String key = GetKey(particle);
    374397  return FindParticle(key);
    … …  
    382405    if (aPDGEncoding == 0){
    383406#ifdef G4VERBOSE
    384       if (verboseLevel>0){
     407      if (verboseLevel>1){
    385408        G4cout << "PDGEncoding  [" <<  aPDGEncoding << "] is not valid " << G4endl;
    386409      }
    … …  
    388411      return 0;
    389412    }
    390 
     413   
    391414    G4PTblEncodingDictionary *pedic =  fEncodingDictionary;
    392415    G4ParticleDefinition* particle =0; 
    … …  
    398421
    399422#ifdef G4VERBOSE
    400     if ((particle == 0) && (verboseLevel>0) ){
     423    if ((particle == 0) && (verboseLevel>1) ){
    401424      G4cout << "CODE:" << aPDGEncoding << " does not exist in ParticleTable " << G4endl;
    402425    }
    … …  
    451474
    452475
     476

  • trunk/source/particles/management/src/G4PhaseSpaceDecayChannel.cc

    r824 r850  
    2626//
    2727// $Id: G4PhaseSpaceDecayChannel.cc,v 1.13 2007/10/06 06:49:29 kurasige Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//

  • trunk/source/particles/management/src/G4PrimaryParticle.cc

    r824 r850  
    2626//
    2727// $Id: G4PrimaryParticle.cc,v 1.5 2007/10/06 06:49:29 kurasige Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030

  • trunk/source/particles/management/src/G4PrimaryVertex.cc

    r824 r850  
    2626//
    2727// $Id: G4PrimaryVertex.cc,v 1.4 2007/10/06 06:49:29 kurasige Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030

  • trunk/source/particles/management/src/G4ShortLivedTable.cc

    r824 r850  
    2525//
    2626//
    27 // $Id: G4ShortLivedTable.cc,v 1.14.2.1 2008/04/25 12:21:52 kurasige Exp $
    28 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     27// $Id: G4ShortLivedTable.cc,v 1.16 2008/06/08 12:55:45 kurasige Exp $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
    … …  
    9494  } else {
    9595#ifdef G4VERBOSE
    96     if (GetVerboseLevel()>0) {
     96    if (GetVerboseLevel()>1) {
    9797      G4cout << "G4ShortLivedTable::Remove :" << particle->GetParticleName() ;
    9898      G4cout << " is not short lived" << G4endl;

  • trunk/source/particles/management/src/G4TauLeptonicDecayChannel.cc

    r824 r850  
    2626//
    2727// $Id: G4TauLeptonicDecayChannel.cc,v 1.5 2006/06/29 19:26:18 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//

  • trunk/source/particles/management/src/G4VDecayChannel.cc

    r824 r850  
    2626//
    2727// $Id: G4VDecayChannel.cc,v 1.18 2006/06/29 19:26:20 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//

  • trunk/source/particles/management/src/G4VUserPrimaryParticleInformation.cc

    r824 r850  
    2626//
    2727// $Id: G4VUserPrimaryParticleInformation.cc,v 1.2 2006/06/29 19:26:22 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030#include "G4VUserPrimaryParticleInformation.hh"

  • trunk/source/particles/management/src/G4VUserPrimaryVertexInformation.cc

    r824 r850  
    2626//
    2727// $Id: G4VUserPrimaryVertexInformation.cc,v 1.2 2006/06/29 19:26:24 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
Note: See TracChangeset for help on using the changeset viewer.