Changeset 1340 for trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/src/G4NuclearLevel.cc

Timestamp:

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

Author:

garnier

Message:

update ti head

File:

• trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/src/G4NuclearLevel.cc (modified) (7 diffs)

trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/src/G4NuclearLevel.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-//
+// $Id: G4NuclearLevel.cc,v 1.5 2010/10/10 23:01:39 mkelsey Exp $
 // -------------------------------------------------------------------
 //      GEANT 4 class file 
@@ -39 +39 @@
 //
 //      Modifications: 
+//        06 Oct 2010, M. Kelsey (kelsey@slac.stanford.edu)
+//              Add friendship for G4NuclearLevelManager; define private
+//              constructors without vectors.
 //
 //        09 Sep. 2002, Fan Lei  (flei@space.qinetiq.com)
@@ -63 +66 @@
   instanceCount+=aF;
   return instanceCount;
+}
+
+G4NuclearLevel::G4NuclearLevel()
+  : _energy(0.), _halfLife(0.), _angularMomentum(0.), _nGammas(0) {
+  // G4cout << "####### Incrementing "<<Increment(1)<<G4endl;
+}
+
+G4NuclearLevel::G4NuclearLevel(const G4double energy, const G4double halfLife,
+                               const G4double angularMomentum)
+  : _energy(energy), _halfLife(halfLife), _angularMomentum(angularMomentum),
+    _nGammas(0) {
+  // G4cout << "####### Incrementing "<<Increment(1)<<G4endl;
 }
 
@@ -77 +92 @@
                                const std::vector<double>& totalCC)
 
-{
-  _energy = energy;
-  _halfLife = halfLife;
-  _angularMomentum = angularMomentum;
-  unsigned int i;
-  for (i=0; i<eGamma.size(); i++)
-    {
-      _energies.push_back(eGamma[i]);
-      _weights.push_back(wGamma[i]);
-      _polarities.push_back(polarities[i]);
-      _kCC.push_back( kCC[i]);
-      _l1CC.push_back( l1CC[i]);
-      _l2CC.push_back( l2CC[i]);
-      _l3CC.push_back( l3CC[i]);
-      _m1CC.push_back( m1CC[i]);
-      _m2CC.push_back( m2CC[i]);
-      _m3CC.push_back( m3CC[i]);
-      _m4CC.push_back( m4CC[i]);
-      _m5CC.push_back( m5CC[i]);
-      _nPlusCC.push_back( nPlusCC[i]);
-      _totalCC.push_back( totalCC[i]);
-    }
-  _nGammas = _energies.size();
-  MakeProbabilities();
-  MakeCumProb();
- // G4cout << "####### Incrementing "<<Increment(1)<<G4endl;
+  : _energies(eGamma), _weights(wGamma), _polarities(polarities),
+     _kCC(kCC), _l1CC(l1CC), _l2CC(l2CC), _l3CC(l3CC),
+    _m1CC(m1CC), _m2CC(m2CC), _m3CC(m3CC), _m4CC(m4CC), _m5CC(m5CC),
+    _nPlusCC(nPlusCC), _totalCC(totalCC),
+    _energy(energy), _halfLife(halfLife), _angularMomentum(angularMomentum)
+{
+  Finalize();
+  // G4cout << "####### Incrementing "<<Increment(1)<<G4endl;
 }
 
@@ -255 +252 @@
   return;
 }
- 
+
+
+void G4NuclearLevel::Finalize() {
+  _nGammas = _energies.size();
+  MakeProbabilities();
+  MakeCumProb();
+}
+
 
 void G4NuclearLevel::MakeProbabilities()
@@ -261 +265 @@
   G4double sum = 0.;
   G4int i = 0;
-  for (i=0; i<_nGammas; i++)
-    {
-      sum += _weights[i]*(1+_totalCC[i]);
+  for (i=0; i<_nGammas; i++) {
+    sum += _weights[i]*(1.+_totalCC[i]);
+  }
+
+  if (sum <= 0.) _prob.resize(_nGammas, 1./_nGammas);   // Fast fill
+  else {
+    _prob.reserve(_nGammas);
+    for (i=0; i<_nGammas; i++) {
+      _prob.push_back(_weights[i]*(1.+_totalCC[i])/sum);
     }
-
-  for (i=0; i<_nGammas; i++)
-    {
-      if (sum > 0.) { _prob.push_back(_weights[i]*(1+_totalCC[i])/ sum); }
-      else { _prob.push_back(1./_nGammas); }
-    }
-  return;
+  }
 }
 
@@ -277 +281 @@
 void G4NuclearLevel::MakeCumProb()
 {
-  if (_nGammas > 0)
-    {
-      G4double sum = _prob[0];
-      _cumProb.push_back(sum);
-      
-      G4int i = 0;
-      for (i=1; i<_nGammas; i++)
-        {
-          sum += _prob[i];
-          _cumProb.push_back(sum);
-        }
-    }
-  return;
-}
-
-
-
+  if (_nGammas <= 0) return;
+
+  _cumProb.reserve(_nGammas);
+
+  G4double sum = _prob[0];
+  _cumProb.push_back(sum);
+  
+  for (G4int i=1; i<_nGammas; i++) {
+    sum += _prob[i];
+    _cumProb.push_back(sum);
+  }
+}
+
+
+