Add TYPE to the distribution as req by 2.0.0

tests/opal_src/Distribution/GaussTest.cpp

@@ -26,12 +26,12 @@ Inform *gmsg;
 #include <sstream>
 
 TEST(GaussTest, FullSigmaTest1) {
-    OpalTestUtilities::SilenceTest silencer(true);
+    OpalTestUtilities::SilenceTest silencer(false);
     char inputFileName[] = "GaussDistributionTest.in";
     std::string input = "OPTION, ECHO=FALSE;\n"
         "OPTION, CZERO=FALSE;\n"
         "TITLE, STRING=\"gauss distribution unit test\";\n"
-        "DIST1: DISTRIBUTION, DISTRIBUTION = \"GAUSS\", \n"
+        "DIST1: DISTRIBUTION, TYPE = \"GAUSS\", \n"
         "SIGMAX = 1.978e-3, SIGMAY = 2.498e-3, SIGMAZ = 1.537e-3, \n"
         "SIGMAPX = 0.7998, SIGMAPY = 0.6212, SIGMAPZ = 0.9457, \n"
         "R = {-0.40993, 0, 0, 0.14935, 0.72795,   0, 0, 0.59095, -0.3550,   0.77208, 0, 0,   0, 0,  0.12051}, \n"
@@ -94,14 +94,11 @@ TEST(GaussTest, FullSigmaTest1) {
 
     if (distObj) {
         Distribution *dist = dynamic_cast<Distribution*>(distObj);
-
         dist->setDistType();
         dist->checkIfEmitted();
-
         size_t numParticles = 1000000;
         dist->create(numParticles, Physics::m_p);
 
-
         double R11 = gsl_stats_variance(&(dist->xDist_m[0]), 1, dist->xDist_m.size()) * 1e6;
         double R21 = gsl_stats_covariance(&(dist->xDist_m[0]), 1, &(dist->pxDist_m[0]), 1, dist->xDist_m.size()) * 1e3;
         double R22 = gsl_stats_variance(&(dist->pxDist_m[0]), 1, dist->pxDist_m.size());
@@ -144,7 +141,7 @@ TEST(GaussTest, FullSigmaTest2) {
     std::string input = "OPTION, ECHO=FALSE;\n"
         "OPTION, CZERO=FALSE;\n"
         "TITLE, STRING=\"gauss distribution unit test\";\n"
-        "DIST1: DISTRIBUTION, DISTRIBUTION = \"GAUSS\", \n"
+        "DIST1: DISTRIBUTION, TYPE = \"GAUSS\", \n"
         "SIGMAX = 1.978e-3, SIGMAY = 2.498e-3, SIGMAZ = 1.537e-3, \n"
         "SIGMAPX = 0.7998, SIGMAPY = 0.6212, SIGMAPZ = 0.9457, \n"
         "CORRX= -0.40993, CORRY=0.77208, CORRZ=0.12051, \n"
@@ -152,7 +149,6 @@ TEST(GaussTest, FullSigmaTest2) {
         "EKIN = 0.63, \n"
         "EMITTED = FALSE;\n";
 
-
     int narg = 7;
     char exe_name[] = "opal_unit_tests";
     char commlib[] = "--nocomminit";