Changeset 1347 for trunk/source/processes/hadronic/stopping

Timestamp:

Dec 22, 2010, 3:52:27 PM (14 years ago)

Author:

garnier

Message:

geant4 tag 9.4

Location:

trunk/source/processes/hadronic/stopping

Files:

• History (modified) (1 diff)
• src/G4KaonMinusAbsorptionAtRest.cc (modified) (1 diff)
• src/G4PiMinusAbsorptionAtRest.cc (modified) (1 diff)
• src/G4PiMinusStopMaterial.cc (modified) (5 diffs)
• src/G4StopDummyDeexcitation.cc (modified) (1 diff)

trunk/source/processes/hadronic/stopping/History

@@ -15 +15 @@
      ---------------------------------------------------------------
 
+11-Nov-2010 Dennis Wright        (hadr-stopping-V09-03-01)
+----------------------------------------------------------
+- G4MuonMinusCaptureAtRest::DoMuCapture : fix unused branch  
+    pd = G4Deuteron::Deuteron() in mass calculation
+- G4PiMinusStopMaterial: theR was used but uninitialized.  Now init'ed
+    to 0.5 in ctor 
+- G4PiMinusAbsorptionAtRest: remove null test for vector pointer
+    in dtor 
+- G4StopDummyDeexcitation: initialize pointer _products in ctor
+- G4KaonMinusAbsorptionAtRest::SigmaLambdaConversion : add dummy
+    particles to default of switch/case to avoid possible NULL
+    pointers
+ 
 20-Sep-2010 Gunter Folger        (hadr-stopping-V09-03-00)
 ----------------------------------------------------------

trunk/source/processes/hadronic/stopping/src/G4KaonMinusAbsorptionAtRest.cc

@@ -502 +502 @@
   default: 
     sigmaLambdaConversionRate = 0.;
+    // Add dummy particles to avoid possibility of passing NULL pointers
+    inNucleonDef   = G4Proton::Proton();
+    outNucleonDef  = G4Proton::Proton();
   }
   

trunk/source/processes/hadronic/stopping/src/G4PiMinusAbsorptionAtRest.cc

@@ -209 +209 @@
     }
 
-  G4int index = 3;
-  if (Z <= 3) { index = 3;}
-  if (Z > 3 && Z<= 6) {index = 6;}
+  G4int index = 0;
+  if (Z > 0 && Z < 4) {index = 3;}
+  if (Z > 3 && Z < 7) {index = 6;}
   if (Z == 7) {index = 7;}
   if (Z >= 8 && Z<= 11) {index = 8;}

trunk/source/processes/hadronic/stopping/src/G4PiMinusStopMaterial.cc

@@ -54 +54 @@
 
 G4PiMinusStopMaterial::G4PiMinusStopMaterial()
-  
 {
   _definitions = 0;
@@ -60 +59 @@
   _distributionE = 0;
   _distributionAngle = 0;
-
+  theR = 0.5;
 }
 
@@ -68 +67 @@
 G4PiMinusStopMaterial::~G4PiMinusStopMaterial()
 {
-  //  _definitions->clear();
   if (_definitions != 0) delete _definitions;
   _definitions = 0;
 
-  for(unsigned int i=0; i<_momenta->size(); i++) delete(*_momenta)[i];
+  for (unsigned int i=0; i<_momenta->size(); i++) delete(*_momenta)[i];
   if (_momenta != 0) delete _momenta;
 
@@ -94 +92 @@
 }
 
-std::vector<G4LorentzVector*>* G4PiMinusStopMaterial::P4Vector(const G4double binding,
-                                                                      const G4double massNucleus)
+std::vector<G4LorentzVector*>*
+G4PiMinusStopMaterial::P4Vector(const G4double binding,
+                                const G4double massNucleus)
 {
-
-  // Generate energy of direct absorption products according to experimental data
-  // The energy distribution of the two nucleons is assumed to be the same 
-  // for protons and neutrons  
-
+  // Generate energy of direct absorption products according to experimental
+  // data.  The energy distribution of the two nucleons is assumed to be the
+  // same for protons and neutrons.  
 
   G4double eKin1;
@@ -191 +188 @@
 }
 
-
-
-
-
-
-
-
-
-

trunk/source/processes/hadronic/stopping/src/G4StopDummyDeexcitation.cc

@@ -42 +42 @@
 // Constructor
 
-G4StopDummyDeexcitation::G4StopDummyDeexcitation()
-  
-{}
+G4StopDummyDeexcitation::G4StopDummyDeexcitation()  
+{
+  _products = 0;
+}