diff --git a/src/tallies/filter_azimuthal.cpp b/src/tallies/filter_azimuthal.cpp index 99a649cd91..dc65284820 100644 --- a/src/tallies/filter_azimuthal.cpp +++ b/src/tallies/filter_azimuthal.cpp @@ -66,6 +66,7 @@ std::string AzimuthalFilter::text_label(int bin) const { std::stringstream out; + //TODO: off-by-one out << "Azimuthal Angle [" << bins_[bin-1] << ", " << bins_[bin] << ")"; return out.str(); } diff --git a/src/tallies/filter_cell.cpp b/src/tallies/filter_cell.cpp index a09c331bf9..9e0a6721e5 100644 --- a/src/tallies/filter_cell.cpp +++ b/src/tallies/filter_cell.cpp @@ -63,6 +63,7 @@ CellFilter::to_statepoint(hid_t filter_group) const std::string CellFilter::text_label(int bin) const { + //TODO: off-by-one return "Cell " + std::to_string(cells[cells_[bin-1]]->id_); } diff --git a/src/tallies/filter_cellborn.cpp b/src/tallies/filter_cellborn.cpp index e77c2e42f7..4f86ad34cd 100644 --- a/src/tallies/filter_cellborn.cpp +++ b/src/tallies/filter_cellborn.cpp @@ -19,6 +19,7 @@ CellbornFilter::get_all_bins(const Particle* p, int estimator, std::string CellbornFilter::text_label(int bin) const { + //TODO: off-by-one return "Birth Cell " + std::to_string(cells[cells_[bin-1]]->id_); } diff --git a/src/tallies/filter_cellfrom.cpp b/src/tallies/filter_cellfrom.cpp index 4ce24e8900..b4b1a57ef0 100644 --- a/src/tallies/filter_cellfrom.cpp +++ b/src/tallies/filter_cellfrom.cpp @@ -21,6 +21,7 @@ CellFromFilter::get_all_bins(const Particle* p, int estimator, std::string CellFromFilter::text_label(int bin) const { + //TODO: off-by-one return "Cell from " + std::to_string(cells[cells_[bin-1]]->id_); } diff --git a/src/tallies/filter_delayedgroup.cpp b/src/tallies/filter_delayedgroup.cpp index ac226b74db..2b63027cf4 100644 --- a/src/tallies/filter_delayedgroup.cpp +++ b/src/tallies/filter_delayedgroup.cpp @@ -44,6 +44,7 @@ DelayedGroupFilter::to_statepoint(hid_t filter_group) const std::string DelayedGroupFilter::text_label(int bin) const { + //TODO: off-by-one return "Delayed Group " + std::to_string(groups_[bin-1]); } diff --git a/src/tallies/filter_distribcell.cpp b/src/tallies/filter_distribcell.cpp index f1e69b62a0..39459672fc 100644 --- a/src/tallies/filter_distribcell.cpp +++ b/src/tallies/filter_distribcell.cpp @@ -73,6 +73,7 @@ std::string DistribcellFilter::text_label(int bin) const { auto map = cells[cell_]->distribcell_index_; + //TODO: off-by-one auto path = distribcell_path(cell_, map, bin-1); return "Distributed Cell " + path; } diff --git a/src/tallies/filter_legendre.cpp b/src/tallies/filter_legendre.cpp index 3b59fa763d..67d3e21d44 100644 --- a/src/tallies/filter_legendre.cpp +++ b/src/tallies/filter_legendre.cpp @@ -37,6 +37,7 @@ LegendreFilter::to_statepoint(hid_t filter_group) const std::string LegendreFilter::text_label(int bin) const { + //TODO: off-by-one return "Legendre expansion, P" + std::to_string(bin - 1); } diff --git a/src/tallies/filter_material.cpp b/src/tallies/filter_material.cpp index 0334efae94..d36175e9b1 100644 --- a/src/tallies/filter_material.cpp +++ b/src/tallies/filter_material.cpp @@ -62,6 +62,7 @@ MaterialFilter::to_statepoint(hid_t filter_group) const std::string MaterialFilter::text_label(int bin) const { + //TODO: off-by-one return "Material " + std::to_string(materials[materials_[bin-1]]->id_); } diff --git a/src/tallies/filter_meshsurface.cpp b/src/tallies/filter_meshsurface.cpp index 8074b4a4c9..af9bc53218 100644 --- a/src/tallies/filter_meshsurface.cpp +++ b/src/tallies/filter_meshsurface.cpp @@ -22,6 +22,7 @@ MeshSurfaceFilter::text_label(int bin) const int n_dim = mesh.n_dimension_; // Get flattend mesh index and surface index. + //TODO: off-by-one int i_mesh = (bin - 1) / (4 * n_dim) + 1; int i_surf = ((bin - 1) % (4 * n_dim)) + 1; diff --git a/src/tallies/filter_mu.cpp b/src/tallies/filter_mu.cpp index e57a8aa2e5..521deefe3d 100644 --- a/src/tallies/filter_mu.cpp +++ b/src/tallies/filter_mu.cpp @@ -57,6 +57,7 @@ std::string MuFilter::text_label(int bin) const { std::stringstream out; + //TODO: off-by-one out << "Change-in-Angle [" << bins_[bin-1] << ", " << bins_[bin] << ")"; return out.str(); } diff --git a/src/tallies/filter_particle.cpp b/src/tallies/filter_particle.cpp index 251bb1011a..27558c59b4 100644 --- a/src/tallies/filter_particle.cpp +++ b/src/tallies/filter_particle.cpp @@ -34,6 +34,7 @@ ParticleFilter::to_statepoint(hid_t filter_group) const std::string ParticleFilter::text_label(int bin) const { + //TODO: off-by-one return "Particle " + std::to_string(particles_[bin-1]); } @@ -42,6 +43,6 @@ ParticleFilter::text_label(int bin) const //============================================================================== extern "C" int particle_filter_particles(ParticleFilter* filt, int i) -{return filt->particles_[i];} +{return filt->particles_[i-1];} } // namespace openmc diff --git a/src/tallies/filter_polar.cpp b/src/tallies/filter_polar.cpp index bfa87a3417..50fc47999c 100644 --- a/src/tallies/filter_polar.cpp +++ b/src/tallies/filter_polar.cpp @@ -65,6 +65,7 @@ std::string PolarFilter::text_label(int bin) const { std::stringstream out; + //TODO: off-by-one out << "Polar Angle [" << bins_[bin-1] << ", " << bins_[bin] << ")"; return out.str(); } diff --git a/src/tallies/filter_sph_harm.cpp b/src/tallies/filter_sph_harm.cpp index 764c56223f..001f291193 100644 --- a/src/tallies/filter_sph_harm.cpp +++ b/src/tallies/filter_sph_harm.cpp @@ -78,6 +78,7 @@ SphericalHarmonicsFilter::text_label(int bin) const std::stringstream out; for (int n = 0; n < order_ + 1; n++) { if (bin <= (n + 1) * (n + 1)) { + //TODO: off-by-one int m = (bin - n*n - 1) - n; out << "Spherical harmonic expansion, Y" << n << "," << m; return out.str(); diff --git a/src/tallies/filter_sptl_legendre.cpp b/src/tallies/filter_sptl_legendre.cpp index 3f93be1cb0..df0d8cd236 100644 --- a/src/tallies/filter_sptl_legendre.cpp +++ b/src/tallies/filter_sptl_legendre.cpp @@ -88,6 +88,7 @@ SpatialLegendreFilter::text_label(int bin) const } else { out << "z"; } + //TODO: off-by-one out << " axis, P" << std::to_string(bin - 1); return out.str(); } diff --git a/src/tallies/filter_surface.cpp b/src/tallies/filter_surface.cpp index 7fd2c6e24e..5458d20519 100644 --- a/src/tallies/filter_surface.cpp +++ b/src/tallies/filter_surface.cpp @@ -65,6 +65,7 @@ SurfaceFilter::to_statepoint(hid_t filter_group) const std::string SurfaceFilter::text_label(int bin) const { + //TODO: off-by-one return "Surface " + std::to_string(surfaces[surfaces_[bin-1]]->id_); } diff --git a/src/tallies/filter_universe.cpp b/src/tallies/filter_universe.cpp index de0d33d294..05d8c3e0dd 100644 --- a/src/tallies/filter_universe.cpp +++ b/src/tallies/filter_universe.cpp @@ -63,6 +63,7 @@ UniverseFilter::to_statepoint(hid_t filter_group) const std::string UniverseFilter::text_label(int bin) const { + //TODO: off-by-one return "Universe " + std::to_string(universes[universes_[bin-1]]->id_); } diff --git a/src/tallies/filter_zernike.cpp b/src/tallies/filter_zernike.cpp index 198bd8cb71..a8f41cfeb5 100644 --- a/src/tallies/filter_zernike.cpp +++ b/src/tallies/filter_zernike.cpp @@ -62,6 +62,7 @@ ZernikeFilter::text_label(int bin) const std::stringstream out; for (int n = 0; n < order_+1; n++) { int last = (n + 1) * (n + 2) / 2; + //TODO: off-by-one if (bin <= last) { int first = last - n; int m = -n + (bin - first) * 2; @@ -106,6 +107,7 @@ ZernikeRadialFilter::get_all_bins(const Particle* p, int estimator, std::string ZernikeRadialFilter::text_label(int bin) const { + //TODO: off-by-one return "Zernike expansion, Z" + std::to_string(2*(bin-1)) + ",0"; }