Changeset 1340 for trunk/source/processes/hadronic/models/util/src/G4Fragment.cc

Timestamp:

Nov 5, 2010, 3:45:55 PM (14 years ago)

Author:

garnier

Message:

update ti head

File:

• trunk/source/processes/hadronic/models/util/src/G4Fragment.cc (modified) (11 diffs)

trunk/source/processes/hadronic/models/util/src/G4Fragment.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4Fragment.cc,v 1.16 2010/05/18 18:52:07 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4Fragment.cc,v 1.21 2010/09/28 16:06:32 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-ref-09 $
 //
 //---------------------------------------------------------------------
@@ -37 +37 @@
 // 03.05.2010 V.Ivanchenko General cleanup; moved obsolete methods from
 //            inline to source 
-//
+// 25.09.2010 M. Kelsey -- Change "setprecision" to "setwidth" in printout,
+//            add null pointer check.
 
 #include "G4Fragment.hh"
 #include "G4HadronicException.hh"
-#include "G4HadTmpUtil.hh"
 #include "G4Gamma.hh"
 #include "G4Electron.hh"
+#include "G4ios.hh"
+#include <iomanip>
 
 G4int G4Fragment::errCount = 0;
@@ -53 +55 @@
   theExcitationEnergy(0.0),
   theGroundStateMass(0.0),
-  theMomentum(0),
-  theAngularMomentum(0),
+  theMomentum(G4LorentzVector(0,0,0,0)),
+  theAngularMomentum(G4ThreeVector(0,0,0)),
   numberOfParticles(0),
+  numberOfCharged(0),
   numberOfHoles(0),
-  numberOfCharged(0),
+  numberOfChargedHoles(0),
+  numberOfShellElectrons(0),
   theParticleDefinition(0),
   theCreationTime(0.0)
-#ifdef PRECOMPOUND_TEST 
-  ,theCreatorModel("No name")
-#endif
 {}
 
@@ -75 +76 @@
    theAngularMomentum = right.theAngularMomentum;
    numberOfParticles = right.numberOfParticles;
+   numberOfCharged = right.numberOfCharged;
    numberOfHoles = right.numberOfHoles;
-   numberOfCharged = right.numberOfCharged;
+   numberOfChargedHoles = right.numberOfChargedHoles;
+   numberOfShellElectrons = right.numberOfShellElectrons;
    theParticleDefinition = right.theParticleDefinition;
    theCreationTime = right.theCreationTime;
-#ifdef PRECOMPOUND_TEST 
-   theCreatorModel = right.theCreatorModel;
-#endif
 }
 
@@ -87 +87 @@
 {}
 
-G4Fragment::G4Fragment(const G4int A, const G4int Z, const G4LorentzVector& aMomentum) :
+G4Fragment::G4Fragment(G4int A, G4int Z, const G4LorentzVector& aMomentum) :
   theA(A),
   theZ(Z),
   theMomentum(aMomentum),
-  theAngularMomentum(0),
+  theAngularMomentum(G4ThreeVector(0,0,0)),
   numberOfParticles(0),
+  numberOfCharged(0),
   numberOfHoles(0),
-  numberOfCharged(0),
+  numberOfChargedHoles(0),
+  numberOfShellElectrons(0),
   theParticleDefinition(0),
   theCreationTime(0.0)
-#ifdef PRECOMPOUND_TEST
-  ,theCreatorModel("No name")
-#endif
 {
   theExcitationEnergy = 0.0;
@@ -107 +106 @@
     CalculateExcitationEnergy(); 
   }
-  /*
-  theExcitationEnergy = theMomentum.mag() - 
-                        G4ParticleTable::GetParticleTable()->GetIonTable()
-                        ->GetIonMass( G4lrint(theZ), G4lrint(theA) );
-  if (theExcitationEnergy < 0.0) {
-    if (theExcitationEnergy > -10.0 * eV || 0 == G4lrint(theA)) {
-      theExcitationEnergy = 0.0;
-    } else {
-      G4cout << "A, Z, momentum, theExcitationEnergy"<<
-           A<<" "<<Z<<" "<<aMomentum<<" "<<theExcitationEnergy<<G4endl;
-      G4String text = "G4Fragment::G4Fragment Excitation Energy < 0.0!";
-      throw G4HadronicException(__FILE__, __LINE__, text);
-    }
-  }
-  */
-}
-
+}
 
 // This constructor is for initialize photons or electrons
@@ -131 +114 @@
   theZ(0),
   theMomentum(aMomentum),
-  theAngularMomentum(0),
+  theAngularMomentum(G4ThreeVector(0,0,0)),
   numberOfParticles(0),
+  numberOfCharged(0),
   numberOfHoles(0),
-  numberOfCharged(0),
+  numberOfChargedHoles(0),
+  numberOfShellElectrons(0),
   theParticleDefinition(aParticleDefinition),
   theCreationTime(0.0)
-#ifdef PRECOMPOUND_TEST 
-  ,theCreatorModel("No name")
-#endif
 {
   theExcitationEnergy = 0.0;
@@ -161 +143 @@
     theAngularMomentum = right.theAngularMomentum;
     numberOfParticles = right.numberOfParticles;
+    numberOfCharged = right.numberOfCharged;
     numberOfHoles = right.numberOfHoles;
-    numberOfCharged = right.numberOfCharged;
+    numberOfChargedHoles = right.numberOfChargedHoles;
+    numberOfShellElectrons = right.numberOfShellElectrons;
     theParticleDefinition = right.theParticleDefinition;
     theCreationTime = right.theCreationTime;
-#ifdef PRECOMPOUND_TEST 
-    theCreatorModel = right.theCreatorModel;
-#endif
   }
   return *this;
@@ -184 +165 @@
 std::ostream& operator << (std::ostream &out, const G4Fragment *theFragment)
 {
+  if (!theFragment) {
+    out << "Fragment: null pointer ";
+    return out;
+  }
+
   std::ios::fmtflags old_floatfield = out.flags();
   out.setf(std::ios::floatfield);
 
-  out 
-    << "Fragment: A = " << std::setprecision(3) << theFragment->theA 
-    << ", Z = " << std::setprecision(3) << theFragment->theZ ;
+  out << "Fragment: A = " << std::setw(3) << theFragment->theA 
+      << ", Z = " << std::setw(3) << theFragment->theZ ;
   out.setf(std::ios::scientific,std::ios::floatfield);
-  out
-    << ", U = " << theFragment->GetExcitationEnergy()/MeV 
-    << " MeV" << G4endl
-    << "          P = (" 
-    << theFragment->theMomentum.x()/MeV << ","
-    << theFragment->theMomentum.y()/MeV << ","
-    << theFragment->theMomentum.z()/MeV 
-    << ") MeV   E = " 
-    << theFragment->theMomentum.t()/MeV << " MeV";
-
+
+  // Store user's precision setting and reset to (3) here: back-compatibility
+  std::streamsize floatPrec = out.precision();
+
+  out << std::setprecision(3)
+      << ", U = " << theFragment->GetExcitationEnergy()/CLHEP::MeV 
+      << " MeV" << G4endl
+      << "          P = (" 
+      << theFragment->theMomentum.x()/CLHEP::MeV << ","
+      << theFragment->theMomentum.y()/CLHEP::MeV << ","
+      << theFragment->theMomentum.z()/CLHEP::MeV 
+      << ") MeV   E = " 
+      << theFragment->theMomentum.t()/CLHEP::MeV << " MeV"
+      << G4endl;
+       
   // What about Angular momentum???
 
   if (theFragment->GetNumberOfExcitons() != 0) {
-    out << G4endl;
     out << "          " 
-        << "#Particles = " << theFragment->numberOfParticles 
-        << ", #Holes = "   << theFragment->numberOfHoles
-        << ", #Charged = " << theFragment->numberOfCharged;
+        << "#Particles= " << theFragment->numberOfParticles 
+        << ", #Charged= " << theFragment->numberOfCharged
+        << ", #Holes= "   << theFragment->numberOfHoles
+        << ", #ChargedHoles= " << theFragment->numberOfChargedHoles
+        << G4endl;
   }
   out.setf(old_floatfield,std::ios::floatfield);
+  out.precision(floatPrec);
 
   return out;
-    
 }
 
@@ -222 +213 @@
 }
 
-void G4Fragment::ExcitationEnegryWarning()
-{
-  if (theExcitationEnergy < -10.0 * eV) {
+void G4Fragment::ExcitationEnergyWarning()
+{
+  if (theExcitationEnergy < -10 * CLHEP::eV) {
     ++errCount;
     if ( errCount <= 10 ) {
       G4cout << "G4Fragment::CalculateExcitationEnergy(): Excitation Energy = "
-             << theExcitationEnergy/MeV << " MeV for A = " 
-             <<theA << " and Z= " << theZ << G4endl;
+             << theExcitationEnergy/CLHEP::MeV << " MeV for A = " 
+             << theA << " and Z= " << theZ << G4endl;
       if( errCount == 10 ) {
         G4String text = "G4Fragment::G4Fragment Excitation Energy < 0.0!";
@@ -239 +230 @@
 }
 
-G4ThreeVector G4Fragment::IsotropicRandom3Vector(const G4double Magnitude) const
-  // Create a unit vector with a random direction isotropically distributed
-{
-  G4double CosTheta = 1.0 - 2.0*G4UniformRand();
-  G4double SinTheta = std::sqrt(1.0 - CosTheta*CosTheta);
-  G4double Phi = twopi*G4UniformRand();
-  G4ThreeVector Vector(Magnitude*std::cos(Phi)*SinTheta,
-                       Magnitude*std::sin(Phi)*SinTheta,
-                       Magnitude*CosTheta);
-
-  return Vector;                
-}
-
-void G4Fragment::SetExcitationEnergy(const G4double )
-{
-  //   theExcitationEnergy = value;
-  G4cout << "Warning: G4Fragment::SetExcitationEnergy() is a dummy method. Please, avoid to use it." << G4endl;
-}
-
-#ifdef PRECOMPOUND_TEST 
-G4String G4Fragment::GetCreatorModel() const 
-{ 
-  return theCreatorModel; 
-}
-
-void G4Fragment::SetCreatorModel(const G4String & aModel) 
-{ 
-  theCreatorModel = aModel; 
-}
-#endif
+void G4Fragment::NumberOfExitationWarning(const G4String& value)
+{
+  G4cout << "G4Fragment::"<< value << " ERROR "
+         << G4endl;
+  G4cout << this << G4endl; 
+  G4String text = "G4Fragment::G4Fragment wrong exciton number ";
+  throw G4HadronicException(__FILE__, __LINE__, text);
+}