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

Timestamp:

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

Author:

garnier

Message:

geant4 tag 9.4

File:

• trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/src/G4NuclearLevel.cc (modified) (12 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 $
+// $Id: G4NuclearLevel.cc,v 1.7 2010/11/17 16:50:53 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-ref-00 $
+//
 // -------------------------------------------------------------------
 //      GEANT 4 class file 
@@ -55 +57 @@
 //              reading from experimental data. 
 //      
+//        28 October 2010, V.Ivanchenko moved copy constructor to source, cleanup
+//
 // -------------------------------------------------------------------
 
 #include "G4NuclearLevel.hh"
-
 #include "globals.hh"
 
@@ -73 +76 @@
 }
 
-G4NuclearLevel::G4NuclearLevel(const G4double energy, const G4double halfLife,
-                               const G4double angularMomentum)
+G4NuclearLevel::G4NuclearLevel(G4double energy, G4double halfLife,
+                               G4double angularMomentum)
   : _energy(energy), _halfLife(halfLife), _angularMomentum(angularMomentum),
     _nGammas(0) {
@@ -80 +83 @@
 }
 
-G4NuclearLevel::G4NuclearLevel(const G4double energy, const G4double halfLife,
-                               const G4double angularMomentum,
-                               const std::vector<double>& eGamma,
-                               const std::vector<double>& wGamma,
-                               const std::vector<double>& polarities,
-                               const std::vector<double>& kCC, const std::vector<double>& l1CC,
-                               const std::vector<double>& l2CC, const std::vector<double>& l3CC,
-                               const std::vector<double>& m1CC, const std::vector<double>& m2CC,
-                               const std::vector<double>& m3CC, const std::vector<double>& m4CC,
-                               const std::vector<double>& m5CC, const std::vector<double>& nPlusCC,
-                               const std::vector<double>& totalCC)
+G4NuclearLevel::G4NuclearLevel(G4double energy, G4double halfLife,
+                               G4double angularMomentum,
+                               const std::vector<G4double>& eGamma,
+                               const std::vector<G4double>& wGamma,
+                               const std::vector<G4double>& polarities,
+                               const std::vector<G4double>& kCC, const std::vector<G4double>& l1CC,
+                               const std::vector<G4double>& l2CC, const std::vector<G4double>& l3CC,
+                               const std::vector<G4double>& m1CC, const std::vector<G4double>& m2CC,
+                               const std::vector<G4double>& m3CC, const std::vector<G4double>& m4CC,
+                               const std::vector<G4double>& m5CC, const std::vector<G4double>& nPlusCC,
+                               const std::vector<G4double>& totalCC)
 
   : _energies(eGamma), _weights(wGamma), _polarities(polarities),
@@ -107 +110 @@
 }
 
-
 G4bool G4NuclearLevel::operator==(const G4NuclearLevel &right) const
 {
@@ -118 +120 @@
   return (this != (G4NuclearLevel *) &right);
 }
-
 
 G4bool G4NuclearLevel::operator<(const G4NuclearLevel &right) const  
@@ -126 +127 @@
 }
 
-
-const std::vector<double>& G4NuclearLevel::GammaEnergies() const
+const std::vector<G4double>& G4NuclearLevel::GammaEnergies() const
 {
   return _energies;
 }
  
-const std::vector<double>& G4NuclearLevel::GammaWeights() const
+const std::vector<G4double>& G4NuclearLevel::GammaWeights() const
 {
   return _weights;
@@ -138 +138 @@
  
 
-const std::vector<double>& G4NuclearLevel::GammaProbabilities() const
+const std::vector<G4double>& G4NuclearLevel::GammaProbabilities() const
 {
   return _prob;
@@ -144 +144 @@
  
 
-const std::vector<double>& G4NuclearLevel::GammaCumulativeProbabilities() const
+const std::vector<G4double>& G4NuclearLevel::GammaCumulativeProbabilities() const
 {
   return _cumProb;
@@ -150 +150 @@
  
 
-const std::vector<double>& G4NuclearLevel::GammaPolarities() const
+const std::vector<G4double>& G4NuclearLevel::GammaPolarities() const
 {
   return _polarities;
 }
  
-const std::vector<double>& G4NuclearLevel::KConvertionProbabilities() const
+const std::vector<G4double>& G4NuclearLevel::KConvertionProbabilities() const
 {
   return _kCC;
 }
  
-const std::vector<double>& G4NuclearLevel::L1ConvertionProbabilities() const
+const std::vector<G4double>& G4NuclearLevel::L1ConvertionProbabilities() const
 {
   return _l1CC;
 }
  
-const std::vector<double>& G4NuclearLevel::L2ConvertionProbabilities() const
+const std::vector<G4double>& G4NuclearLevel::L2ConvertionProbabilities() const
 {
   return _l2CC;
 }
  
-const std::vector<double>& G4NuclearLevel::L3ConvertionProbabilities() const
+const std::vector<G4double>& G4NuclearLevel::L3ConvertionProbabilities() const
 {
   return _l3CC;
 }
  
-const std::vector<double>& G4NuclearLevel::M1ConvertionProbabilities() const
+const std::vector<G4double>& G4NuclearLevel::M1ConvertionProbabilities() const
 {
   return _m1CC;
 }
  
-const std::vector<double>& G4NuclearLevel::M2ConvertionProbabilities() const
+const std::vector<G4double>& G4NuclearLevel::M2ConvertionProbabilities() const
 {
   return _m2CC;
 }
  
-const std::vector<double>& G4NuclearLevel::M3ConvertionProbabilities() const
+const std::vector<G4double>& G4NuclearLevel::M3ConvertionProbabilities() const
 {
   return _m3CC;
 }
  
-const std::vector<double>& G4NuclearLevel::M4ConvertionProbabilities() const
+const std::vector<G4double>& G4NuclearLevel::M4ConvertionProbabilities() const
 {
   return _m4CC;
 }
  
-const std::vector<double>& G4NuclearLevel::M5ConvertionProbabilities() const
+const std::vector<G4double>& G4NuclearLevel::M5ConvertionProbabilities() const
 {
   return _m5CC;
 }
  
-const std::vector<double>& G4NuclearLevel::NPlusConvertionProbabilities() const
+const std::vector<G4double>& G4NuclearLevel::NPlusConvertionProbabilities() const
 {
   return _nPlusCC;
 }
  
-const std::vector<double>& G4NuclearLevel::TotalConvertionProbabilities() const
+const std::vector<G4double>& G4NuclearLevel::TotalConvertionProbabilities() const
 {
   return _totalCC;
@@ -225 +225 @@
 }
  
-
 G4int G4NuclearLevel::NumberOfGammas() const
 {
@@ -294 +293 @@
 }
 
-
-
+const G4NuclearLevel& G4NuclearLevel::operator=(const G4NuclearLevel &right)
+{
+  if(this != &right)
+    {
+      _energies = right._energies;
+      _weights =right._weights;
+      _prob =right._prob;
+      _cumProb =right._cumProb;
+      _polarities =right._polarities;
+      _kCC = right._kCC;
+      _l1CC =right._l1CC;
+      _l2CC =right._l2CC;
+      _l3CC =right._l3CC;
+      _m1CC = right._m1CC;
+      _m2CC = right._m2CC;
+      _m3CC = right._m3CC;
+      _m4CC = right._m4CC;
+      _m5CC = right._m5CC;
+      _nPlusCC = right._nPlusCC;
+      _totalCC = right._totalCC;
+      _energy = right._energy;
+      _halfLife = right._halfLife;
+      _angularMomentum = right._angularMomentum;
+      _nGammas = right._nGammas;
+    }
+  return *this;
+}
+
+G4NuclearLevel::G4NuclearLevel(const G4NuclearLevel &right)
+{
+  _energies = right._energies;
+  _weights =right._weights;
+  _prob =right._prob;
+  _cumProb =right._cumProb;
+  _polarities =right._polarities;
+  _kCC = right._kCC;
+  _l1CC =right._l1CC;
+  _l2CC =right._l2CC;
+  _l3CC =right._l3CC;
+  _m1CC = right._m1CC;
+  _m2CC = right._m2CC;
+  _m3CC = right._m3CC;
+  _m4CC = right._m4CC;
+  _m5CC = right._m5CC;
+  _nPlusCC = right._nPlusCC;
+  _totalCC = right._totalCC;
+  _energy = right._energy;
+  _halfLife = right._halfLife;
+  _angularMomentum = right._angularMomentum;
+  _nGammas = right._nGammas;
+}
+
+
+