From c6d64acd9a4f52e2d6936ab9b172318db55d182c Mon Sep 17 00:00:00 2001
From: Konstantin Batkov <konstantin.batkov@esss.se>
Date: Wed, 7 Jun 2017 13:22:00 +0200
Subject: [PATCH 1/2] Proton flux-to-dose conversion factors

---
 System/tally/meshConstruct.cxx  | 38 ++++++++++++++++++++++++++++++++-
 System/tallyInc/meshConstruct.h |  1 +
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/System/tally/meshConstruct.cxx b/System/tally/meshConstruct.cxx
index 912e0e781..d664a73c6 100644
--- a/System/tally/meshConstruct.cxx
+++ b/System/tally/meshConstruct.cxx
@@ -300,6 +300,12 @@ meshConstruct::rectangleMesh(Simulation& System,const int type,
       MT.setKeyWords("DOSE 1");
       MT.setResponse(getPhotonDoseConversion());
     }
+  else if (KeyWords=="DOSEPROTON")
+    {
+      MT.setParticles("h");
+      MT.setKeyWords("DOSE 1");
+      MT.setResponse(getProtonDoseConversion());
+    }
   else if (KeyWords=="InternalDOSE")
     {
       MT.setKeyWords("DOSE");
@@ -347,7 +353,7 @@ meshConstruct::rectangleFMesh(Simulation& System,const int type,
     \param MPts :: Points ot use
   */
 {
-  ELog::RegMethod RegA("meshConstruct","rectangleMesh");
+  ELog::RegMethod RegA("meshConstruct","rectangleFMesh");
 
   // Find next available number
   int tallyN(type);
@@ -372,6 +378,12 @@ meshConstruct::rectangleFMesh(Simulation& System,const int type,
       MT.setKeyWords("DOSE 1");
       MT.setResponse(getPhotonDoseConversion());
     }
+  else if (KeyWords=="DOSEPROTON")
+    {
+      MT.setParticles("h");
+      MT.setKeyWords("DOSE 1");
+      MT.setResponse(getProtonDoseConversion());
+    }
   else if (KeyWords=="InternalDOSE")
     {
       MT.setKeyWords("DOSE");
@@ -386,6 +398,7 @@ meshConstruct::rectangleFMesh(Simulation& System,const int type,
       ELog::EM<<"Mesh keyword options:\n"
 	      <<"  DOSE :: ICRP-116 Flux to Dose conversion (uSv/hour per n/cm2/sec)\n"
 	      <<"  DOSEPHOTON :: ICRP-116 Flux to Dose conversion (uSv/hour per n/cm2/sec)\n"
+	      <<"  DOSEPROTON :: ICRP-116 Flux to Dose conversion (uSv/hour per n/cm2/sec)\n"
 	      <<"  InternalDOSE :: MCNPX Flux to Dose conversion (mrem/hour)\n"
 	      <<"  void ::  Flux \n"
 	      <<ELog::endDiag;
@@ -463,6 +476,29 @@ meshConstruct::getPhotonDoseConversion()
   return fcdString;
 }
 
+const std::string&
+meshConstruct::getProtonDoseConversion()
+  /*!
+    Return the flux-to-dose proton ICRP-116 conversion factors
+    in uSv/hour from proton/cm2/sec
+    Reference: ESS-0019931, Table 3.
+    \return FCD string
+  */
+{
+  static std::string fcdString=
+    "1.00E+00 1.97E-02 1.50E+00 2.96E-02 2.00E+00 3.92E-02 3.00E+00 5.90E-02 "
+    "4.00E+00 7.88E-02 5.00E+00 9.83E-02 6.00E+00 1.18E-01 8.00E+00 1.57E-01 "
+    "1.00E+01 1.98E-01 1.50E+01 6.80E-01 2.00E+01 1.54E+00 3.00E+01 2.70E+00 "
+    "4.00E+01 3.67E+00 5.00E+01 4.25E+00 6.00E+01 5.33E+00 8.00E+01 7.78E+00 "
+    "1.00E+02 9.04E+00 1.50E+02 1.02E+01 2.00E+02 7.85E+00 3.00E+02 5.22E+00 "
+    "4.00E+02 4.68E+00 5.00E+02 4.46E+00 6.00E+02 4.43E+00 8.00E+02 4.43E+00 "
+    "1.00E+03 4.43E+00 1.50E+03 4.50E+00 2.00E+03 4.61E+00 3.00E+03 4.82E+00 "
+    "4.00E+03 5.04E+00 5.00E+03 5.22E+00 6.00E+03 5.65E+00 8.00E+03 6.16E+00 "
+    "1.00E+04 6.41E+00 ";
+
+  return fcdString;
+}
+
 void
 meshConstruct::writeHelp(std::ostream& OX) const
   /*!
diff --git a/System/tallyInc/meshConstruct.h b/System/tallyInc/meshConstruct.h
index 4b09bf1b2..2d06c1133 100644
--- a/System/tallyInc/meshConstruct.h
+++ b/System/tallyInc/meshConstruct.h
@@ -46,6 +46,7 @@ class meshConstruct : virtual public basicConstruct
 
   static const std::string& getDoseConversion();
   static const std::string& getPhotonDoseConversion();
+  static const std::string& getProtonDoseConversion();
   static void calcXYZ(const std::string&,const std::string&,
 		      Geometry::Vec3D&,Geometry::Vec3D&) ;
 

From 8583f90cb79c4579e5c34828fd68025df3cfca43 Mon Sep 17 00:00:00 2001
From: Konstantin Batkov <konstantin.batkov@esss.se>
Date: Wed, 7 Jun 2017 14:49:58 +0200
Subject: [PATCH 2/2] Mesh help message revised

---
 System/tally/meshConstruct.cxx | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/System/tally/meshConstruct.cxx b/System/tally/meshConstruct.cxx
index d664a73c6..deaaa50d8 100644
--- a/System/tally/meshConstruct.cxx
+++ b/System/tally/meshConstruct.cxx
@@ -318,9 +318,10 @@ meshConstruct::rectangleMesh(Simulation& System,const int type,
   else 
     {
       ELog::EM<<"Mesh keyword options:\n"
-	      <<"  DOSE :: ICRP-116 Flux to Dose conversion (uSv/hour per n/cm2/sec)\n"
-	      <<"  DOSEPHOTON :: ICRP-116 Flux to Dose conversion (uSv/hour per n/cm2/sec)\n"
-	      <<"  InternalDOSE :: MCNPX Flux to Dose conversion (mrem/hour)\n"
+	      <<"  DOSE :: neutrons - ICRP-116 Flux to Dose conversion (uSv/hour per n/cm2/sec)\n"
+	      <<"  DOSEPHOTON :: photons - ICRP-116 Flux to Dose conversion (uSv/hour per n/cm2/sec)\n"
+	      <<"  DOSEPROTON :: protons - ICRP-116 Flux to Dose conversion (uSv/hour per n/cm2/sec)\n"
+	      <<"  InternalDOSE :: neutrons - ICRP-74 1996 ambient dose equivalent (uSv/hour)\n"
 	      <<"  void ::  Flux \n"
 	      <<ELog::endDiag;
       ELog::EM<<"Using unknown keyword :"<<KeyWords<<ELog::endErr;
@@ -396,10 +397,10 @@ meshConstruct::rectangleFMesh(Simulation& System,const int type,
   else 
     {
       ELog::EM<<"Mesh keyword options:\n"
-	      <<"  DOSE :: ICRP-116 Flux to Dose conversion (uSv/hour per n/cm2/sec)\n"
-	      <<"  DOSEPHOTON :: ICRP-116 Flux to Dose conversion (uSv/hour per n/cm2/sec)\n"
-	      <<"  DOSEPROTON :: ICRP-116 Flux to Dose conversion (uSv/hour per n/cm2/sec)\n"
-	      <<"  InternalDOSE :: MCNPX Flux to Dose conversion (mrem/hour)\n"
+	      <<"  DOSE :: neutrons - ICRP-116 Flux to Dose conversion (uSv/hour per n/cm2/sec)\n"
+	      <<"  DOSEPHOTON :: photons - ICRP-116 Flux to Dose conversion (uSv/hour per n/cm2/sec)\n"
+	      <<"  DOSEPROTON :: protons - ICRP-116 Flux to Dose conversion (uSv/hour per n/cm2/sec)\n"
+	      <<"  InternalDOSE :: neutrons - ICRP-74 1996 ambient dose equivalent (uSv/hour)\n"
 	      <<"  void ::  Flux \n"
 	      <<ELog::endDiag;
       ELog::EM<<"Using unknown keyword :"<<KeyWords<<ELog::endErr;