Olga Sergijenko / ctools

Commit 829068d5db710d49a5a254a74a9bdd44de0a697d

Authored by Josh Cardenzana
Committed by Jürgen Knödlseder
1 parent 5a89c717

Resolve merge conflicts (#2713)

Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
src/ctfindvar/ctfindvar.cpp
  View file @829068d
@@ -403,7 +403,7 @@ void ctfindvar::get_variability_sig(const int& pix_number, @@ -403,7 +403,7 @@ void ctfindvar::get_variability_sig(const int& pix_number,
403 { 403 {
404 std::vector<bool> accepted_bin_bckg_vector(nbins, true); 404 std::vector<bool> accepted_bin_bckg_vector(nbins, true);
405 std::vector<double> excess_bin_vector(nbins, 0.0); 405 std::vector<double> excess_bin_vector(nbins, 0.0);
406 - std::vector<int> background_bin_array(nbins, 0); 406 + std::vector<int> background_bin_vector(nbins, 0);
407 bool background_validated=false; 407 bool background_validated=false;
408 double non, noff; 408 double non, noff;
409 double alpha, sig; 409 double alpha, sig;
@@ -440,7 +440,7 @@ void ctfindvar::get_variability_sig(const int&amp; pix_number, @@ -440,7 +440,7 @@ void ctfindvar::get_variability_sig(const int&amp; pix_number,
440 440
441 background_bin_vector[i] = background_count; //The background is averaged on the number of bins -1 441 background_bin_vector[i] = background_count; //The background is averaged on the number of bins -1
442 non = m_counts(pix_number, i); 442 non = m_counts(pix_number, i);
443 - noff = background_bin_array[i]; 443 + noff = background_bin_vector[i];
444 alpha = alpha_vector[i]/alpha; 444 alpha = alpha_vector[i]/alpha;
445 445
446 ///////////////////////////////////////////////////////////////////////////////// 446 /////////////////////////////////////////////////////////////////////////////////