Commit 1662116058343f85955ba3976f235cf597ae5ad4
1 parent
14199ef4
Rename bgcube to bkgcube
Showing
11 changed files
with
31 additions
and
16 deletions
doc/source/reference_manual/ctbutterfly.rst
| ... | ... | @@ -25,12 +25,15 @@ General parameters |
| 25 | 25 | ``srcname [string]`` |
| 26 | 26 | Name of model component for which butterfly should be computed. |
| 27 | 27 | |
| 28 | -``expcube = NONE [file]`` | |
| 28 | +``expcube [file]`` | |
| 29 | 29 | Exposure cube file (only needed for stacked analysis). |
| 30 | 30 | |
| 31 | -``psfcube = NONE [file]`` | |
| 31 | +``psfcube [file]`` | |
| 32 | 32 | PSF cube file (only needed for stacked analysis). |
| 33 | 33 | |
| 34 | +``bkgcube [file]`` | |
| 35 | + Background cube file (only needed for stacked analysis). | |
| 36 | + | |
| 34 | 37 | ``caldb [string]`` |
| 35 | 38 | Calibration database. |
| 36 | 39 | ... | ... |
doc/source/reference_manual/ctlike.rst
doc/source/reference_manual/ctmodel.rst
doc/source/reference_manual/cttsmap.rst
doc/source/reference_manual/ctulimit.rst
| ... | ... | @@ -24,12 +24,15 @@ General parameters |
| 24 | 24 | ``srcname [string]`` |
| 25 | 25 | Name of model component for which upper limit should be computed. |
| 26 | 26 | |
| 27 | -``expcube = NONE [file]`` | |
| 27 | +``expcube [file]`` | |
| 28 | 28 | Exposure cube file (only needed for stacked analysis). |
| 29 | 29 | |
| 30 | -``psfcube = NONE [file]`` | |
| 30 | +``psfcube [file]`` | |
| 31 | 31 | PSF cube file (only needed for stacked analysis). |
| 32 | 32 | |
| 33 | +``bkgcube [file]`` | |
| 34 | + Background cube file (only needed for stacked analysis). | |
| 35 | + | |
| 33 | 36 | ``caldb [string]`` |
| 34 | 37 | Calibration database. |
| 35 | 38 | ... | ... |
src/ctbutterfly/ctbutterfly.par
| ... | ... | @@ -22,7 +22,7 @@ inmodel, f, a, "$CTOOLS/share/models/crab.xml",,, "Source model" |
| 22 | 22 | srcname, s, a, "Crab",,,"Source of interest" |
| 23 | 23 | expcube, f, a, "NONE",,, "Exposure cube file (only needed for stacked analysis)" |
| 24 | 24 | psfcube, f, a, "NONE",,, "PSF cube file (only needed for stacked analysis)" |
| 25 | -bgcube, f, a, "NONE",,, "Background cube file (only needed for stacked analysis)" | |
| 25 | +bkgcube, f, a, "NONE",,, "Background cube file (only needed for stacked analysis)" | |
| 26 | 26 | caldb, s, a, "dummy",,, "Calibration database" |
| 27 | 27 | irf, s, a, "cta_dummy_irf",,, "Instrument response function" |
| 28 | 28 | outfile, f, a, "butterfly.txt",,, "Output ascii file" | ... | ... |
src/ctlike/ctlike.par
| ... | ... | @@ -21,7 +21,7 @@ inobs, f, a, "events.fits",,, "Event list, counts cube or observation definit |
| 21 | 21 | inmodel, f, a, "$CTOOLS/share/models/crab.xml",,, "Source model" |
| 22 | 22 | expcube, f, a, "NONE",,, "Exposure cube file (only needed for stacked analysis)" |
| 23 | 23 | psfcube, f, a, "NONE",,, "PSF cube file (only needed for stacked analysis)" |
| 24 | -bgcube, f, a, "NONE",,, "Background cube file (only needed for stacked analysis)" | |
| 24 | +bkgcube, f, a, "NONE",,, "Background cube file (only needed for stacked analysis)" | |
| 25 | 25 | caldb, s, a, "dummy",,, "Calibration database" |
| 26 | 26 | irf, s, a, "cta_dummy_irf",,, "Instrument response function" |
| 27 | 27 | outmodel, f, a, "crab_results.xml",,, "Source model output file" | ... | ... |
src/ctmodel/ctmodel.par
| ... | ... | @@ -27,7 +27,7 @@ edisp, b, h, no,,, "Apply energy dispersion?" |
| 27 | 27 | inobs, f, a, "NONE",,, "Event list, counts cube or observation definition file" |
| 28 | 28 | expcube, f, a, "NONE",,, "Exposure cube file (only needed for stacked analysis)" |
| 29 | 29 | psfcube, f, a, "NONE",,, "PSF cube file (only needed for stacked analysis)" |
| 30 | -bgcube, f, a, "NONE",,, "Background cube file (only needed for stacked analysis)" | |
| 30 | +bkgcube, f, a, "NONE",,, "Background cube file (only needed for stacked analysis)" | |
| 31 | 31 | caldb, s, a, "dummy",,, "Calibration database" |
| 32 | 32 | irf, s, a, "cta_dummy_irf",,, "Instrument response function" |
| 33 | 33 | ra, r, a, 83.63,0,360, "RA of pointing (degrees)" | ... | ... |
src/cttsmap/cttsmap.par
| ... | ... | @@ -22,7 +22,7 @@ inmodel, f, a, "$CTOOLS/share/models/crab.xml",,, "Source model" |
| 22 | 22 | srcname, s, a, "Crab",,, "Test source" |
| 23 | 23 | expcube, f, a, "NONE",,, "Exposure cube file (only needed for stacked analysis)" |
| 24 | 24 | psfcube, f, a, "NONE",,, "PSF cube file (only needed for stacked analysis)" |
| 25 | -bgcube, f, a, "NONE",,, "Background cube file (only needed for stacked analysis)" | |
| 25 | +bkgcube, f, a, "NONE",,, "Background cube file (only needed for stacked analysis)" | |
| 26 | 26 | caldb, s, a, "dummy",,, "Calibration database" |
| 27 | 27 | irf, s, a, "cta_dummy_irf",,, "Instrument response function" |
| 28 | 28 | outmap, f, a, "tsmap.fits",,, "Output Test Statistic map" | ... | ... |
src/ctulimit/ctulimit.par
| ... | ... | @@ -22,7 +22,7 @@ inmodel, f, a, "$CTOOLS/share/models/crab.xml",,, "Source model" |
| 22 | 22 | srcname, s, a, "Crab",,, "Source of interest" |
| 23 | 23 | expcube, f, a, "NONE",,, "Exposure cube file (only needed for stacked analysis)" |
| 24 | 24 | psfcube, f, a, "NONE",,, "PSF cube file (only needed for stacked analysis)" |
| 25 | -bgcube, f, a, "NONE",,, "Background cube file (only needed for stacked analysis)" | |
| 25 | +bkgcube, f, a, "NONE",,, "Background cube file (only needed for stacked analysis)" | |
| 26 | 26 | caldb, s, a, "dummy",,, "Calibration database" |
| 27 | 27 | irf, s, a, "cta_dummy_irf",,, "Instrument response function" |
| 28 | 28 | ... | ... |
src/support/ctool.cpp
| ... | ... | @@ -731,23 +731,23 @@ void ctool::set_obs_response(GCTAObservation* obs) |
| 731 | 731 | // If the observation contains a counts cube, then first check whether |
| 732 | 732 | // the expcube and psfcube parameters exist and are not NONE |
| 733 | 733 | if (dynamic_cast<const GCTAEventCube*>(obs->events()) != NULL) { |
| 734 | - if (has_par("expcube") && has_par("psfcube") && has_par("bgcube")) { | |
| 734 | + if (has_par("expcube") && has_par("psfcube") && has_par("bkgcube")) { | |
| 735 | 735 | |
| 736 | 736 | // Get filenames |
| 737 | 737 | std::string expcube = (*this)["expcube"].filename(); |
| 738 | 738 | std::string psfcube = (*this)["psfcube"].filename(); |
| 739 | - std::string bgcube = (*this)["bgcube"].filename(); | |
| 739 | + std::string bkgcube = (*this)["bkgcube"].filename(); | |
| 740 | 740 | |
| 741 | 741 | // Extract response information if available |
| 742 | - if ((expcube != "NONE") && (psfcube != "NONE") && (bgcube != "NONE") && | |
| 742 | + if ((expcube != "NONE") && (psfcube != "NONE") && (bkgcube != "NONE") && | |
| 743 | 743 | (gammalib::strip_whitespace(expcube) != "") && |
| 744 | 744 | (gammalib::strip_whitespace(psfcube) != "") && |
| 745 | - (gammalib::strip_whitespace(bgcube) != "")) { | |
| 745 | + (gammalib::strip_whitespace(bkgcube) != "")) { | |
| 746 | 746 | |
| 747 | 747 | // Get exposure and PSF cubes |
| 748 | - GCTACubeExposure exposure(expcube); | |
| 749 | - GCTACubePsf psf(psfcube); | |
| 750 | - GCTACubeBackground background(bgcube); | |
| 748 | + GCTACubeExposure exposure(expcube); | |
| 749 | + GCTACubePsf psf(psfcube); | |
| 750 | + GCTACubeBackground background(bkgcube); | |
| 751 | 751 | |
| 752 | 752 | // Set reponse |
| 753 | 753 | obs->response(exposure, psf, background); | ... | ... |