Merge branch 'PN_CSD' of git.scc.kit.edu:rtsn/rtsn into PN_CSD

code/include/solvers/csdsnsolverfp.h

@@ -13,9 +13,6 @@ class CSDSNSolverFP : public SNSolver
     // Physics acess
     Vector _angle; /*!< @brief angles for SN */
 
-    std::vector<Matrix> _sigmaSE; /*!<  @brief scattering cross section for all energies*/
-    Vector _sigmaTE;              /*!<  @brief total cross section for all energies*/
-
     Matrix _L;  /*!<  @brief Laplace Beltrami Matrix */
     Matrix _IL; /*!<  @brief Laplace Beltrami Matrix */
 

code/include/solvers/csdsolvertrafofp.h

@@ -10,11 +10,7 @@ class CSDSolverTrafoFP : public SNSolver
   private:
     std::vector<double> _dose; /*!< @brief TODO */
 
-    // Physics acess
-    Vector _angle; /*!< @brief angles for SN */
-
-    std::vector<Matrix> _sigmaSE; /*!<  @brief scattering cross section for all energies*/
-    Vector _sigmaTE;              /*!<  @brief total cross section for all energies*/
+    // Helper Variables
 
     Matrix _L;  /*!<  @brief Laplace Beltrami Matrix */
     Matrix _IL; /*!<  @brief Laplace Beltrami Matrix */

code/include/solvers/csdsolvertrafofp2d.h

@@ -10,11 +10,7 @@ class CSDSolverTrafoFP2D : public SNSolver
   private:
     std::vector<double> _dose; /*!< @brief TODO */
 
-    // Physics acess
-    Vector _angle; /*!< @brief angles for SN */
-
-    std::vector<Matrix> _sigmaSE; /*!<  @brief scattering cross section for all energies*/
-    Vector _sigmaTE;              /*!<  @brief total cross section for all energies*/
+    // Helper Variables
 
     Matrix _L;  /*!<  @brief Laplace Beltrami Matrix */
     Matrix _IL; /*!<  @brief Laplace Beltrami Matrix */

code/include/solvers/csdsolvertrafofpsh2d.h

@@ -21,12 +21,7 @@ class CSDSolverTrafoFPSH2D : public SNSolver
   private:
     std::vector<double> _dose; /*!< @brief TODO */
 
-    // Physics acess
-    Vector _angle; /*!< @brief angles for SN */
-
-    std::vector<Matrix> _sigmaSE; /*!<  @brief scattering cross section for all energies*/
-    Vector _sigmaTE;              /*!<  @brief total cross section for all energies*/
-
+    // Helper Variables
     Matrix _L;  /*!<  @brief Laplace Beltrami Matrix */
     Matrix _IL; /*!<  @brief Laplace Beltrami Matrix */
 

code/src/solvers/csdpnsolver.cpp

@@ -76,6 +76,12 @@ CSDPNSolver::CSDPNSolver( Config* settings ) : PNSolver( settings ) {
         }
     }
 
+    // std::cout << "here\n";
+    // std::cout << size( sigma_t ) << std::endl;
+    _sigmaT = sigma_t;
+
+    TextProcessingToolbox::PrintMatrix( sigma_t );
+
     Interpolation interpS( E_tab, S_tab );
     _s = interpS( _energies );
 }