Import Geant4 10.4.1 source tree

2018-03-02 09:34:30 +01:00
parent fc6af9e721
commit fe04dcb406
341 changed files with 18389 additions and 24522 deletions
@@ -15,6 +15,10 @@ code and to keep track of all tags.
     * Please list in reverse chronological order (last date on top)
     ---------------------------------------------------------------

+27 February 2018  Alberto Ribon (hadr-casc-V10-03-07)
+-----------------------------------------------------
+-  G4NucleiModel : replaced obsolete std::bind2nd with std::bind .
+
 27 November 2017  Dennis Wright (hadr-casc-V10-03-06)
 -----------------------------------------------------
 - G4CascadeInterface::createBullet, G4CascadeInterface::ApplyYourself: 
@@ -142,7 +142,7 @@
 //		Check zone argument to inverseMFP() to ensure within range.
 // 20130611  M. Kelsey -- Undo "spath<=path" change (20130511), replace with
 //		explicit check on spath==0.
-// 20130619  A. Ribon -- Fixed reproducibility problem in the method
+// 20130619  A. Ribon  -- Fixed reproducibility problem in the method
 //              generateParticleFate
 // 20130627  M. Kelsey -- Check "path==0.", rather than spath.
 // 20130628  M. Kelsey -- Print deuteron type code, rather than array index,
@@ -158,6 +158,7 @@
 // 20141001  M. Kelsey -- Change sign of "dv" in boundaryTransition
 // 20150608  M. Kelsey -- Label all while loops as terminating.
 // 20150622  M. Kelsey -- Use G4AutoDelete for _TLS_ buffers.
+// 20180227  A. Ribon  -- Replaced obsolete std::bind2nd with std::bind

 #include "G4NucleiModel.hh"
 #include "G4AutoDelete.hh"
@@ -1264,7 +1265,7 @@ void G4NucleiModel::choosePointAlongTraj(G4CascadParticle& cparticle) {

  // Normalize CDF to unit integral
  std::transform(wtlen.begin(), wtlen.end(), wtlen.begin(),
-		 std::bind2nd(std::divides<G4double>(), wtlen.back()));
+		 std::bind(std::divides<G4double>(), std::placeholders::_1, wtlen.back()));
  
  if (verboseLevel > 3) {
    G4cout << " weights";
@@ -14,6 +14,11 @@ code and to keep track of all tags.
     * Please list in reverse chronological order (last date on top)
     ---------------------------------------------------------------

+19 December 2017 Gabriele Cosmo (hadr-deex-V10-03-52)
+- Fixed self-consistency in G4ChatterjeeCrossSection header (missing #include).
+  Fixed #ifdef guard in G4StatMFMacroBiNucleon header.
+  Thanks to Raphael Isemann for reporting these.
+
 03 November 2017 Vladimir Ivanchenko (hadr-deex-V10-03-51)
 - G4DeexPrecoParameters - fixed printout of parameters

@@ -24,12 +24,12 @@
 // ********************************************************************
 //
 //
-// $Id: G4StatMFMacroBiNucleon.hh 67983 2013-03-13 10:42:03Z gcosmo $
+// $Id: G4StatMFMacroBiNucleon.hh 108519 2018-02-16 08:25:29Z gcosmo $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara

-#ifndef G4StatMFMacroBiBiNucleon_h
+#ifndef G4StatMFMacroBiNucleon_h_h
 #define G4StatMFMacroBiNucleon_h 1

 #include "G4VStatMFMacroCluster.hh"
@@ -33,6 +33,7 @@
 #ifndef G4ChatterjeeCrossSection_h
 #define G4ChatterjeeCrossSection_h 1

+#include <CLHEP/Units/SystemOfUnits.h>
 #include "globals.hh"
 #include "G4Pow.hh"

@@ -14,6 +14,12 @@ code and to keep track of all tags.
    * Please list in reverse chronological order (last date on top)
    ---------------------------------------------------------------

+19 December 2017  Gabriele Cosmo (hadr-fission-V10-03-00)
+-------------------------------------------------------
+- Fixed self-consistency in G4LLNLFission header (missing #include).
+  Added missing #ifdef guards in G4fissionEvent header.
+  Thanks to Raphael Isemann for reporting these.
+
 5 November 2015  Alberto Ribon (hadr-fission-V10-01-07)
 -------------------------------------------------------
 - Removed neutron_hp/
@@ -55,8 +55,10 @@
 // $Id: G4LLNLFission.hh 67966 2013-03-13 09:38:38Z gcosmo $
 //

+#include "G4Types.hh"
+
 //
-// This class is a copy of Fission.hh, made for use with Geant4.
+// This file is a copy of Fission.hh, made for use with Geant4.
 //

  extern void genspfissevt_(G4int *isotope, G4double *time);
@@ -54,6 +54,8 @@
 //
 // $Id: G4fissionEvent.hh 68799 2013-04-05 13:29:46Z gcosmo $
 //
+#ifndef G4fissionEvent_hh
+#define G4fissionEvent_hh

 #include "globals.hh"
 #include <string>
@@ -190,3 +192,5 @@ class G4fissionEvent {
      static G4double fisslibrng(void);
      static G4double rngf2d(void);
 };
+
+#endif
@@ -14,18 +14,23 @@ code and to keep track of all tags.
     * Please list in reverse chronological order (last date on top)
     ---------------------------------------------------------------

-23-December 2017 Vladimir Ivanchenko      had-im_r_V10-03-01
+19-December 2017, Gabriele Cosmo          hadr-im_r-V10-03-02
+- Fixed self-consistency in headers (missing #include) in G4CrossSectionBuffer,
+  G4DeltaNstarBuilder and G4NNstarBuilder.
+  Thanks to Raphael Isemann for reporting these.
+
+23-November 2017, Vladimir Ivanchenko     had-im_r_V10-03-01
 - G4ParticleTypeConverter - all methods become const
 - G4ConcreteMesonBaryonToResonance - fixed memory leak, adding
    static objects with const only methods

-21-December 2016 Gunter Folger            had-im_r_V10-03-00
+21-December 2016, Gunter Folger           had-im_r_V10-03-00
 - G4VScatteringCollision: Fix memory leak in MT, bug report 1905

-13-November 2015 Gunter Folger            had-im_r-V10-01-05
+13-November 2015, Gunter Folger           had-im_r-V10-01-05
 - Revert back to G4float, add 'f' for initialisation.

-13-November 2015 Gunter Folger            had-im_r-V10-01-04
+13-November 2015, Gunter Folger           had-im_r-V10-01-04
 - Replace G4float by G4double

 30-October 2015, Gunter Folger            had-im_r-V10-01-03
@@ -30,8 +30,9 @@
 #include <vector>
 #include <CLHEP/Units/SystemOfUnits.h>

-#include "G4ParticleDefinition.hh"
 #include "globals.hh"
+#include "G4ParticleDefinition.hh"
+#include "G4KineticTrack.hh"

 class G4CrossSectionBuffer
 {
@@ -27,6 +27,7 @@
 #define G4DeltaNstarBuilder_h

 #include "G4VXResonanceTable.hh"
+#include "G4XDeltaNstarTable.hh"

 class G4DeltaNstarBuilder : public G4VXResonanceTable
 {
@@ -27,6 +27,7 @@
 #define G4NNstarBuilder_h

 #include "G4VXResonanceTable.hh"
+#include "G4XNNstarTable.hh"

 class G4NNstarBuilder : public G4VXResonanceTable
 {
@@ -14,6 +14,12 @@ code and to keep track of all tags.
     * Please list in reverse chronological order (last date on top)
     ---------------------------------------------------------------

+19 December 2017 Gabriele Cosmo (hadr-hpp-V10-03-10)
+---------------------------------------------------
+- Fixed self-consistency in headers (missing #include) in G4FFGEnumerations,
+  G4FPYNubarValues, G4ParticleHPAngularP and G4ParticleHPHash.
+  Thanks to Raphael Isemann for reporting these.
+
 29 November 2017 Tatsumi Koi (hadr-hpp-V10-03-09)
 ---------------------------------------------------
 - Change tolerance value and implementation in calculation of KallbachZero. 
@@ -33,6 +33,8 @@
 #ifndef G4FFGENUMAERATIONS_HH
 #define	G4FFGENUMAERATIONS_HH

+#include "G4Types.hh"
+
 /** G4FFGEnumerations is a namespace that contains all the enumerations that
 *  are used in the fission fragment generator code.
 */
@@ -49,6 +49,8 @@
 #ifndef G4FPYNUBARVALUES_HH
 #define	G4FPYNUBARVALUES_HH

+#include "G4Types.hh"
+
 /** Evaluated nubar values for neutron induced fission. The data are represented
 *  as linear regression fits from experimental data in the form: v = mx + b,
 *  where x is the incident neutron energy.
@@ -34,6 +34,7 @@

 #include "globals.hh"
 #include "G4InterpolationManager.hh"
+#include "G4ParticleHPInterpolator.hh"

 class G4ParticleHPAngularP
 {
@@ -29,8 +29,9 @@
 #ifndef G4ParticleHPHash_h
 #define G4ParticleHPHash_h

-#include "globals.hh"
 #include <vector>
+#include "globals.hh"
+#include "G4ParticleHPDataPoint.hh"

 class G4ParticleHPHash
 {
@@ -1,4 +1,4 @@
-$Id: History 107318 2017-11-08 16:27:32Z gcosmo $
+$Id: History 108528 2018-02-16 08:38:40Z gcosmo $
 -------------------------------------------------------------------

       ==========================================================
@@ -15,6 +15,10 @@ code and to keep track of all tags.
     * Please list in reverse chronological order (last date on top)
     ---------------------------------------------------------------

+19-Dec-2017 G. Cosmo      hadr-partonstring-mgt-V10-03-05
+- Fixed self-consistency in G4VertexCode header (missing #include).
+  Thanks to Raphael Isemann for reporting this.
+
 08-Nov-2017 A. Ribon      hadr-partonstring-mgt-V10-03-04
 -  Minor clean-up and indentation: no changes in the random sequence.

@@ -24,11 +24,12 @@
 // ********************************************************************
 //
 //
-// $Id: G4VertexCode.hh 100828 2016-11-02 15:25:59Z gcosmo $
+// $Id: G4VertexCode.hh 108528 2018-02-16 08:38:40Z gcosmo $
 //
 #ifndef G4VertexCode_h
 #define G4VertexCode_h 1

+#include "G4String.hh"

 class G4VertexCode
 {
@@ -1,4 +1,4 @@
-$Id: History 106980 2017-10-31 09:02:49Z gcosmo $
+$Id: History 108530 2018-02-16 08:45:20Z gcosmo $
 -------------------------------------------------------------------

       ==========================================================
@@ -15,6 +15,10 @@ code and to keep track of all tags.
     * Please list in reverse chronological order (last date on top)
     ---------------------------------------------------------------

+19-Dec-2017 G. Cosmo                     (hadr-qgsm-V10-03-06)
+- Fixed self-consistency in G4SPPartonInfo header (missing #include).
+  Thanks to Raphael Isemann for reporting this.
+
 26-Oct-2017 A. Ribon                     (hadr-qgsm-V10-03-05)
 - Brought back the stable, production QGS (as in 10.3).

@@ -26,6 +26,8 @@
 #ifndef G4SPPartonInfo_h
 #define G4SPPartonInfo_h

+#include "G4Types.hh"
+
 class G4SPPartonInfo
 {
  public:
@@ -14,6 +14,19 @@ track of all tags.
     * Reverse chronological order (last date on top), please *
     ----------------------------------------------------------

+14 December 2017  Dennis Wright  radioactive_decay-V10-03-22
+------------------------------------------------------------
+- re-tag 
+ 
+12 December 2017  Dennis Wright  radioactive_decay-V10-03-21
+------------------------------------------------------------
+- G4RadioactiveDecay.hh, .cc: add check that environment variable
+   G4RADIOACTIVEDATA is pointing to correct directory.  Moved check from
+   G4RadioactiveDecay::LoadDecayTable() to ctor.  Fixes bug #1942.
+
+- G4RadioactiveDecayBase.hh, .cc: same change as above  
+
+
 15 November 2017  Dennis Wright  radioactive_decay-V10-03-20
 ------------------------------------------------------------
 - G4RadioactiveDecay::DecayIt in the variance reduction branch:
@@ -316,7 +316,10 @@ class G4RadioactiveDecay : public G4VRestDiscreteProcess
    G4int decayWindows[100];
    static const G4double levelTolerance;

-    //User define radioactive decay data files replacing some files in the G4RADECAY database
+    // Radioactive decay database directory path 
+    G4String dirPath;
+
+    // User-defined radioactive decay data files
    std::map<G4int, G4String> theUserRadioactiveDataFiles;

    // Library of decay tables
@@ -204,6 +204,9 @@ class G4RadioactiveDecayBase : public G4VRestDiscreteProcess
    G4double      forceDecayHalfAngle;
    static const G4ThreeVector origin;	// (0,0,0) for convenience

+    // Radioactive decay database directory path 
+    G4String dirPath;
+
    //User define radioactive decay data files replacing some files in the G4RADECAY database
    std::map<G4int, G4String> theUserRadioactiveDataFiles;

@@ -157,7 +157,8 @@ DecayTableMap* G4RadioactiveDecay::master_dkmap = 0;

 G4RadioactiveDecay::G4RadioactiveDecay(const G4String& processName)
 : G4VRestDiscreteProcess(processName, fDecay), isInitialised(false),
-   forceDecayDirection(0.,0.,0.), forceDecayHalfAngle(0.*deg), verboseLevel(0)
+   forceDecayDirection(0.,0.,0.), forceDecayHalfAngle(0.*deg), dirPath(""),
+   verboseLevel(0)
 {
 #ifdef G4VERBOSE
  if (GetVerboseLevel() > 1) {
@@ -176,7 +177,23 @@ G4RadioactiveDecay::G4RadioactiveDecay(const G4String& processName)
  // photonEvaporation->SetVerboseLevel(2);
  photonEvaporation->RDMForced(true);
  photonEvaporation->SetICM(true);
-  
+
+  // Check data directory
+  char* path_var = getenv("G4RADIOACTIVEDATA");
+  if (!path_var) {
+    G4Exception("G4RadioactiveDecay()","HAD_RDM_200",FatalException,
+                "Environment variable G4RADIOACTIVEDATA is not set");
+  } else {
+    dirPath = path_var;   // convert to string
+    std::ostringstream os;
+    os << dirPath << "/z1.a3";   // used as a dummy 
+    std::ifstream testFile;
+    testFile.open(os.str() );
+    if (!testFile.is_open() ) 
+      G4Exception("G4RadioactiveDecay()","HAD_RDM_201",FatalException,
+                  "Environment variable G4RADIOACTIVEDATA is set, but does not point to correct directory");
+  }
+
  // Reset the list of user defined data files
  theUserRadioactiveDataFiles.clear();

@@ -816,15 +833,8 @@ G4RadioactiveDecay::LoadDecayTable(const G4ParticleDefinition& theParentNucleus)
  G4String file = theUserRadioactiveDataFiles[1000*A+Z];

  if (file == "") {
-    if (!getenv("G4RADIOACTIVEDATA") ) {
-      G4cout << "Please setenv G4RADIOACTIVEDATA to point to the radioactive decay data files."
-             << G4endl;
-      throw G4HadronicException(__FILE__, __LINE__, " Please setenv G4RADIOACTIVEDATA to point to the radioactive decay data files.");
-    }
-    G4String dirName = getenv("G4RADIOACTIVEDATA");
-
    std::ostringstream os;
-    os << dirName << "/z" << Z << ".a" << A << '\0';
+    os << dirPath << "/z" << Z << ".a" << A << '\0';
    file = os.str();
  }

@@ -98,7 +98,8 @@ DecayTableMap* G4RadioactiveDecayBase::master_dkmap = 0;

 G4RadioactiveDecayBase::G4RadioactiveDecayBase(const G4String& processName)
 : G4VRestDiscreteProcess(processName, fDecay), isInitialised(false),
-   forceDecayDirection(0.,0.,0.), forceDecayHalfAngle(0.*deg), verboseLevel(0)
+   forceDecayDirection(0.,0.,0.), forceDecayHalfAngle(0.*deg), dirPath(""),
+   verboseLevel(0)
 {
 #ifdef G4VERBOSE
  if (GetVerboseLevel() > 1) {
@@ -119,7 +120,23 @@ G4RadioactiveDecayBase::G4RadioactiveDecayBase(const G4String& processName)

  G4DeexPrecoParameters* deex = G4NuclearLevelData::GetInstance()->GetParameters();
  deex->SetCorrelatedGamma(true);
-  
+
+  // Check data directory
+  char* path_var = getenv("G4RADIOACTIVEDATA");
+  if (!path_var) {
+    G4Exception("G4RadioactiveDecay()","HAD_RDM_200",FatalException,
+                "Environment variable G4RADIOACTIVEDATA is not set");
+  } else {
+    dirPath = path_var;   // convert to string
+    std::ostringstream os;
+    os << dirPath << "/z1.a3";   // used as a dummy 
+    std::ifstream testFile;
+    testFile.open(os.str() );
+    if (!testFile.is_open() )
+      G4Exception("G4RadioactiveDecay()","HAD_RDM_201",FatalException,
+                  "Environment variable G4RADIOACTIVEDATA is set, but does not point to correct directory");
+  }
+
  // Reset the list of user defined data files
  theUserRadioactiveDataFiles.clear();

@@ -446,15 +463,16 @@ G4RadioactiveDecayBase::LoadDecayTable(const G4ParticleDefinition& theParentNucl
  G4String file = theUserRadioactiveDataFiles[1000*A+Z];

  if (file == "") {
+/*
    if (!getenv("G4RADIOACTIVEDATA") ) {
      G4cout << "Please setenv G4RADIOACTIVEDATA to point to the radioactive decay data files."
             << G4endl;
      throw G4HadronicException(__FILE__, __LINE__, " Please setenv G4RADIOACTIVEDATA to point to the radioactive decay data files.");
    }
    G4String dirName = getenv("G4RADIOACTIVEDATA");
-
+*/
    std::ostringstream os;
-    os << dirName << "/z" << Z << ".a" << A << '\0';
+    os << dirPath << "/z" << Z << ".a" << A << '\0';
    file = os.str();
  }