Changeset 1347 for trunk/source/processes/hadronic/models/de_excitation/management

Timestamp:

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

Author:

garnier

Message:

geant4 tag 9.4

Location:

trunk/source/processes/hadronic/models/de_excitation/management

Files:

• include/G4VEvaporationChannel.hh (modified) (4 diffs)
• src/G4VEvaporationChannel.cc (modified) (2 diffs)

trunk/source/processes/hadronic/models/de_excitation/management/include/G4VEvaporationChannel.hh

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4VEvaporationChannel.hh,v 1.6 2010/05/11 11:16:04 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-ref-09 $
+// $Id: G4VEvaporationChannel.hh,v 1.7 2010/10/29 17:35:04 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-ref-00 $
 //
 // Hadronic Process: Nuclear De-excitations
@@ -52 +52 @@
   virtual ~G4VEvaporationChannel();
 
-private:
-
-  G4VEvaporationChannel(const G4VEvaporationChannel & right);
-  const G4VEvaporationChannel & operator=(const G4VEvaporationChannel & right);
-
-public:
-
-  G4bool operator==(const G4VEvaporationChannel & right) const;
-  G4bool operator!=(const G4VEvaporationChannel & right) const;
-
   virtual void Initialize(const G4Fragment & fragment) = 0;
 
@@ -78 +68 @@
   virtual G4double GetEmissionProbability(void) const = 0;
 
-  G4String GetName() const {return Name;}
-  void SetName(const G4String & aName) { Name = aName;}
+  inline G4String GetName() const {return Name;}
+  inline void SetName(const G4String & aName) { Name = aName;}
 
   // for cross section selection
@@ -94 +84 @@
   G4String Name;
 
+  G4VEvaporationChannel(const G4VEvaporationChannel & right);
+  const G4VEvaporationChannel & operator=(const G4VEvaporationChannel & right);
+  G4bool operator==(const G4VEvaporationChannel & right) const;
+  G4bool operator!=(const G4VEvaporationChannel & right) const;
+
 };
 

trunk/source/processes/hadronic/models/de_excitation/management/src/G4VEvaporationChannel.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4VEvaporationChannel.cc,v 1.6 2010/04/25 18:43:08 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-ref-09 $
+// $Id: G4VEvaporationChannel.cc,v 1.7 2010/10/29 17:35:04 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-ref-00 $
 //
 // Hadronic Process: Nuclear De-excitations
@@ -34 +34 @@
 //                          new virtual methods EmittedFragment(s) to allow more optimal
 //                          work with G4Fragment objects; removed unnecesary exceptions
+// 28.10.2010 V.Ivanchenko defined members in constructor and cleaned up
 
 #include "G4VEvaporationChannel.hh"
-#include "G4HadronicException.hh"
 
 G4VEvaporationChannel::G4VEvaporationChannel(const G4String & aName) 
-  : Name(aName) 
+  :OPTxs(3),useSICB(false),Name(aName) 
 {}
 
 G4VEvaporationChannel::~G4VEvaporationChannel() 
 {}
-
-//G4VEvaporationChannel::G4VEvaporationChannel(const G4VEvaporationChannel &)
-//{
-// throw G4HadronicException(__FILE__, __LINE__, "G4VEvaporationChannel::copy_constructor meant to not be accessable");
-//}
-//const G4VEvaporationChannel & G4VEvaporationChannel::operator=(const G4VEvaporationChannel &)
-//{
-//  throw G4HadronicException(__FILE__, __LINE__, "G4VEvaporationChannel::operator= meant to not be accessable");
-//  return *this;
-//}
-
-G4bool G4VEvaporationChannel::operator==(const G4VEvaporationChannel &right) const
-{
-  return (this == (G4VEvaporationChannel *) &right);
-}
-
-G4bool G4VEvaporationChannel::operator!=(const G4VEvaporationChannel &right) const
-{
-  return (this != (G4VEvaporationChannel *) &right);
-}
 
 G4Fragment* G4VEvaporationChannel::EmittedFragment(G4Fragment*)