Commit 219af84c4c0ebde3b531daf86ab4d4652e9472ea
1 parent
b3c24f8a
Integrate code.
Showing
1 changed file
with
8 additions
and
7 deletions
src/ctmodel/ctmodel.cpp
| ... | ... | @@ -585,11 +585,11 @@ void ctmodel::fill_cube(const GCTAObservation* obs) |
| 585 | 585 | // Continue only if observation pointer is valid |
| 586 | 586 | if (obs != NULL) { |
| 587 | 587 | |
| 588 | - // Get energy boundaries and GTI references for observation | |
| 589 | - const GGti& gti = obs->events()->gti(); | |
| 590 | - const GEbounds& obs_ebounds = obs->ebounds(); | |
| 588 | + // Get GTI and energy boundaries references for observation | |
| 589 | + const GGti& gti = obs->events()->gti(); | |
| 590 | + const GEbounds& obs_ebounds = obs->ebounds(); | |
| 591 | 591 | |
| 592 | - // Get cube ebounds | |
| 592 | + // Get cube energy boundaries | |
| 593 | 593 | const GEbounds& cube_ebounds = m_cube.ebounds(); |
| 594 | 594 | |
| 595 | 595 | // Initialise empty, invalid RoI |
| ... | ... | @@ -603,7 +603,7 @@ void ctmodel::fill_cube(const GCTAObservation* obs) |
| 603 | 603 | // Initialise statistics |
| 604 | 604 | double sum = 0.0; |
| 605 | 605 | int num_outside_ebds = 0; |
| 606 | - int num_outside_roi = 0; | |
| 606 | + int num_outside_roi = 0; | |
| 607 | 607 | |
| 608 | 608 | // Setup cube GTIs for this observation |
| 609 | 609 | m_cube.gti(obs->events()->gti()); |
| ... | ... | @@ -623,14 +623,15 @@ void ctmodel::fill_cube(const GCTAObservation* obs) |
| 623 | 623 | continue; |
| 624 | 624 | } |
| 625 | 625 | |
| 626 | - // Check if RoI is valid , i.e. check if we have an unbinned observation | |
| 626 | + // Check if RoI is valid, i.e. check if we have an unbinned | |
| 627 | + // observation | |
| 627 | 628 | if (roi.is_valid()) { |
| 628 | 629 | |
| 629 | 630 | // Skip bin if it is outside the RoI of the observation |
| 630 | 631 | if (!roi.contains(*bin)) { |
| 631 | 632 | num_outside_roi++; |
| 632 | 633 | continue; |
| 633 | - } // endif: bin was inside RoI | |
| 634 | + } | |
| 634 | 635 | |
| 635 | 636 | } // endif: RoI was not valid |
| 636 | 637 | ... | ... |