Import Geant4 7.1.0 source tree

source/particles/management/src/G4ParticleDefinition.cc

@@ -21,8 +21,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4ParticleDefinition.cc,v 1.22 2004/12/02 08:09:00 kurasige Exp $
-// GEANT4 tag $Name: geant4-07-00-cand-03 $
+// $Id: G4ParticleDefinition.cc,v 1.24 2005/04/17 04:59:41 kurasige Exp $
+// GEANT4 tag $Name: geant4-07-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -71,7 +71,10 @@ G4ParticleDefinition::G4ParticleDefinition(
 		     G4bool              stable,
 		     G4double            lifetime,
 		     G4DecayTable        *decaytable,
-		     G4bool              shortlived)
+		     G4bool              shortlived,
+                     const G4String&     subType,
+                     G4int               anti_encoding)
+ 
 		 : theParticleName(aName), 
 		   thePDGMass(mass),
 		   thePDGWidth(width),
@@ -88,7 +91,7 @@ G4ParticleDefinition::G4ParticleDefinition(
 		   theLeptonNumber(lepton),
 		   theBaryonNumber(baryon),
 		   theParticleType(pType), 
-		   theParticleSubType(""), 
+		   theParticleSubType(subType), 
 		   thePDGEncoding(encoding),
 		   theAntiPDGEncoding(-1*encoding),
 		   fShortLivedFlag(shortlived),
@@ -96,6 +99,8 @@ G4ParticleDefinition::G4ParticleDefinition(
 		   thePDGLifeTime(lifetime), 
                    theDecayTable(decaytable),
 		   theProcessManager(0),
+                   theAtomicNumber(0),
+                   theAtomicMass(0),
                    verboseLevel(1),
   		   fApplyCutsFlag(false)
 {
@@ -103,13 +108,13 @@ G4ParticleDefinition::G4ParticleDefinition(
    theParticleTable = G4ParticleTable::GetParticleTable();
    theParticleTable->Insert(this);
 
+   if (anti_encoding !=0) theAntiPDGEncoding = anti_encoding;
+
    // check quark contents
 #ifdef G4VERBOSE
    if (this->FillQuarkContents() != thePDGEncoding) {
      if (verboseLevel>0) {
-       // cerr bnot G4cerr is used intentionally  
-       // because G4ParticleDefinition constructor may be called 
-       // before G4cerr object is instantiated !!
+       // Using G4cerr expecting that it is available in construction of static objects 
        G4cerr << "Particle " << aName << " has a strange PDGEncoding " <<G4endl;
      }
    }