Import Geant4 11.1.0.beta source tree

source/processes/hadronic/models/inclxx/utils/include/G4INCLEventInfo.hh

@@ -131,6 +131,8 @@ namespace G4INCL {
         std::fill_n(theta, maxSizeParticles, (Float_t)0.0);
         std::fill_n(phi, maxSizeParticles, (Float_t)0.0);
         std::fill_n(origin, maxSizeParticles, 0);
+        std::fill_n(parentResonancePDGCode, maxSizeParticles, 0);
+        std::fill_n(parentResonanceID, maxSizeParticles, 0);
         std::fill_n(emissionTime, maxSizeParticles, (Float_t)0.0);
         std::fill_n(ARem, maxSizeRemnants, 0);
         std::fill_n(ZRem, maxSizeRemnants, 0);
@@ -191,6 +193,10 @@ namespace G4INCL {
        * Should be -1 for cascade particles, or the number of the remnant for
        * de-excitation particles. */
       Short_t origin[maxSizeParticles];
+      /** \brief Particle's parent resonance PDG code */
+      Int_t parentResonancePDGCode[maxSizeParticles];
+      /** \brief Particle's parent resonance unique ID identifier */
+      Int_t parentResonanceID[maxSizeParticles];
       /** \brief Emission time [fm/c] */
       Float_t emissionTime[maxSizeParticles];
       /** \brief History of the particle

source/processes/hadronic/models/inclxx/utils/include/G4INCLParticle.hh

@@ -101,6 +101,8 @@ namespace G4INCL {
       uncorrelatedMomentum(rhs.uncorrelatedMomentum),
       theParticleBias(rhs.theParticleBias),
       theNKaon(rhs.theNKaon),
+      theParentResonancePDGCode(rhs.theParentResonancePDGCode),
+      theParentResonanceID(rhs.theParentResonanceID),
       theHelicity(rhs.theHelicity),
       emissionTime(rhs.emissionTime),
       outOfWell(rhs.outOfWell),
@@ -146,6 +148,9 @@ namespace G4INCL {
       std::swap(thePotentialEnergy, rhs.thePotentialEnergy);
       // ID intentionally not swapped
 
+      std::swap(theParentResonancePDGCode, rhs.theParentResonancePDGCode);
+      std::swap(theParentResonanceID, rhs.theParentResonanceID);
+
       std::swap(theHelicity, rhs.theHelicity);
       std::swap(emissionTime, rhs.emissionTime);
       std::swap(outOfWell, rhs.outOfWell);
@@ -156,7 +161,6 @@ namespace G4INCL {
       
       std::swap(theParticleBias, rhs.theParticleBias);
       std::swap(theBiasCollisionVector, rhs.theBiasCollisionVector);
-
     }
 
   public:
@@ -1052,7 +1056,12 @@ namespace G4INCL {
      
     G4int getNumberOfKaon() const { return theNKaon; };
     void setNumberOfKaon(const G4int NK) { theNKaon = NK; }
-  
+
+    G4int getParentResonancePDGCode() const { return theParentResonancePDGCode; };
+    void setParentResonancePDGCode(const G4int parentPDGCode) { theParentResonancePDGCode = parentPDGCode; };    
+    G4int getParentResonanceID() const { return theParentResonanceID; };
+    void setParentResonanceID(const G4int parentID) { theParentResonanceID = parentID; };
+    
   public:
     /** \brief Time ordered vector of all bias applied
      * 
@@ -1099,6 +1108,9 @@ namespace G4INCL {
     /// \brief The number of Kaons inside the nucleus (update during the cascade)
     G4int theNKaon;
 
+    G4int theParentResonancePDGCode;
+    G4int theParentResonanceID;
+    
   private:
     G4double theHelicity;
     G4double emissionTime;

source/processes/hadronic/models/inclxx/utils/src/G4INCLEventInfo.cc

@@ -118,6 +118,8 @@ namespace G4INCL {
 
     EKin[nParticles] = EKinRem[remnantIndex];
     origin[nParticles] = -1; // Origin: cascade
+    parentResonancePDGCode[nParticles] = 0;  // No parent resonance
+    parentResonanceID[nParticles] = 0;       // No parent resonance
     history.push_back(""); // history
     nParticles++;
 // assert(history.size()==(unsigned int)nParticles);

source/processes/hadronic/models/inclxx/utils/src/G4INCLHFB.cc

@@ -87,7 +87,7 @@ namespace G4INCL {
       cleanTable();
 
 #ifdef INCLXX_IN_GEANT4_MODE
-       if(!std::getenv("G4INCLDATA")) {
+       if(!G4FindDataDir("G4INCLDATA")) {
         G4ExceptionDescription ed;
         ed << " Data missing: set environment variable G4INCLDATA\n"
            << " to point to the directory containing data files needed\n"
@@ -95,7 +95,7 @@ namespace G4INCL {
            G4Exception("G4INCLDataFile::readData()","table_radius_hfb.dat",
                 FatalException, ed);
       }
-      G4String dataPath0(std::getenv("G4INCLDATA"));
+      G4String dataPath0(G4FindDataDir("G4INCLDATA"));
       G4String dataPath(dataPath0 + "/table_radius_hfb.dat");
 #else
       // File name

source/processes/hadronic/models/inclxx/utils/src/G4INCLParticle.cc

@@ -74,6 +74,8 @@ namespace G4INCL {
     uncorrelatedMomentum(0.),
     theParticleBias(1.),
     theNKaon(0),
+    theParentResonancePDGCode(0),
+    theParentResonanceID(0),
     theHelicity(0.0),
     emissionTime(0.0),
     outOfWell(false),
@@ -98,6 +100,8 @@ namespace G4INCL {
     uncorrelatedMomentum(theMomentum.mag()),
     theParticleBias(1.),
     theNKaon(0),
+    theParentResonancePDGCode(0),
+    theParentResonanceID(0),
     theHelicity(0.0),
     emissionTime(0.0), outOfWell(false)
   {
@@ -124,6 +128,8 @@ namespace G4INCL {
     uncorrelatedMomentum(theMomentum.mag()),
     theParticleBias(1.),
     theNKaon(0),
+    theParentResonancePDGCode(0),
+    theParentResonanceID(0),
     theHelicity(0.0),
     emissionTime(0.0), outOfWell(false)
   {