Import Geant4 10.3.0.beta source tree

2016-06-30 14:12:05 +02:00
parent a654a7ab1f
commit 4ec577e5c4
2021 changed files with 100995 additions and 78277 deletions
@@ -41,8 +41,10 @@ class G4ParticleHPAngularP
  
  G4ParticleHPAngularP()
  {
-    theCosTh = 0;
-    theProb = 0;
+    theCosTh = NULL;
+    theProb = NULL;
+    theEnergy = 0.;
+    nCoeff = 0;
  }
  ~G4ParticleHPAngularP()
  {
@@ -66,7 +66,6 @@ class G4ParticleHPCapture : public G4HadronicInteraction
  
  private:
  
-  G4double * xSec;
      std::vector<G4ParticleHPChannel*>* theCapture;
  G4String dirName;
  G4int numEle;
@@ -92,6 +92,7 @@ class G4ParticleHPCaptureData : public G4VCrossSectionDataSet
      G4PhysicsTable * theCrossSections;

      G4bool onFlightDB;
+      G4bool instanceOfWorker;
 };

 #endif
@@ -50,7 +50,10 @@ class G4ParticleHPContAngularPar
      G4bool fresh;
      G4double currentMeanEnergy;
      G4double remaining_energy; 
-      toBeCached():fresh(true),currentMeanEnergy(-2.0),remaining_energy(0.0){};
+      G4double theTargetCode;
+      G4ReactionProduct* theTarget;
+      G4ReactionProduct* thePrimary;
+      toBeCached():fresh(true),currentMeanEnergy(-2.0),remaining_energy(0.0),theTargetCode(-1.0),theTarget(NULL),thePrimary(NULL){};
   };

  public:
@@ -63,6 +66,12 @@ class G4ParticleHPContAngularPar
    fCache.Put(NULL);
    theMinEner = DBL_MAX;
    theMaxEner = -DBL_MAX;
+    theEnergy = -1;
+    nEnergies = -1;
+    nDiscreteEnergies = -1;
+    nAngularParameters = -1;
+    theProjectile = NULL;
+    adjustResult = true;
  }

  G4ParticleHPContAngularPar(G4ParticleDefinition* projectile); 
@@ -83,15 +92,15 @@ class G4ParticleHPContAngularPar
  
  void SetPrimary(G4ReactionProduct * aPrimary)
  {
-    thePrimary = aPrimary;
+    fCache.Get()->thePrimary = aPrimary;
  }
  
  void SetTarget(G4ReactionProduct * aTarget)
  {
-    theTarget = aTarget;
+    fCache.Get()->theTarget = aTarget;
  }
  
-  void SetTargetCode(G4double aTargetCode) { theTargetCode = aTargetCode; }
+ void SetTargetCode(G4double aTargetCode) { fCache.Get()->theTargetCode = aTargetCode; }
  
  void SetInterpolation(G4int theInterpolation)
  {
@@ -170,9 +179,9 @@ private:
  
  G4ParticleHPInterpolator theInt;
  
-  G4double theTargetCode;
-  G4ReactionProduct * theTarget;
-  G4ReactionProduct * thePrimary;
+  //G4double theTargetCode;
+  //G4ReactionProduct * theTarget;
+  //G4ReactionProduct * thePrimary;
  
  //G4double currentMeanEnergy;

@@ -52,6 +52,10 @@ class G4ParticleHPContEnergyAngular : public G4VParticleHPEnergyAngular
  {
    theAngular = 0;
    currentMeanEnergy.Put( -2 );
+    theTargetCode = -1.0;
+    theAngularRep = -1;
+    nEnergy = -1;
+    theInterpolation = -1;
  }
  
  ~G4ParticleHPContEnergyAngular()
@@ -71,7 +71,6 @@ class G4ParticleHPElastic : public G4HadronicInteraction
  private:
      std::vector<G4ParticleHPChannel*>* theElastic;
  
-  G4double * xSec;
  G4String dirName;
  G4int numEle;
  G4bool overrideSuspension;
@@ -91,6 +91,7 @@ class G4ParticleHPElasticData : public G4VCrossSectionDataSet
   
      G4PhysicsTable * theCrossSections;
      G4bool onFlightDB;
+      G4bool instanceOfWorker;
   
 };

@@ -65,7 +65,7 @@ class G4ParticleHPFSFissionFS : public G4ParticleHPFinalState
   return theNew;
  }
  
-  inline G4double GetMass(){ return targetMass; }
+  inline G4double GetMass(){ return theFinalStateNeutrons.GetTargetMass(); }
  
  void SampleNeutronMult(G4int&all, 
 	  		 G4int&Prompt, 
@@ -95,7 +95,7 @@ class G4ParticleHPFSFissionFS : public G4ParticleHPFinalState
  private:

  G4HadFinalState * ApplyYourself(const G4HadProjectile & ) { return 0; }  
-  G4double targetMass;
+  //G4double targetMass;
  
  G4ParticleHPParticleYield theFinalStateNeutrons;
  G4ParticleHPEnergyDistribution thePromptNeutronEnDis;
@@ -69,7 +69,6 @@ class G4ParticleHPFission : public G4HadronicInteraction

  private:
  
-  G4double * xSec;
  //G4ParticleHPChannel * theFission;
      std::vector<G4ParticleHPChannel*>* theFission;
  G4String dirName;
@@ -86,6 +86,7 @@ class G4ParticleHPFissionData : public G4VCrossSectionDataSet
      G4PhysicsTable * theCrossSections;

      G4bool onFlightDB;
+      G4bool instanceOfWorker;
 };

 #endif
@@ -47,6 +47,7 @@ class G4ParticleHPFissionERelease
     , delayedNeutronKinetic( 0.0 )
     , promptGammaEnergy( 0.0 )
     , delayedGammaEnergy( 0.0 )
+     , delayedBetaEnergy( 0.0 )
     , neutrinoEnergy( 0.0 )
     , reducedTotalEnergy( 0.0 )
     {
@@ -50,6 +50,7 @@ public:
  {
    theIndex = aHash.theIndex;
    theData = aHash.theData;
+    prepared = aHash.prepared;
    if(aHash.theUpper != 0)
    {
      theUpper = new G4ParticleHPHash(*(aHash.theUpper));
@@ -105,7 +105,6 @@ class G4ParticleHPInelastic : public G4HadronicInteraction

 protected:
  
-  G4double * xSec;
  //G4ParticleHPChannelList * theInelastic; // one List per element
  std::vector<G4ParticleHPChannelList*>* theInelastic; // one List per element
  G4String dirName;
@@ -102,6 +102,8 @@ class G4ParticleHPInelasticData : public G4VCrossSectionDataSet

      G4ParticleHPData* theHPData;

+      G4bool instanceOfWorker;
+
  //char envVariable[500];
 };

@@ -49,6 +49,8 @@ class G4ParticleHPLabAngularEnergy : public G4VParticleHPEnergyAngular
    theData = 0;
    nCosTh = 0;
    theSecondManager = 0;
+    nEnergies = -1;
+    currentMeanEnergy = -1.0;
  }
  ~G4ParticleHPLabAngularEnergy()
  {
@@ -42,6 +42,7 @@ class G4ParticleHPList
    theData = new G4double[2]; 
    nPoints=2;
    nEntries=0;
+    theLabel=0.0;
  }
  
  ~G4ParticleHPList()