Changeset 850 for trunk/source/particles/management/src/G4ParticleTable.cc

Timestamp:

Sep 10, 2008, 5:40:37 PM (16 years ago)

Author:

garnier

Message:

geant4.8.2 beta

File:

• trunk/source/particles/management/src/G4ParticleTable.cc (modified) (11 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4ParticleTable.cc,v 1.29.2.1 2008/04/25 12:21:52 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4ParticleTable.cc,v 1.33 2008/06/08 12:55:45 kurasige Exp $
+// GEANT4 tag $Name: HEAD $
 //
 // class G4ParticleTable
@@ -59 +59 @@
 ////////////////////
 G4ParticleTable::G4ParticleTable()
-     :verboseLevel(0),fParticleMessenger(0),
+     :verboseLevel(1),fParticleMessenger(0),
       noName(" "),
       readyToUse(false)
@@ -174 +174 @@
   piter -> reset();
   while( (*piter)() ){
+#ifdef G4VERBOSE
+    if (verboseLevel>2){
+      G4cout << "Delete " << (piter->value())->GetParticleName() 
+             << " " << (piter->value()) << G4endl;
+    }
+#endif
     delete (piter->value());
   }
@@ -259 +265 @@
         fShortLivedTable->Insert(particle);
       }
+
+      // set Verbose Level same as ParticleTable
+      particle->SetVerboseLevel(verboseLevel);
+
+#ifdef G4VERBOSE
+      if (verboseLevel>3){
+        G4cout << "The particle "<< particle->GetParticleName() 
+               << " is inserted in the ParticleTable " << G4endl;
+      }
+#endif
 
       return particle;
@@ -291 +307 @@
   }
 
+#ifdef G4VERBOSE
+  if (verboseLevel>3){
+    G4cout << "The particle "<< particle->GetParticleName()
+           << " is removed from the ParticleTable " << G4endl;
+  }
+#endif
+
   return particle;
 }
@@ -357 +380 @@
       counter++;
     }
-  }
-#ifdef G4VERBOSE
-  if (verboseLevel>0){
+  } 
+#ifdef G4VERBOSE
+  if (verboseLevel>1){
     G4cout << " G4ParticleTable::GetParticle";
     G4cout << " invalid index (=" << index << ")" << G4endl;
@@ -370 +393 @@
 G4ParticleDefinition* G4ParticleTable::FindParticle(const G4ParticleDefinition *particle)
 {
-   CheckReadiness();
+  CheckReadiness();
   G4String key = GetKey(particle);
   return FindParticle(key);
@@ -382 +405 @@
     if (aPDGEncoding == 0){ 
 #ifdef G4VERBOSE
-      if (verboseLevel>0){
+      if (verboseLevel>1){
         G4cout << "PDGEncoding  [" <<  aPDGEncoding << "] is not valid " << G4endl;
       }
@@ -388 +411 @@
       return 0;
     }
-
+    
     G4PTblEncodingDictionary *pedic =  fEncodingDictionary;
     G4ParticleDefinition* particle =0;  
@@ -398 +421 @@
 
 #ifdef G4VERBOSE
-    if ((particle == 0) && (verboseLevel>0) ){
+    if ((particle == 0) && (verboseLevel>1) ){
       G4cout << "CODE:" << aPDGEncoding << " does not exist in ParticleTable " << G4endl;
     }
@@ -451 +474 @@
 
 
+