Import Geant4 10.4.0 source tree

source/processes/hadronic/util/src/G4HadronicDeveloperParameters.cc

@@ -1,3 +1,28 @@
+//
+// ********************************************************************
+// * License and Disclaimer                                           *
+// *                                                                  *
+// * The  Geant4 software  is  copyright of the Copyright Holders  of *
+// * the Geant4 Collaboration.  It is provided  under  the terms  and *
+// * conditions of the Geant4 Software License,  included in the file *
+// * LICENSE and available at  http://cern.ch/geant4/license .  These *
+// * include a list of copyright holders.                             *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.  Please see the license in the file  LICENSE  and URL above *
+// * for the full disclaimer and the limitation of liability.         *
+// *                                                                  *
+// * This  code  implementation is the result of  the  scientific and *
+// * technical work of the GEANT4 collaboration.                      *
+// * By using,  copying,  modifying or  distributing the software (or *
+// * any work based  on the software)  you  agree  to acknowledge its *
+// * use  in  resulting  scientific  publications,  and indicate your *
+// * acceptance of all terms of the Geant4 Software license.          *
+// ********************************************************************
+//
 #include"G4HadronicDeveloperParameters.hh"
 
 G4HadronicDeveloperParameters& G4HadronicDeveloperParameters::GetInstance(){

source/processes/hadronic/util/src/G4NuclearPolarization.cc

@@ -39,26 +39,44 @@
 #include "G4NuclearPolarization.hh"
 #include <iomanip>
 
-G4NuclearPolarization::G4NuclearPolarization()
+G4NuclearPolarization::G4NuclearPolarization(G4int Z, G4int A, G4double exc)
+  : fZ(Z), fA(A), fExcEnergy(exc)
 {
   Unpolarize();
+  //G4cout << "NP: new " << this << G4endl;
 }
 
 G4NuclearPolarization::~G4NuclearPolarization()
-{}
+{
+  //G4cout << "NP: delete " << this << G4endl;
+}
+
+void G4NuclearPolarization::Clean()
+{
+  if(!fPolarization.empty()) {
+    for(auto & pol : fPolarization) {
+      pol.clear();
+    }
+    fPolarization.clear();
+  }
+} 
 
 G4bool G4NuclearPolarization::operator==(const G4NuclearPolarization &right) const
 {
-  return (fPolarization == right.fPolarization);
+  return (fZ == right.fZ && fA == right.fA && fExcEnergy == right.fExcEnergy 
+	  && fPolarization == right.fPolarization);
 }
 
 G4bool G4NuclearPolarization::operator!=(const G4NuclearPolarization &right) const
 {
-  return (fPolarization != right.fPolarization);
+  return (fZ != right.fZ || fA != right.fA || fExcEnergy != right.fExcEnergy 
+	  || fPolarization != right.fPolarization);
 }
 
 std::ostream& operator<<(std::ostream& out, const G4NuclearPolarization& p)
 {
+  out << "G4NuclearPolarization: Z= " << p.fZ << " A= " << p.fA << " Exc(MeV)= " 
+      << p.fExcEnergy << G4endl;
   out << " P = [ {";
   size_t kk = p.fPolarization.size();
   for(size_t k=0; k<kk; ++k) {