Commit 7a63a072 authored by Giovanni La Mura's avatar Giovanni La Mura
Browse files

Always use a proprietary vector to define configuration scales

parent 6231c601

src/libnptm/Configuration.cpp

+6 −3
Original line number Diff line number Diff line
@@ -297,9 +297,10 @@ ScattererConfiguration::ScattererConfiguration( 
  exdc = ex;

  wp = w;

  xip = x;

  if (variable_name == "XIV") scale_vec = scale_vector;

  else {

  scale_vec = new double[number_of_scales]();

  if (variable_name == "XIV") {

    for (int xi = 0; xi < nxi; xi++) scale_vec[xi] = scale_vector[xi];

  } else {

    const double pi2 = 2.0 * acos(-1.0);

    const double evc = 6.5821188e-16;

    for (int si = 0; si < number_of_scales; si++) {
@@ -312,6 +313,7 @@ ScattererConfiguration::ScattererConfiguration( 
    }

  }

}



ScattererConfiguration::ScattererConfiguration(const  ScattererConfiguration& rhs)

{

  number_of_spheres = rhs.number_of_spheres;
@@ -642,6 +644,7 @@ ScattererConfiguration* ScattererConfiguration::from_dedfb(string dedfb_file_nam 
							      _xip

  );

  delete[] file_lines;

  delete[] variable_vector;

  return config;

}