Commit 9a1f2f0f authored by Giovanni La Mura's avatar Giovanni La Mura
Browse files

Fix matrix check flag name and hdf5_file pointer

parent ceb70c31

src/libnptm/Configuration.cpp

+3 −2
Original line number Diff line number Diff line
@@ -556,7 +556,7 @@ ScattererConfiguration* ScattererConfiguration::from_hdf5(string file_name) { 
    status = hdf_file->read("NXI", "INT32_(1)", &nxi);

    iog = new int[nsph];

    string str_type = "INT32_(" + to_string(nsph) + ")";

    status = hdf_file.read("IOGVEC", str_type, iog);

    status = hdf_file->read("IOGVEC", str_type, iog);

    int configuration_count = 0;

    for (int ci = 0; ci < nsph; ci++) {

      if (iog[ci] < ci + 1) continue;
@@ -564,6 +564,7 @@ ScattererConfiguration* ScattererConfiguration::from_hdf5(string file_name) { 
    }

    nshl_vector = new int[configuration_count];

    ros_vector = new double[configuration_count];

    // DA QUI

    

    status = hdf_file->close();

    conf = new ScattererConfiguration(
@@ -1079,7 +1080,7 @@ bool ScattererConfiguration::operator ==(ScattererConfiguration &other) { 
    if (scale_vec[svi] != other.scale_vec[svi]) return false;

  int dj_index = 0;

  for (int dj = 0; dj < number_of_spheres; dj++) {

    bool check matrixes = false;

    bool check_matrixes = false;

    if (iog_vec[dj] >= dj + 1) {

      dj_index = iog_vec[dj] - 1;

      check_matrixes = true;