Merge branch 'fix-diffuse-model-normalization' into integration

Jürgen Knödlseder
2 parents 95da80d0 7f5315df
Showing 2 changed files with 17 additions and 4 deletions
src/ctlike/ctlike.cpp
src/ctobssim/ctobssim.cpp
@@ -277,12 +277,13 @@ void ctlike::run(void)
     // Write results into logger
     if (logTerse()) {
         log << gammalib::parformat("Maximum log likelihood");
-        log << m_logL << std::endl;
+        log << gammalib::str(m_logL,3) << std::endl;
         log << gammalib::parformat("Observed events  (Nobs)");
-        log << num_events << std::endl;
+        log << gammalib::str(num_events, 3) << std::endl;
         log << gammalib::parformat("Predicted events (Npred)");
-        log << m_obs.npred();
-        log << " (Nobs - Npred = " << num_events-m_obs.npred();
+        log << gammalib::str(m_obs.npred(), 3);
+        log << " (Nobs - Npred = ";
+        log << gammalib::str(num_events-m_obs.npred());
         log << ")" << std::endl;
         log << m_obs.models() << std::endl;
     }
@@ -336,12 +336,24 @@ void ctobssim::run(void)
                 // Increment counter
                 n_observations++;
  
+                // Save number of events before entering simulation
+                int events_before = obs->events()->size();
+
                 // Simulate source events
                 simulate_source(obs, m_obs.models(), m_rans[i], &wrklog);
  
                 // Simulate source events
                 simulate_background(obs, m_obs.models(), m_rans[i], &wrklog);
  
+                // Dump simulation results
+                if (logNormal()) {
+                    wrklog << gammalib::parformat("MC events");
+                    wrklog << obs->events()->size() - events_before;
+                    wrklog << " (all models)";
+                    wrklog << std::endl;
+                }
+
+
             } // endif: CTA observation found
  
         } // endfor: looped over observations