Commit 5b47c172fa3691fe94bae7bcc020d812aabfdffa
1 parent
a3978d8c
removes hardwired ROI and ebounds information
Showing
1 changed file
with
1 additions
and
23 deletions
src/ctlike/ctlike.cpp
| 1 | 1 | /*************************************************************************** |
| 2 | 2 | * ctlike - CTA maximum likelihood tool * |
| 3 | 3 | * ----------------------------------------------------------------------- * |
| 4 | - * copyright (C) 2010 by Jurgen Knodlseder * | |
| 4 | + * copyright (C) 2010-2011 by Jurgen Knodlseder * | |
| 5 | 5 | * ----------------------------------------------------------------------- * |
| 6 | 6 | * * |
| 7 | 7 | * This program is free software; you can redistribute it and/or modify * |
| ... | ... | @@ -241,10 +241,6 @@ void ctlike::optimize_lm(void) |
| 241 | 241 | * @brief Load unbinned observation |
| 242 | 242 | * |
| 243 | 243 | * @param[in] evfile Events file name. |
| 244 | - * | |
| 245 | - * @todo ROI, energy range and time range information is hardwired. This is | |
| 246 | - * not needed in the future once this information is correctly extracted | |
| 247 | - * from the event file header. | |
| 248 | 244 | ***************************************************************************/ |
| 249 | 245 | void ctlike::unbinned(const std::string& evfile) |
| 250 | 246 | { |
| ... | ... | @@ -252,29 +248,11 @@ void ctlike::unbinned(const std::string& evfile) |
| 252 | 248 | GCTAObservation run; |
| 253 | 249 | run.statistics(m_stat); |
| 254 | 250 | |
| 255 | - // DUMMY: Setup ROI covered by data. This is needed since actual test | |
| 256 | - // data do not contain any ROI informations. | |
| 257 | - GCTAInstDir instDir; | |
| 258 | - GCTARoi roi; | |
| 259 | - instDir.radec_deg(83.6331, 22.0145); // Adapt to file | |
| 260 | - roi.centre(instDir); | |
| 261 | - roi.radius(2.5); | |
| 262 | - | |
| 263 | - // DUMMY: Setup energy range covered by data. This is needed since actual | |
| 264 | - // test data do not contain any energy range information | |
| 265 | - GEnergy emin; | |
| 266 | - GEnergy emax; | |
| 267 | - GEbounds ebds; | |
| 268 | - emin.TeV(0.1); | |
| 269 | - emax.TeV(100.0); | |
| 270 | - ebds.append(emin, emax); | |
| 271 | 251 | |
| 272 | 252 | // Load data and response and set ROI, energy range and time range |
| 273 | 253 | // for analysis |
| 274 | 254 | run.load_unbinned(evfile); |
| 275 | 255 | run.response(m_irf, m_caldb); |
| 276 | - run.roi(&roi); | |
| 277 | - run.ebounds(ebds); | |
| 278 | 256 | m_obs.append(run); |
| 279 | 257 | |
| 280 | 258 | // Return | ... | ... |