adapt to new GObservation interface

knodlseder
1 parent 715c28b1
Showing 2 changed files with 13 additions and 10 deletions
src/ctbin/ctbin.cpp
src/ctlike/ctlike.cpp
@@ -159,11 +159,13 @@ void ctbin::bin(void)
     obs.load_unbinned(m_evfile);
  
     // Setup energy range covered by data
-    GEnergy emin;
-    GEnergy emax;
+    GEnergy  emin;
+    GEnergy  emax;
+    GEbounds ebds;
     emin.TeV(m_emin);
     emax.TeV(m_emax);
-    obs.ebounds()->setlog(emin, emax, m_enumbins);
+    ebds.setlog(emin, emax, m_enumbins);
+    obs.ebounds(ebds);
  
     // Log observation
     if (logTerse()) {
@@ -199,7 +201,7 @@ void ctbin::bin(void)
         }
  
         // Determine energy bin. Skip if we are outside the energy range
-        int index = obs.ebounds()->index(event->energy());
+        int index = obs.ebounds().index(event->energy());
         if (index == -1) {
             num_outside_ebds++;
             continue;
@@ -235,8 +237,8 @@ void ctbin::bin(void)
     // Save counts map
     GFits file;
     map.write(&file);
-    obs.ebounds()->write(&file);
-    obs.gti()->write(&file);
+    obs.ebounds().write(&file);
+    obs.gti().write(&file);
     file.saveto(m_outfile, clobber());
  
     // Return
@@ -254,18 +254,19 @@ void ctlike::unbinned(const std::string&amp; evfile)
  
     // DUMMY: Setup energy range covered by data. This is needed since actual
     // test data do not contain any energy range information
-    GEnergy emin;
-    GEnergy emax;
+    GEnergy  emin;
+    GEnergy  emax;
+    GEbounds ebds;
     emin.TeV(0.1);
     emax.TeV(100.0);
+    ebds.append(emin, emax);
  
     // Load data and response and set ROI, energy range and time range
     // for analysis
     run.load_unbinned(evfile);
     run.response(m_irf, m_caldb);
     run.roi(roi);
-    //run.gti()->add(tstart, tstop);
-    run.ebounds()->append(emin, emax);
+    run.ebounds(ebds);
     m_obs.append(run);
  
     // Return