Import Geant4 9.6.0 source tree

2016-06-09 17:01:34 +02:00
parent b1eb5424d2
commit e2d2f9810a
10384 changed files with 698580 additions and 628834 deletions
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4InterpolationIterator.hh,v 1.9 2006-06-29 20:46:13 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4InterpolationIterator_h
 #define G4InterpolationIterator_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4InterpolationManager.hh,v 1.13 2007-06-06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4InterpolationManager_h
 #define G4InterpolationManager_h 1
@@ -114,7 +113,14 @@ class G4InterpolationManager
     for(G4int i=0; i<nRanges; i++)
     {
       aDataFile>>range[i];
+       //***************************************************************
+       //EMendoza -> there is a bug here.
+       /*
       if(i!=0) start[i] = start[i-1]+range[i-1];
+       */
+       //***************************************************************
+       if(i!=0) start[i] = range[i-1];
+       //***************************************************************
       aDataFile>>it;
       scheme[i] = MakeScheme(it);
     }
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4InterpolationScheme.hh,v 1.8 2006-06-29 20:46:17 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4InterpolationScheme_h
 #define G4InterpolationScheme_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHP2AInelasticFS.hh,v 1.9 2006-06-29 20:46:19 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHP2AInelasticFS_h
 #define G4NeutronHP2AInelasticFS_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHP2N2AInelasticFS.hh,v 1.9 2006-06-29 20:46:21 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHP2N2AInelasticFS_h
 #define G4NeutronHP2N2AInelasticFS_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHP2NAInelasticFS.hh,v 1.9 2006-06-29 20:46:23 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHP2NAInelasticFS_h
 #define G4NeutronHP2NAInelasticFS_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHP2NDInelasticFS.hh,v 1.9 2006-06-29 20:46:25 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHP2NDInelasticFS_h
 #define G4NeutronHP2NDInelasticFS_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHP2NInelasticFS.hh,v 1.9 2006-06-29 20:46:27 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHP2NInelasticFS_h
 #define G4NeutronHP2NInelasticFS_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHP2NPInelasticFS.hh,v 1.9 2006-06-29 20:46:29 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHP2NPInelasticFS_h
 #define G4NeutronHP2NPInelasticFS_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHP2PInelasticFS.hh,v 1.9 2006-06-29 20:46:31 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHP2PInelasticFS_h
 #define G4NeutronHP2PInelasticFS_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHP3AInelasticFS.hh,v 1.9 2006-06-29 20:46:33 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHP3AInelasticFS_h
 #define G4NeutronHP3AInelasticFS_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHP3NAInelasticFS.hh,v 1.9 2006-06-29 20:46:35 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHP3NAInelasticFS_h
 #define G4NeutronHP3NAInelasticFS_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHP3NInelasticFS.hh,v 1.9 2006-06-29 20:46:37 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHP3NInelasticFS_h
 #define G4NeutronHP3NInelasticFS_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHP3NPInelasticFS.hh,v 1.9 2006-06-29 20:46:39 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHP3NPInelasticFS_h
 #define G4NeutronHP3NPInelasticFS_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHP4NInelasticFS.hh,v 1.9 2006-06-29 20:46:41 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHP4NInelasticFS_h
 #define G4NeutronHP4NInelasticFS_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPAInelasticFS.hh,v 1.9 2006-06-29 20:46:43 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPAInelasticFS_h
 #define G4NeutronHPAInelasticFS_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPAngular.hh,v 1.12 2007-06-22 09:23:47 gcosmo Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 // 070613 fix memory leaking by T. Koi
 //
@@ -24,12 +24,13 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPAngularP.hh,v 1.11 2007-06-06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPAngularP_h
 #define G4NeutronHPAngularP_h 1

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

@@ -54,7 +55,7 @@ class G4NeutronHPAngularP
    G4int nProb;
    aDataFile >> eNeu >> nProb;
    theManager.Init(aDataFile);
-    eNeu *= eV;
+    eNeu *= CLHEP::eV;
    Init(eNeu, nProb);
    for (G4int iii=0; iii<nProb; iii++)
    {
@@ -24,17 +24,18 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPArbitaryTab.hh,v 1.12 2007-06-06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPArbitaryTab_h
 #define G4NeutronHPArbitaryTab_h 1

-#include "globals.hh"
-#include "G4NeutronHPVector.hh"
-#include "Randomize.hh"
-#include "G4ios.hh"
 #include <fstream>
+#include <CLHEP/Units/SystemOfUnits.h>
+
+#include "globals.hh"
+#include "G4ios.hh"
+#include "Randomize.hh"
+#include "G4NeutronHPVector.hh"
 #include "G4VNeutronHPEDis.hh"
 #include "G4InterpolationManager.hh"

@@ -55,7 +56,7 @@ class G4NeutronHPArbitaryTab : public G4VNeutronHPEDis
  inline void Init(std::ifstream & theData)
  {
    G4int i;
-    theFractionalProb.Init(theData, eV);
+    theFractionalProb.Init(theData, CLHEP::eV);
    theData >> nDistFunc; // = number of incoming n energy points
    theDistFunc = new G4NeutronHPVector [nDistFunc];
    theManager.Init(theData);
@@ -63,10 +64,35 @@ class G4NeutronHPArbitaryTab : public G4VNeutronHPEDis
    for(i=0; i<nDistFunc; i++)
    {
      theData >> currentEnergy;
-      theDistFunc[i].SetLabel(currentEnergy*eV);
-      theDistFunc[i].Init(theData, eV);
-      theDistFunc[i].ThinOut(0.02); // @@@ optimization to be finished.
+      theDistFunc[i].SetLabel(currentEnergy*CLHEP::eV);
+      theDistFunc[i].Init(theData, CLHEP::eV);
+      //************************************************************************
+      //EMendoza:
+      //ThinOut() assumes that the data is linear-linear, what is false:
+      //theDistFunc[i].ThinOut(0.02); // @@@ optimization to be finished.
+      //************************************************************************
    }
+
+    //************************************************************************
+    //EMendoza:
+    //Here we calculate the thresholds for the 2D sampling:
+    for(i=0; i<nDistFunc; i++){
+      G4int np=theDistFunc[i].GetVectorLength();
+      theLowThreshold[i]=theDistFunc[i].GetEnergy(0);
+      theHighThreshold[i]=theDistFunc[i].GetEnergy(np-1);
+      for(G4int j=0;j<np-1;j++){
+	if(theDistFunc[i].GetXsec(j+1)>1.e-20){
+	  theLowThreshold[i]=theDistFunc[i].GetEnergy(j);
+	  break;
+	}
+      }
+      for(G4int j=1;j<np;j++){
+	if(theDistFunc[i].GetXsec(j-1)>1.e-20){
+	  theHighThreshold[i]=theDistFunc[i].GetEnergy(j);
+	}
+      }
+    }
+     //************************************************************************
  }
  
  inline G4double GetFractionalProbability(G4double anEnergy)
@@ -83,7 +109,12 @@ class G4NeutronHPArbitaryTab : public G4VNeutronHPEDis
  G4InterpolationManager theManager; // knows the interpolation between stores
  G4NeutronHPVector * theDistFunc; // one per incoming energy
  G4NeutronHPVector theBuffer;
-  
+  //************************************************************************
+  //EMendoza:
+  G4double theLowThreshold[1000];
+  G4double theHighThreshold[1000];
+  //************************************************************************
+
 };

 #endif
@@ -0,0 +1,85 @@
+//
+// ********************************************************************
+// * 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.          *
+// ********************************************************************
+//
+// $Id$
+//
+// -------------------------------------------------------------------
+//
+// GEANT4 Class header file
+//
+//
+// File name:     G4NeutronHPBGGNucleonInelasticXS
+//
+// Author:        KOI, Tatsumi
+// Modifications:
+//
+//
+// Class Description:
+//
+// Wrapper of proton and neutron inelastic cross-sections using Barashenkov 
+// parametersation below 100 GeV and Glauber-Gribov model above
+//
+// -------------------------------------------------------------------
+//
+
+#ifndef G4NeutronHPBGGNucleonInelasticXS_h
+#define G4NeutronHPBGGNucleonInelasticXS_h
+
+#include "globals.hh"
+#include "G4VCrossSectionDataSet.hh"
+#include "G4ParticleDefinition.hh"
+#include "G4BGGNucleonInelasticXS.hh"
+/*
+class G4GlauberGribovCrossSection;
+class G4NucleonNuclearCrossSection;
+class G4HadronNucleonXsc;
+class G4HadronInelasticDataSet;
+*/
+class G4Material;
+class G4Element;
+class G4Isotope;
+
+class G4NeutronHPBGGNucleonInelasticXS : public G4BGGNucleonInelasticXS 
+{
+public:
+
+  G4NeutronHPBGGNucleonInelasticXS (const G4ParticleDefinition*);
+
+  virtual ~G4NeutronHPBGGNucleonInelasticXS();
+   
+  virtual
+  G4bool IsElementApplicable(const G4DynamicParticle*, G4int Z,
+			     const G4Material* mat = 0);
+
+  virtual
+  G4bool IsIsoApplicable(const G4DynamicParticle*, G4int Z, G4int A,  
+			 const G4Element* elm = 0,
+			 const G4Material* mat = 0);
+
+private:
+  G4double fLowEnergyLimitForHPN; 
+};
+
+#endif
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPCapture.hh,v 1.10 2006-06-29 20:46:51 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 // Hadronic Process: Very Low Energy Neutron X-Sections
 // original by H.P. Wellisch, TRIUMF, 14-Feb-97
@@ -56,15 +55,19 @@ class G4NeutronHPCapture : public G4HadronicInteraction

  G4HadFinalState * ApplyYourself(const G4HadProjectile& aTrack, G4Nucleus& aTargetNucleus);

+  virtual const std::pair<G4double, G4double> GetFatalEnergyCheckLevels() const;
+  
  private:
  
  G4double * xSec;
-  G4NeutronHPChannel * theCapture;
+  //G4NeutronHPChannel * theCapture;
+      std::vector<G4NeutronHPChannel*> theCapture;
  G4String dirName;
  G4int numEle;
  G4int it;
  
  G4HadFinalState theResult;
+      void addChannelForNewElement();
 };

 #endif
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPCaptureData.hh,v 1.12 2009-11-18 23:16:57 tkoi Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 // 080417 Add IsZAApplicable method (return false) by T. Koi
 // 080428 Add bool onFlightDB by T. Koi
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPCaptureFS.hh,v 1.11 2006-06-29 20:46:55 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPCaptureFS_h
 #define G4NeutronHPCaptureFS_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPChannel.hh,v 1.15 2008-05-20 21:24:28 tkoi Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 // Hadronic Process: Very Low Energy Neutron X-Sections
 // original by H.P. Wellisch, TRIUMF, 14-Feb-97
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPChannelList.hh,v 1.10 2006-06-29 20:46:59 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 // Hadronic Process: Very Low Energy Neutron X-Sections
 // original by H.P. Wellisch, TRIUMF, 14-Feb-97
@@ -103,6 +102,7 @@ class G4NeutronHPChannelList

  G4StableIsotopes theStableOnes;
  
+  G4HadFinalState unChanged;
 };

 #endif
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPContAngularPar.hh,v 1.13 2008-07-21 23:26:29 tkoi Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 // 080718 Add ClearHistories method and related class member
 //
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPContEnergyAngular.hh,v 1.12 2008-07-21 23:26:29 tkoi Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 // 080721 Add ClearHistories() method by T. Koi
 //
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPD2AInelasticFS.hh,v 1.9 2006-06-29 20:47:05 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPD2AInelasticFS_h
 #define G4NeutronHPD2AInelasticFS_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPDAInelasticFS.hh,v 1.9 2006-06-29 20:47:07 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPDAInelasticFS_h
 #define G4NeutronHPDAInelasticFS_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPDInelasticFS.hh,v 1.9 2006-06-29 20:47:09 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPDInelasticFS_h
 #define G4NeutronHPDInelasticFS_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPData.hh,v 1.9 2006-06-29 20:47:11 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 // Hadronic Process: Very Low Energy Neutron X-Sections
 // original by H.P. Wellisch, TRIUMF, 14-Feb-97
@@ -41,6 +40,8 @@
 #include "G4NeutronHPCaptureData.hh"
 #include "G4NeutronHPElementData.hh"

+#include <vector>
+
 class G4NeutronHPData
 {
 public:
@@ -51,21 +52,25 @@ public:

  inline G4PhysicsVector * MakePhysicsVector(G4Element * thE, G4NeutronHPFissionData * theP)
  {
-     return DoPhysicsVector(theData[thE->GetIndex()].GetData(theP));
+     if ( numEle <= (G4int)thE->GetIndex() ) addPhysicsVector(); 
+     return DoPhysicsVector((*theData[thE->GetIndex()]).GetData(theP));
  }
  inline G4PhysicsVector * MakePhysicsVector(G4Element * thE, G4NeutronHPCaptureData * theP)
  {
-     return DoPhysicsVector(theData[thE->GetIndex()].GetData(theP));
+     if ( numEle <= (G4int)thE->GetIndex() ) addPhysicsVector(); 
+     return DoPhysicsVector((*theData[thE->GetIndex()]).GetData(theP));
  }
  inline G4PhysicsVector * MakePhysicsVector(G4Element * thE, G4NeutronHPElasticData * theP)
  {
-     return DoPhysicsVector(theData[thE->GetIndex()].GetData(theP));
+     if ( numEle <= (G4int)thE->GetIndex() ) addPhysicsVector(); 
+     return DoPhysicsVector((*theData[thE->GetIndex()]).GetData(theP));
  }
  inline G4PhysicsVector * MakePhysicsVector(G4Element * thE, G4NeutronHPInelasticData * theP)
  {
 //     G4cout << "entered G4NeutronHPData::MakePhysicsVector!!!"<<G4endl;
 //     G4cout << "thE->GetIndex()="<<thE->GetIndex()<<G4endl;
-     return DoPhysicsVector(theData[thE->GetIndex()].GetData(theP));
+     if ( numEle <= (G4int)thE->GetIndex() ) addPhysicsVector(); 
+     return DoPhysicsVector((*theData[thE->GetIndex()]).GetData(theP));
  }

  G4PhysicsVector * DoPhysicsVector(G4NeutronHPVector * theVector);
@@ -74,8 +79,9 @@ public:
  
 private:

-  G4NeutronHPElementData * theData;
+  std::vector< G4NeutronHPElementData* > theData;
  G4int numEle;
+  void addPhysicsVector();
  
 };

@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPDataPoint.hh,v 1.8 2006-06-29 20:47:13 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPDataPoint_h
 #define G4NeutronHPDataPoint_h 1
@@ -39,15 +39,18 @@ class G4NeutronHPDataUsed
    theName = "";
    theA = 0;
    theZ = 0;
+    theM = 0;
     nat = false;
  }
  
  void SetA(G4double anA){theA = anA;}
  void SetZ(G4int aZ){theZ = aZ;}
+  void SetM(G4int aM){theM = aM;}
  void SetName(G4String aName){theName = aName;}

  G4int GetZ() {return theZ;}
  G4double GetA() {return theA;}
+  G4int GetM() {return theM;}
  G4String GetName() {return theName;}
  
  private:
@@ -55,6 +58,7 @@ class G4NeutronHPDataUsed
  G4String theName;
  G4double theA;
  G4int theZ;
+  G4int theM;
   public:
      G4bool IsThisNaturalAbundance() { return nat; };
      void SetNaturalAbundanceFlag() { nat = TRUE; };
@@ -24,15 +24,16 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPDeExGammas.hh,v 1.13 2007-06-06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPDeExGammas_h
 #define G4NeutronHPDeExGammas_h 1

+#include <fstream>
+#include <CLHEP/Units/PhysicalConstants.h>
+
 #include "globals.hh"
 #include "G4ios.hh"
-#include <fstream>
 #include "G4ReactionProductVector.hh"
 #include "G4Gamma.hh"
 #include "G4NeutronHPLevel.hh"
@@ -76,7 +77,7 @@ class G4NeutronHPDeExGammas
      delete theResult->operator[](i);
      G4double costheta = 2.*G4UniformRand()-1;
      G4double theta = std::acos(costheta);
-      G4double phi = twopi*G4UniformRand();
+      G4double phi = CLHEP::twopi*G4UniformRand();
      G4double sinth = std::sin(theta);
      G4double en = theCurrent->GetTotalMomentum();
      G4ThreeVector temp(en*sinth*std::cos(phi), en*sinth*std::sin(phi), en*costheta );
@@ -24,17 +24,16 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPDiscreteTwoBody.hh,v 1.11 2007-06-06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPDiscreteTwoBody_h
 #define G4NeutronHPDiscreteTwoBody_h 1

-//101110 Bug fix in MF=6, LAW=2 case; contribution from E. Mendoza, D. Cano-Ott (CIEMAT)
-
-#include "G4ios.hh"
 #include <fstream>
+#include <CLHEP/Units/SystemOfUnits.h>
+
 #include "globals.hh"
+#include "G4ios.hh"
 #include "G4VNeutronHPEnergyAngular.hh"
 #include "G4NeutronHPLegendreTable.hh"
 #include "G4NeutronHPInterpolator.hh"
@@ -63,7 +62,7 @@ class G4NeutronHPDiscreteTwoBody : public G4VNeutronHPEnergyAngular
      G4double energy;
      G4int aRep, nCoeff;
      aDataFile >> energy >> aRep >> nCoeff;
-      energy*=eV;
+      energy*=CLHEP::eV;
      G4int nPoints=nCoeff;
      if(aRep>0) nPoints*=2;
      //theCoeff[i].Init(energy, nPoints);
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPElastic.hh,v 1.10 2006-06-29 20:47:21 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 // Hadronic Process: High Precision low E neutron tracking
 // original by H.P. Wellisch, TRIUMF, 14-Feb-97
@@ -53,20 +52,26 @@ class G4NeutronHPElastic : public G4HadronicInteraction
  G4NeutronHPElastic();
  
  ~G4NeutronHPElastic();
-  
+
  G4HadFinalState * ApplyYourself(const G4HadProjectile& aTrack, G4Nucleus& aTargetNucleus);

-  G4int GetNiso() {return theElastic[0].GetNiso();}
+  virtual const std::pair<G4double, G4double> GetFatalEnergyCheckLevels() const;
+
+  //G4int GetNiso() {return theElastic[0].GetNiso();}
+  G4int GetNiso() {return (*theElastic[0]).GetNiso();}

  void DoNotSuspend() {overrideSuspension = true;}

  private:
  
  G4double * xSec;
-  G4NeutronHPChannel * theElastic;
+  //G4NeutronHPChannel * theElastic;
+  std::vector<G4NeutronHPChannel*> theElastic;
  G4String dirName;
  G4int numEle;
  G4bool overrideSuspension;
+
+      void addChannelForNewElement();
 };

 #endif
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPElasticData.hh,v 1.12 2009-11-18 23:16:57 tkoi Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 // 080417 Add IsZAApplicable method (return false) by T. Koi
 // 080428 Add bool onFlightDB by T. Koi
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPElasticFS.hh,v 1.12 2007-06-06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 // 25-08-06 New Final State type (refFlag==3 , Legendre (Low Energy) + Probability (High Energy) )
 //          is added by T. KOI
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPElementData.hh,v 1.10 2008-05-20 21:24:28 tkoi Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 // Hadronic Process: Very Low Energy Neutron X-Sections
 // original by H.P. Wellisch, TRIUMF, 14-Feb-97
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPEnAngCorrelation.hh,v 1.11 2007-06-06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPEnAngCorrelation_h
 #define G4NeutronHPEnAngCorrelation_h 1
@@ -24,15 +24,16 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPEnergyDistribution.hh,v 1.11 2007-06-06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPEnergyDistribution_h
 #define G4NeutronHPEnergyDistribution_h 1

+#include <fstream>
+
 #include "globals.hh"
 #include "G4ios.hh"
-#include <fstream>
+#include "Randomize.hh"
 #include "G4NeutronHPArbitaryTab.hh"
 #include "G4NeutronHPEvapSpectrum.hh"
 #include "G4NeutronHPSimpleEvapSpectrum.hh"
@@ -40,7 +41,6 @@
 #include "G4NeutronHPWattSpectrum.hh"
 #include "G4NeutronHPMadlandNixSpectrum.hh"
 #include "G4VNeutronHPEDis.hh"
-#include "Randomize.hh"

 // we will need a List of these .... one per term.

@@ -24,17 +24,18 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPEvapSpectrum.hh,v 1.10 2006-06-29 20:47:33 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPEvapSpectrum_h
 #define G4NeutronHPEvapSpectrum_h 1

-#include "globals.hh"
-#include "G4NeutronHPVector.hh"
-#include "Randomize.hh"
-#include "G4ios.hh"
 #include <fstream>
+#include <CLHEP/Units/SystemOfUnits.h>
+
+#include "globals.hh"
+#include "G4ios.hh"
+#include "Randomize.hh"
+#include "G4NeutronHPVector.hh"
 #include "G4VNeutronHPEDis.hh"

 // we will need a List of these .... one per term.
@@ -67,7 +68,7 @@ class G4NeutronHPEvapSpectrum : public G4VNeutronHPEDis
    G4double x = theXDist.Sample();
    G4double theta = theThetaDist.GetY(anEnergy);
    G4double result = x*theta;
-    return result*eV;
+    return result*CLHEP::eV;
  }
  
  private:
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPFCFissionFS.hh,v 1.11 2007-06-06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPFCFissionFS_h
 #define G4NeutronHPFCFissionFS_h 1
@@ -0,0 +1,65 @@
+//
+// ********************************************************************
+// * 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.          *
+// ********************************************************************
+//
+//
+// $Id$
+//
+#ifndef G4NeutronHPFFFissionFS_h
+#define G4NeutronHPFFFissionFS_h 1
+
+#include "globals.hh"
+#include "G4HadProjectile.hh"
+#include "G4DynamicParticleVector.hh"
+#include "G4NeutronHPFissionBaseFS.hh"
+
+class G4NeutronHPFFFissionFS : public G4NeutronHPFissionBaseFS
+{
+ 
+   public:
+      G4NeutronHPFFFissionFS(){ hasXsec = false; }
+      ~G4NeutronHPFFFissionFS(){}
+
+      void Init (G4double A, G4double Z, G4int M, G4String & dirName, G4String & aFSType);
+
+      G4DynamicParticleVector * ApplyYourself( G4int nNeutrons );
+
+      G4NeutronHPFinalState * New() 
+      {
+         G4NeutronHPFFFissionFS * theNew = new G4NeutronHPFFFissionFS;
+         return theNew;
+      }
+
+                              //energy   fragZ fragA   fragM
+      void GetAFissionFragment( G4double , G4int& , G4int& , G4int& );
+  
+   private:
+      G4HadFinalState * ApplyYourself( const G4HadProjectile & ) { return NULL; }
+
+      //        MT              Energy            FPS    Yield
+      std::map< G4int , std::map< G4double , std::map< G4int , G4double >* >* > FissionProductYieldData; 
+      std::map< G4int , std::map< G4double , G4int >* > mMTInterpolation; 
+
+};
+#endif
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPFSFissionFS.hh,v 1.11 2007-06-06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPFSFissionFS_h
 #define G4NeutronHPFSFissionFS_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPFastLegendre.hh,v 1.11 2006-06-29 20:47:39 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPFastLegendre_h
 #define G4NeutronHPFastLegendre_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPField.hh,v 1.8 2006-06-29 20:47:41 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPField_h
 #define G4NeutronHPField_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPFieldPoint.hh,v 1.9 2007-06-06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPFieldPoint_h
 #define G4NeutronHPFieldPoint_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPFinalState.hh,v 1.15 2008-08-05 22:43:26 tkoi Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 // 080721 Create adjust_final_state method by T. Koi  
 // 080801 Introduce theNDLDataA,Z which has A and Z of NDL data by T. Koi
@@ -51,6 +50,7 @@ public:
    hasAnyData = true;
    theBaseZ = 0;
    theBaseA = 0;
+    theBaseM = 0;

    theNDLDataZ = 0;
    theNDLDataA = 0;
@@ -83,11 +83,15 @@ public:
  virtual G4double GetXsec(G4double ) { return 0; };
  virtual G4NeutronHPVector * GetXsec() { return 0; };
  
-  void     SetA_Z(G4double anA, G4double aZ) {theBaseA = anA; theBaseZ = aZ; };
+  void     SetA_Z(G4double anA, G4double aZ, G4int aM=0) {theBaseA = anA; theBaseZ = aZ; theBaseM=aM; };
  G4double GetZ() { return theBaseZ; };
  G4double GetN() { return theBaseA; };
+  G4int GetM() { return theBaseM; };
  
  protected:
+     void SetAZMs(G4double anA, G4double aZ, G4int aM, G4NeutronHPDataUsed used) 
+     { theBaseA = anA; theBaseZ = aZ; theBaseM=aM; 
+       theNDLDataA=(G4int)used.GetA(); theNDLDataZ=(G4int)used.GetZ(); theNDLDataM=used.GetM(); };
  
  G4bool hasXsec;
  G4bool hasFSData;
@@ -98,6 +102,7 @@ public:
  
  G4double theBaseA;
  G4double theBaseZ;
+  G4int theBaseM;


 //080721
@@ -105,6 +110,7 @@ public:
      void adjust_final_state ( G4LorentzVector );
      G4int theNDLDataZ;
      G4int theNDLDataA;
+      G4int theNDLDataM;

   private:
      G4bool adjustResult;
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPFission.hh,v 1.10 2006-06-29 20:47:47 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 // Hadronic Process: High Precision low E neutron tracking
 // original by H.P. Wellisch, TRIUMF, 14-Feb-97
@@ -61,6 +60,8 @@ class G4NeutronHPFission : public G4HadronicInteraction
  
  G4HadFinalState * ApplyYourself(const G4HadProjectile& aTrack, G4Nucleus& aTargetNucleus);

+  virtual const std::pair<G4double, G4double> GetFatalEnergyCheckLevels() const;
+
  private:
  
  G4NeutronHPFissionFS theFS;
@@ -68,10 +69,12 @@ class G4NeutronHPFission : public G4HadronicInteraction
  private:
  
  G4double * xSec;
-  G4NeutronHPChannel * theFission;
+  //G4NeutronHPChannel * theFission;
+      std::vector<G4NeutronHPChannel*> theFission;
  G4String dirName;
  G4int numEle;
  // static G4String theNames[3];
+      void addChannelForNewElement();
 };

 #endif
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPFissionBaseFS.hh,v 1.13 2007-06-06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPFissionBaseFS_h
 #define G4NeutronHPFissionBaseFS_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPFissionData.hh,v 1.10 2008-04-16 23:39:56 tkoi Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 // 080417 Add IsZAApplicable method (return false) by T. Koi
 //
@@ -24,17 +24,18 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPFissionERelease.hh,v 1.12 2007-06-08 22:39:50 tkoi Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 // 070606 fix for Valgrind by T. Koi
 //
 #ifndef G4NeutronHPFissionERelease_h
 #define G4NeutronHPFissionERelease_h 1

+#include <fstream>
+#include <CLHEP/Units/SystemOfUnits.h>
+
 #include "globals.hh"
 #include "G4ios.hh"
-#include <fstream>

 class G4NeutronHPFissionERelease
 {
@@ -67,23 +68,23 @@ class G4NeutronHPFissionERelease
              >>reducedTotalEnergy
              >>totalEnergy;
            
-    fragmentKinetic*=eV;
-    promptNeutronKinetic*=eV;
-    delayedNeutronKinetic*=eV;
-    promptGammaEnergy*=eV;
-    delayedGammaEnergy*=eV;
-    delayedBetaEnergy*=eV;
-    neutrinoEnergy*=eV;
-    reducedTotalEnergy*=eV;
-    totalEnergy*=eV;
+    fragmentKinetic*=CLHEP::eV;
+    promptNeutronKinetic*=CLHEP::eV;
+    delayedNeutronKinetic*=CLHEP::eV;
+    promptGammaEnergy*=CLHEP::eV;
+    delayedGammaEnergy*=CLHEP::eV;
+    delayedBetaEnergy*=CLHEP::eV;
+    neutrinoEnergy*=CLHEP::eV;
+    reducedTotalEnergy*=CLHEP::eV;
+    totalEnergy*=CLHEP::eV;
  }
  
  inline G4double GetTotalEnergy(G4double deltaNNeu, G4double anEnergy) 
  {
     G4double result, delta, energy;
-     energy = anEnergy/eV;
+     energy = anEnergy/CLHEP::eV;
     delta = -(1.057*energy - 8.07*deltaNNeu);
-     result = totalEnergy - delta*eV;
+     result = totalEnergy - delta*CLHEP::eV;
     return result;
  }
  inline G4double GetFragmentKinetic() 
@@ -93,9 +94,9 @@ class G4NeutronHPFissionERelease
  inline G4double GetPromptNeutronKinetic(G4double deltaNNeu, G4double anEnergy)
  {
     G4double result, delta, energy;
-     energy = anEnergy/eV;
+     energy = anEnergy/CLHEP::eV;
     delta = -(1.307*energy - 8.07*deltaNNeu);
-     result = totalEnergy - delta*eV;
+     result = totalEnergy - delta*CLHEP::eV;
     return result;
  }
  inline G4double GetDelayedNeutronKinetic()
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPFissionFS.hh,v 1.9 2006-06-29 20:47:55 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPFissionFS_h
 #define G4NeutronHPFissionFS_h 1
@@ -42,11 +41,13 @@
 #include "G4NeutronHPLCFissionFS.hh"
 #include "G4NeutronHPFSFissionFS.hh"

+#include "G4NeutronHPFFFissionFS.hh"
+
 class G4NeutronHPFissionFS : public G4NeutronHPFinalState
 {
  public:
  
-  G4NeutronHPFissionFS(){ hasXsec = false; }
+  G4NeutronHPFissionFS(){ hasXsec = false; produceFissionFragments = false; }
  ~G4NeutronHPFissionFS(){}
  void Init (G4double A, G4double Z, G4int M, G4String & dirName, G4String & aFSType);
  G4HadFinalState * ApplyYourself(const G4HadProjectile & theTrack);
@@ -64,5 +65,7 @@ class G4NeutronHPFissionFS : public G4NeutronHPFinalState
  G4NeutronHPTCFissionFS theTC;
  G4NeutronHPLCFissionFS theLC;
    
+  G4NeutronHPFFFissionFS theFF;
+  G4bool produceFissionFragments;
 };
 #endif
@@ -24,17 +24,18 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPFissionSpectrum.hh,v 1.11 2006-06-29 20:47:57 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPFissionSpectrum_h
 #define G4NeutronHPFissionSpectrum_h 1

-#include "globals.hh"
-#include "G4NeutronHPVector.hh"
-#include "Randomize.hh"
-#include "G4ios.hh"
 #include <fstream>
+#include <CLHEP/Units/SystemOfUnits.h>
+
+#include "globals.hh"
+#include "G4ios.hh"
+#include "Randomize.hh"
+#include "G4NeutronHPVector.hh"
 #include "G4VNeutronHPEDis.hh"

 // we will need a List of these .... one per term.
@@ -52,8 +53,8 @@ class G4NeutronHPFissionSpectrum : public G4VNeutronHPEDis
  
  inline void Init(std::ifstream & aDataFile)
  {
-    theFractionalProb.Init(aDataFile, eV);
-    theThetaDist.Init(aDataFile, eV);
+    theFractionalProb.Init(aDataFile, CLHEP::eV);
+    theThetaDist.Init(aDataFile, CLHEP::eV);
  }
  
  inline G4double GetFractionalProbability(G4double anEnergy)
@@ -67,8 +68,8 @@ class G4NeutronHPFissionSpectrum : public G4VNeutronHPEDis
    // here we need to sample Maxwells distribution, if 
    // need be.
    G4double result, cut;
-    G4double range =50*MeV;
-    G4double max = Maxwell((theta*eV)/2., theta);
+    G4double range =50*CLHEP::MeV;
+    G4double max = Maxwell((theta*CLHEP::eV)/2., theta);
    G4double value;
    do
    {
@@ -85,7 +86,7 @@ class G4NeutronHPFissionSpectrum : public G4VNeutronHPEDis
  // this is the function to sample from. 
  inline G4double Maxwell(G4double anEnergy, G4double theta)
  {
-    G4double result = std::sqrt(anEnergy/eV)*std::exp(-anEnergy/eV/theta);
+    G4double result = std::sqrt(anEnergy/CLHEP::eV)*std::exp(-anEnergy/CLHEP::eV/theta);
    return result;
  }
  
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPGamma.hh,v 1.14 2007-06-06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPGamma_h
 #define G4NeutronHPGamma_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPHe3InelasticFS.hh,v 1.9 2006-06-29 20:48:03 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPHe3InelasticFS_h
 #define G4NeutronHPHe3InelasticFS_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPInelastic.hh,v 1.9 2006-06-29 20:48:05 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 // Hadronic Process: High Precision low E neutron tracking
 // original by H.P. Wellisch, TRIUMF, 14-Feb-97
@@ -95,12 +94,16 @@ class G4NeutronHPInelastic : public G4HadronicInteraction
  
  G4HadFinalState * ApplyYourself(const G4HadProjectile & aTrack, G4Nucleus & aTargetNucleus);

+  virtual const std::pair<G4double, G4double> GetFatalEnergyCheckLevels() const;
+
  private:
  
  G4double * xSec;
-  G4NeutronHPChannelList * theInelastic; // one List per element
+  //G4NeutronHPChannelList * theInelastic; // one List per element
+      std::vector<G4NeutronHPChannelList*> theInelastic; // one List per element
  G4String dirName;
  G4int numEle;
+      void addChannelForNewElement();
  
  private:
  
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPInelasticBaseFS.hh,v 1.12 2007-06-06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPInelasticBaseFS_h
 #define G4NeutronHPInelasticBaseFS_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPInelasticCompFS.hh,v 1.14 2010-04-06 19:06:11 tkoi Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPInelasticCompFS_h
 #define G4NeutronHPInelasticCompFS_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPInelasticData.hh,v 1.12 2009-11-18 23:16:57 tkoi Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 // 080417 Add IsZAApplicable method (return false) by T. Koi
 // 080428 Add bool onFlightDB by T. Koi
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPInterpolator.hh,v 1.20 2008-08-12 00:42:31 tkoi Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 // 080809 Change interpolation scheme of "histogram", now using LinearLinear
 //        For multidimensional interpolations By T. Koi
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPIsoData.hh,v 1.16 2007-06-06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPIsoData_h
 #define G4NeutronHPIsoData_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPIsotropic.hh,v 1.10 2006-06-29 20:48:17 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPIsotropic_h
 #define G4NeutronHPIsotropic_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPKallbachMannSyst.hh,v 1.8 2006-06-29 20:48:19 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPKallbachMannSyst_h
 #define G4NeutronHPKallbachMannSyst_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPLCFissionFS.hh,v 1.11 2007-06-06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPLCFissionFS_h
 #define G4NeutronHPLCFissionFS_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPLabAngularEnergy.hh,v 1.11 2007-06-06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPLabAngularEnergy_h
 #define G4NeutronHPLabAngularEnergy_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPLegendreStore.hh,v 1.12 2008-06-13 00:29:26 tkoi Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPLegendreStore_h
 #define G4NeutronHPLegendreStore_h 1
@@ -24,14 +24,15 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPLegendreTable.hh,v 1.12 2007-06-06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPLegendreTable_h
 #define G4NeutronHPLegendreTable_h 1

-#include "globals.hh"
 #include <fstream>
+#include <CLHEP/Units/SystemOfUnits.h>
+
+#include "globals.hh"
 #include "G4ios.hh"
 #include "G4InterpolationManager.hh"

@@ -68,7 +69,7 @@ class G4NeutronHPLegendreTable
    G4double eNeu, coeff;
    G4int nPoly;
    aDataFile >> eNeu >> nPoly;
-    eNeu *= eV;
+    eNeu *= CLHEP::eV;
    Init(eNeu, nPoly);
    for(G4int l=0; l<nPoly; l++)
    {
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPLevel.hh,v 1.11 2007-06-06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPLevel_h
 #define G4NeutronHPLevel_h 1
@@ -24,18 +24,19 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPMadlandNixSpectrum.hh,v 1.12 2006-06-29 20:48:33 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPMadlandNixSpectrum_h
 #define G4NeutronHPMadlandNixSpectrum_h 1

-#include "globals.hh"
-#include "G4NeutronHPVector.hh"
-#include "Randomize.hh"
-#include "G4ios.hh"
 #include <fstream>
 #include <cmath>
+#include <CLHEP/Units/PhysicalConstants.h>
+
+#include "globals.hh"
+#include "G4ios.hh"
+#include "Randomize.hh"
+#include "G4NeutronHPVector.hh"
 #include "G4VNeutronHPEDis.hh"

 //     #include <nag.h> @
@@ -59,9 +60,9 @@ class G4NeutronHPMadlandNixSpectrum : public G4VNeutronHPEDis
  {
    theFractionalProb.Init(aDataFile);
    aDataFile>> theAvarageKineticPerNucleonForLightFragments;
-    theAvarageKineticPerNucleonForLightFragments*=eV;
+    theAvarageKineticPerNucleonForLightFragments*=CLHEP::eV;
    aDataFile>> theAvarageKineticPerNucleonForHeavyFragments;
-    theAvarageKineticPerNucleonForHeavyFragments*=eV;
+    theAvarageKineticPerNucleonForHeavyFragments*=CLHEP::eV;
    theMaxTemp.Init(aDataFile);
  }
  
@@ -87,11 +88,11 @@ class G4NeutronHPMadlandNixSpectrum : public G4VNeutronHPEDis
  inline G4double Gamma05(G4double aValue)
  {
    G4double result;
-    // gamma(1.2,x*X) = std::sqrt(pi)*Erf(x)
+    // gamma(1.2,x*X) = std::sqrt(CLHEP::pi)*Erf(x)
    G4double x = std::sqrt(aValue);
    G4double t = 1./(1+0.47047*x);
    result = 1- (0.3480242*t - 0.0958798*t*t + 0.7478556*t*t*t)*std::exp(-aValue); // @ check
-    result *= std::sqrt(pi);
+    result *= std::sqrt(CLHEP::pi);
    return result;
  }
  
@@ -0,0 +1,62 @@
+//
+// ********************************************************************
+// * 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.          *
+// ********************************************************************
+//
+#ifndef G4NeutronHPManager_h
+#define G4NeutronHPManager_h 1
+
+// Class Description
+// Manager of NeutronHP 
+// Class Description - End
+
+// 121031 First implementation done by T. Koi (SLAC/PPA)
+//
+#include "globals.hh"
+
+#include "G4NeutronHPReactionWhiteBoard.hh"
+
+class G4NeutronHPManager 
+{
+   public:
+      static G4NeutronHPManager* GetInstance() {
+         if ( instance == NULL) instance = new G4NeutronHPManager();
+         return instance;
+      };
+
+   private: 
+      G4NeutronHPManager();
+      G4NeutronHPManager( const G4NeutronHPManager& ){};
+      ~G4NeutronHPManager();
+      static G4NeutronHPManager* instance;
+
+   public:
+      G4NeutronHPReactionWhiteBoard* GetReactionWhiteBoard();
+      void OpenReactionWhiteBoard();
+      void CloseReactionWhiteBoard(){delete RWB; RWB=NULL;};
+
+   private:
+      G4NeutronHPReactionWhiteBoard* RWB;
+};
+
+#endif
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPN2AInelasticFS.hh,v 1.9 2006-06-29 20:48:35 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPN2AInelasticFS_h
 #define G4NeutronHPN2AInelasticFS_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPN2PInelasticFS.hh,v 1.9 2006-06-29 20:48:37 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPN2PInelasticFS_h
 #define G4NeutronHPN2PInelasticFS_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPN3AInelasticFS.hh,v 1.9 2006-06-29 20:48:39 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPN3AInelasticFS_h
 #define G4NeutronHPN3AInelasticFS_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPNAInelasticFS.hh,v 1.9 2006-06-29 20:48:41 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPNAInelasticFS_h
 #define G4NeutronHPNAInelasticFS_h 1
@@ -24,15 +24,16 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPNBodyPhaseSpace.hh,v 1.12 2006-06-29 20:48:43 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPNBodyPhaseSpace_h
 #define G4NeutronHPNBodyPhaseSpace_h 1

-#include "G4ios.hh"
 #include <fstream>
+#include <CLHEP/Units/PhysicalConstants.h>
+
 #include "globals.hh"
+#include "G4ios.hh"
 #include "G4Neutron.hh"
 #include "G4VNeutronHPEnergyAngular.hh"
 #include "G4ReactionProduct.hh"
@@ -72,9 +73,9 @@ class G4NeutronHPNBodyPhaseSpace : public G4VNeutronHPEnergyAngular
  inline G4double C(G4double anEnergy, G4double mass)
  {
    G4double result(0);
-    if(theTotalCount==3) result = 4./pi/std::pow(GetEmax(anEnergy, mass),2);
+    if(theTotalCount==3) result = 4./CLHEP::pi/std::pow(GetEmax(anEnergy, mass),2);
    if(theTotalCount==4) result = 105./32./std::pow(GetEmax(anEnergy, mass), 3.5);
-    if(theTotalCount==5) result = 256./14./pi/std::pow(GetEmax(anEnergy, mass), 5.);
+    if(theTotalCount==5) result = 256./14./CLHEP::pi/std::pow(GetEmax(anEnergy, mass), 5.);
    return result;
  }
  
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPND2AInelasticFS.hh,v 1.9 2006-06-29 20:48:45 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPND2AInelasticFS_h
 #define G4NeutronHPND2AInelasticFS_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPNDInelasticFS.hh,v 1.9 2006-06-29 20:48:47 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPNDInelasticFS_h
 #define G4NeutronHPNDInelasticFS_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPNHe3InelasticFS.hh,v 1.9 2006-06-29 20:48:49 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPNHe3InelasticFS_h
 #define G4NeutronHPNHe3InelasticFS_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPNInelasticFS.hh,v 1.9 2006-06-29 20:48:51 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPNInelasticFS_h
 #define G4NeutronHPNInelasticFS_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPNPAInelasticFS.hh,v 1.9 2006-06-29 20:48:53 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPNPAInelasticFS_h
 #define G4NeutronHPNPAInelasticFS_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPNPInelasticFS.hh,v 1.9 2006-06-29 20:48:55 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPNPInelasticFS_h
 #define G4NeutronHPNPInelasticFS_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPNT2AInelasticFS.hh,v 1.9 2006-06-29 20:48:57 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPNT2AInelasticFS_h
 #define G4NeutronHPNT2AInelasticFS_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPNTInelasticFS.hh,v 1.9 2006-06-29 20:48:59 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPNTInelasticFS_h
 #define G4NeutronHPNTInelasticFS_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPNXInelasticFS.hh,v 1.9 2006-06-29 20:49:01 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPNXInelasticFS_h
 #define G4NeutronHPNXInelasticFS_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPNames.hh,v 1.15 2006-06-29 20:49:03 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPNames_h
 #define G4NeutronHPNames_h 1
@@ -24,12 +24,13 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPNeutronYield.hh,v 1.10 2006-06-29 20:49:05 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPNeutronYield_h
 #define G4NeutronHPNeutronYield_h 1

+#include <CLHEP/Units/SystemOfUnits.h>
+
 #include "globals.hh"
 #include "G4NeutronHPVector.hh"
 #include "G4NeutronHPPolynomExpansion.hh"
@@ -56,7 +57,7 @@ class G4NeutronHPNeutronYield
    if(iflag == 1) simpleMean=false;
    if(simpleMean)
    {
-      theSimpleMean.Init(aDataFile, eV);
+      theSimpleMean.Init(aDataFile, CLHEP::eV);
    }
    else
    {
@@ -76,7 +77,7 @@ class G4NeutronHPNeutronYield
    }
    else
    {
-      thePrompt.Init(aDataFile, eV);
+      thePrompt.Init(aDataFile, CLHEP::eV);
    }
  }
 
@@ -85,7 +86,7 @@ class G4NeutronHPNeutronYield
    hasDelayedData = true;
    G4int iflag;
    aDataFile >> targetMass >>iflag;
-    thePrecursorDecayConstants.Init(aDataFile, 1./s); // s is the CLHEP unit second
+    thePrecursorDecayConstants.Init(aDataFile, 1./CLHEP::s); // s is the CLHEP unit second
    if(iflag == 2) spontDelayed = false;
    if(spontDelayed)
    {
@@ -93,7 +94,7 @@ class G4NeutronHPNeutronYield
    }
    else
    {
-      theDelayed.Init(aDataFile, eV);
+      theDelayed.Init(aDataFile, CLHEP::eV);
    }
  }
  
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPPAInelasticFS.hh,v 1.9 2006-06-29 20:49:07 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPPAInelasticFS_h
 #define G4NeutronHPPAInelasticFS_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPPDInelasticFS.hh,v 1.9 2006-06-29 20:49:09 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPPDInelasticFS_h
 #define G4NeutronHPPDInelasticFS_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPPInelasticFS.hh,v 1.9 2006-06-29 20:49:11 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPPInelasticFS_h
 #define G4NeutronHPPInelasticFS_h 1
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPPTInelasticFS.hh,v 1.9 2006-06-29 20:49:13 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPPTInelasticFS_h
 #define G4NeutronHPPTInelasticFS_h 1
@@ -24,14 +24,15 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPPartial.hh,v 1.13 2007-06-18 20:56:05 tkoi Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 // 070618 Comment out unused private member leaking by T. Koi
 //
 #ifndef G4NeutronHPPartial_h
 #define G4NeutronHPPartial_h 1

+#include <CLHEP/Units/SystemOfUnits.h>
+
 #include "globals.hh"
 #include "G4NeutronHPVector.hh"
 #include "G4InterpolationManager.hh"
@@ -74,9 +75,9 @@ class G4NeutronHPPartial
    for( i=0; i<nData; i++)
    {
      aDataFile >> e;
-      e *= eV;
+      e *= CLHEP::eV;
      SetX(i,e);
-      InitData(i, aDataFile, eV); // energy and probability for gammas
+      InitData(i, aDataFile, CLHEP::eV); // energy and probability for gammas
    }  
  }
  
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPPhotonDist.hh,v 1.17 2008-06-26 02:40:23 tkoi Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 // Hadronic Process: Very Low Energy Neutron X-Sections
 // original by H.P. Wellisch, TRIUMF, 14-Feb-97
@@ -24,18 +24,18 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPPhotonXSection.hh,v 1.11 2007-06-06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPPhotonXSection_h
 #define G4NeutronHPPhotonXSection_h 1

-#include "globals.hh"
-#include "G4NeutronHPVector.hh"
-#include "Randomize.hh"
-#include "G4ios.hh"
 #include <fstream>
+#include <CLHEP/Units/SystemOfUnits.h>
+
 #include "globals.hh"
+#include "G4ios.hh"
+#include "Randomize.hh"
+#include "G4NeutronHPVector.hh"
 #include "G4VNeutronVector.hh"

 // we will need a List of these .... one per term.
@@ -66,7 +66,7 @@ class G4NeutronHPPhotonXSection
    if(nChannels!=1) 
    {
      aDataFile >> theIncEnergy>>theIncShell>>theIncFlag>>theIncDisFlag;
-      theaDataFileInclusive.Init(aDataFile, eV);
+      theaDataFileInclusive.Init(aDataFile, CLHEP::eV);
    }
    theExclusive = new G4NeutronHPVector[nChannels];
    theExShell = new G4double[nChannels];
@@ -76,7 +76,7 @@ class G4NeutronHPPhotonXSection
    for(G4int i=0; i<nChannels; i++)
    {
      aDataFile>>theExEnergy[i]>>theExShell[i]>>theExFlag[i]>>theExDisFlag[i];
-      theExclusive[i].Init(aDataFile,eV);
+      theExclusive[i].Init(aDataFile,CLHEP::eV);
    }
  }
  
@@ -24,15 +24,16 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPPolynomExpansion.hh,v 1.11 2007-06-06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPPolynomExpansion_h
 #define G4NeutronHPPolynomExpansion_h 1

+#include <fstream>
+#include <CLHEP/Units/SystemOfUnits.h>
+
 #include "globals.hh"
 #include "G4ios.hh"
-#include <fstream>

 class G4NeutronHPPolynomExpansion
 {
@@ -62,7 +63,7 @@ class G4NeutronHPPolynomExpansion
  {
    G4int i;
    G4double result=0;
-    G4double base = anEnergy/eV;
+    G4double base = anEnergy/CLHEP::eV;
    G4double running = 1;
    for(i=0; i<nPoly; i++)
    {
@@ -24,19 +24,19 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPProduct.hh,v 1.12 2007-06-06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPProduct_h
 #define G4NeutronHPProduct_h 1

-#include "G4HadronicException.hh"
-#include "globals.hh"
-#include "G4NeutronHPVector.hh"
-#include "Randomize.hh"
-#include "G4ios.hh"
 #include <fstream>
+#include <CLHEP/Units/SystemOfUnits.h>
+
 #include "globals.hh"
+#include "G4ios.hh"
+#include "Randomize.hh"
+#include "G4HadronicException.hh"
+#include "G4NeutronHPVector.hh"
 #include "G4VNeutronHPEnergyAngular.hh"
 #include "G4ReactionProductVector.hh"

@@ -57,14 +57,20 @@ class G4NeutronHPProduct
  {
    if(theDist != 0) delete theDist;
  }
+
+
+      //TK120515 For migration of frameFlag (MF6 LCT) = 3 in
+      //G4NeutronHPEnAngCorrelation
+      G4double GetMassCode(){return theMassCode;};
+      G4double GetMass(){return theMass;};
  
  inline void Init(std::ifstream & aDataFile)
  {
    aDataFile >> theMassCode>>theMass>>theIsomerFlag>>theDistLaw
              >> theGroundStateQValue>>theActualStateQValue;
-    theGroundStateQValue*= eV;
-    theActualStateQValue*= eV;
-    theYield.Init(aDataFile, eV);
+    theGroundStateQValue*= CLHEP::eV;
+    theActualStateQValue*= CLHEP::eV;
+    theYield.Init(aDataFile, CLHEP::eV);
    if(theDistLaw==0)
    {
      // distribution not known, use E-independent, isotropic angular distribution
@@ -0,0 +1,68 @@
+//
+// ********************************************************************
+// * 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.          *
+// ********************************************************************
+//
+#ifndef G4NeutronHPReactionWhiteBoard_h
+#define G4NeutronHPReactionWhiteBoard_h 1
+
+// Class Description
+// Keep Information of Current Interaction
+// Class Description - End
+
+// 121031 First implementation done by T. Koi (SLAC/PPA)
+//
+#include "globals.hh"
+#include <map>
+
+class G4NeutronHPReactionWhiteBoard 
+{
+   public:
+      G4NeutronHPReactionWhiteBoard();
+      ~G4NeutronHPReactionWhiteBoard();
+
+   public:
+      void Dump();
+
+      void SetTargZ( G4int Z ){ targZ=Z; };
+      void SetTargA( G4int A ){ targA=A; };
+      void SetTargM( G4int M ){ targM=M; };
+      G4int GetTargZ(){ return targZ; };
+      G4int GetTargA(){ return targA; };
+      G4int GetTargM(){ return targM; };
+       
+      bool AddRecord( std::pair<G4String,G4String> );
+      G4String GetValue( G4String );
+      // "0" or "0.0" will retrun for invalid key by following two methods
+      G4int GetValueInInt( G4String );
+      G4double GetValueInDouble( G4String );
+
+   private:
+      G4int targZ;
+      G4int targA;
+      G4int targM;
+      std::map< G4String,G4String > mapStringPair;
+      //,,,
+};
+
+#endif
@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPSCFissionFS.hh,v 1.11 2007-06-06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPSCFissionFS_h
 #define G4NeutronHPSCFissionFS_h 1
@@ -24,17 +24,18 @@
 // ********************************************************************
 //
 //
-// $Id: G4NeutronHPSimpleEvapSpectrum.hh,v 1.11 2006-06-29 20:49:27 gunter Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 #ifndef G4NeutronHPSimpleEvapSpectrum_h
 #define G4NeutronHPSimpleEvapSpectrum_h 1

-#include "globals.hh"
-#include "G4NeutronHPVector.hh"
-#include "Randomize.hh"
-#include "G4ios.hh"
 #include <fstream>
+#include <CLHEP/Units/SystemOfUnits.h>
+
+#include "globals.hh"
+#include "G4ios.hh"
+#include "Randomize.hh"
+#include "G4NeutronHPVector.hh"
 #include "G4VNeutronHPEDis.hh"

 // we will need a List of these .... one per term.
@@ -52,8 +53,8 @@ class G4NeutronHPSimpleEvapSpectrum : public G4VNeutronHPEDis
  
  inline void Init(std::ifstream & aDataFile)
  {
-    theFractionalProb.Init(aDataFile,eV);
-    theThetaDist.Init(aDataFile, eV);
+    theFractionalProb.Init(aDataFile, CLHEP::eV);
+    theThetaDist.Init(aDataFile, CLHEP::eV);
  }
  
  inline G4double GetFractionalProbability(G4double anEnergy)
@@ -63,7 +64,7 @@ class G4NeutronHPSimpleEvapSpectrum : public G4VNeutronHPEDis
  
  inline G4double Sample(G4double anEnergy) 
  {
-    G4double theta = theThetaDist.GetY(anEnergy)*eV;
+    G4double theta = theThetaDist.GetY(anEnergy)*CLHEP::eV;
    G4double random, cut, max, result;
    max = 10.*theta;
    do
@@ -80,7 +81,7 @@ class G4NeutronHPSimpleEvapSpectrum : public G4VNeutronHPEDis
  
  inline G4double Evapo(G4double anEnergy, G4double theta)
  {
-    G4double result = (anEnergy*eV)*std::exp(-anEnergy*eV/theta);
+    G4double result = (anEnergy*CLHEP::eV)*std::exp(-anEnergy*CLHEP::eV/theta);
    return result;
  }
  
--- a/Show More
+++ b/Show More