Changeset 1315 for trunk/source/particles/management/src/G4ParticleDefinition.cc

Timestamp:

Jun 18, 2010, 11:42:07 AM (14 years ago)

Author:

garnier

Message:

update geant4-09-04-beta-cand-01 interfaces-V09-03-09 vis-V09-03-08

File:

• trunk/source/particles/management/src/G4ParticleDefinition.cc (modified) (4 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4ParticleDefinition.cc,v 1.34 2009/09/21 04:08:24 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4ParticleDefinition.cc,v 1.36 2010/05/20 01:01:07 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // 
@@ -133 +133 @@
    G4ApplicationState currentState = G4StateManager::GetStateManager()->GetCurrentState();
 
-   if ( (theParticleType!=nucleus) && (currentState!=G4State_PreInit)){
+   if ( !fShortLivedFlag && (theParticleType!=nucleus) && (currentState!=G4State_PreInit)){
 #ifdef G4VERBOSE
      if (GetVerboseLevel()>0) {
-       G4cout << "G4ParticleDefintion (other than ions) should be created in Pre_Init state  "; 
-       G4cout << aName << G4endl;
+       G4cerr << "G4ParticleDefintion (other than ions and shortlived) should be created in Pre_Init state  " 
+              << aName << G4endl;
      }
 #endif
@@ -225 +225 @@
 #ifdef G4VERBOSE
         if (verboseLevel>0) {
-          G4cout << "G4ParticleDefinition::FillQuarkContents  : ";
-          G4cout << " illegal charge (" << thePDGCharge/eplus;
-          G4cout << " PDG code=" << thePDGEncoding <<G4endl;
+          G4cerr << "G4ParticleDefinition::FillQuarkContents  : "
+                 << " illegal charge (" << thePDGCharge/eplus
+                 << " PDG code=" << thePDGEncoding <<G4endl;
         }
 #endif
@@ -236 +236 @@
 #ifdef G4VERBOSE
         if (verboseLevel>0) {
-          G4cout << "G4ParticleDefinition::FillQuarkContents  : ";
-          G4cout << " illegal SPIN (" << thePDGiSpin << "/2";
-          G4cout << " PDG code=" << thePDGEncoding <<G4endl;
+          G4cerr << "G4ParticleDefinition::FillQuarkContents  : "
+                 << " illegal SPIN (" << thePDGiSpin << "/2"
+                 << " PDG code=" << thePDGEncoding <<G4endl;
         }
 #endif