changeset 37:947996aac974

Calculate column sums, etc

--- a/src/EM.cpp	Fri Apr 04 17:48:06 2014 +0100
+++ b/src/EM.cpp	Fri Apr 04 18:18:18 2014 +0100
@@ -177,6 +177,15 @@
     cerr << " sounding: ";
     for (int i = 0; i < (int)sounding.size(); ++i) {
         cerr << sounding[i] << " ";
+        int maxj = -1;
+        double maxs = 0.0;
+        for (int j = 0; j < m_instruments; ++j) {
+            if (j == 0 || m_sources[j][sounding[i]] > maxs) {
+                maxj = j;
+                maxs = m_sources[j][sounding[i]];
+            }
+        }
+        cerr << silvet_templates[maxj].name << " ";
     }
     cerr << endl;
 }

--- a/src/Silvet.cpp	Fri Apr 04 17:48:06 2014 +0100
+++ b/src/Silvet.cpp	Fri Apr 04 18:18:18 2014 +0100
@@ -296,10 +296,20 @@
     int iterations = 12;
 
     for (int i = 0; i < width; ++i) {
+
+        double sum = 0.0;
+        for (int j = 0; j < processingHeight; ++j) {
+            sum += filtered[i][j];
+        }
+        cerr << "sum = " << sum << endl;
+
+        if (sum < 1e-5) continue;
+
         EM em;
         for (int j = 0; j < iterations; ++j) {
             em.iterate(filtered[i]);
         }
+
         //!!! now do something with the results from em!
         em.report();
     }