Michael Mayer / ctools

Commit e5588dc24623de6745d6fdb1278a7488ef6d8430

Authored by Jürgen Knödlseder
1 parent 3c7154ea

Add expcube and psfcube parameters for stacked analysis.

Inline Side-by-side
Showing 4 changed files with 30 additions and 17 deletions
doc/source/reference_manual/ctmodel.rst
  View file @e5588dc
... ... @@ -18,20 +18,30 @@ General parameters
18 18 ------------------
19 19  
20 20 ``incube [file]``
21   - Input counts cube. If the parameter is not NONE or blank, the specified
22   - counts cube will be used to define the dimensions of the model cube.
23   -
24   -``outcube [file]``
25   - Output model counts cube.
26   -
  21 + Input counts cube. If a filename is given the counts cube will be
  22 + used to define the dimensions of the model cube. The content of
  23 + the counts cube is not relevant.
  24 +
27 25 ``inmodel [string]``
28 26 Source model XML file.
29 27  
  28 +``outcube [file]``
  29 + Output model counts cube.
  30 +
30 31 ``(edisp = no) [boolean]``
31 32 Apply energy dispersion to response computation.
32 33  
33 34 ``inobs [file]``
34 35 Input event list, counts cube or observation definition XML file.
  36 + This information is needed to determine the observation information
  37 + (number of observations, duration, liftime, pointing, eventually
  38 + observation specific instrument response functions, etc.).
  39 +
  40 +``expcube = NONE [file]``
  41 + Exposure cube file (only needed for stacked analysis).
  42 +
  43 +``psfcube = NONE [file]``
  44 + PSF cube file (only needed for stacked analysis).
35 45  
36 46 ``caldb [string]``
37 47 Calibration database.
... ...
src/ctmodel/ctmodel.cpp
  View file @e5588dc
... ... @@ -427,14 +427,10 @@ void ctmodel::get_parameters(void)
427 427  
428 428 } // endif: there were no models
429 429  
430   - // Read optionally output cube filenames
431   - if (read_ahead()) {
432   - m_outcube = (*this)["outcube"].filename();
433   - }
434   -
435 430 // Get energy dispersion flag parameters
436 431 m_apply_edisp = (*this)["edisp"].boolean();
437 432  
  433 + // Optionally get input counts cube for model cube definition
438 434 if (!m_has_cube) {
439 435  
440 436 // Read cube definition file
... ... @@ -467,6 +463,11 @@ void ctmodel::get_parameters(void)
467 463 m_has_cube = true;
468 464 }
469 465  
  466 + // Read optionally output cube filenames
  467 + if (read_ahead()) {
  468 + m_outcube = (*this)["outcube"].filename();
  469 + }
  470 +
470 471 // Return
471 472 return;
472 473 }
... ...
src/ctmodel/ctmodel.hpp
  View file @e5588dc
1 1 /***************************************************************************
2 2 * ctmodel - Model cube generation tool *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2012-2014 by Juergen Knoedlseder *
  4 + * copyright (C) 2012-2015 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -34,7 +34,7 @@
34 34  
35 35 /* __Definitions _________________________________________________________ */
36 36 #define CTMODEL_NAME "ctmodel"
37   -#define CTMODEL_VERSION "00-04-00"
  37 +#define CTMODEL_VERSION "1.0.0"
38 38  
39 39  
40 40 /***********************************************************************//**
... ...
src/ctmodel/ctmodel.par
  View file @e5588dc
... ... @@ -5,7 +5,7 @@
5 5 # ------------------------------------------------------------------------- #
6 6 # #
7 7 # File: ctmodel.par #
8   -# Version: 00-04-00 #
  8 +# Version: 1.0.0 #
9 9 # #
10 10 # Author: Juergen Knoedlseder #
11 11 # Jurgen.Knodlseder@irap.omp.eu #
... ... @@ -18,14 +18,16 @@
18 18 # General parameters
19 19 #===================
20 20 incube, f, a, "NONE",,, "Input counts cube"
21   -outcube, f, a, "modmap.fits",,, "Output counts cube or observation definition file"
22 21 inmodel, f, a, "$CTOOLS/share/models/crab.xml",,, "Source model"
  22 +outcube, f, a, "modcube.fits",,, "Output model cube"
23 23 edisp, b, h, no,,, "Apply energy dispersion?"
24 24 #
25 25 # Observation parameters
26 26 #=======================
27   -inobs, f, a, "NONE",,, "Input event list, cube or observation definition file"
28   -caldb, s, a, "$CTOOLS/share/caldb/data/cta/dummy",,, "Calibration database"
  27 +inobs, f, a, "NONE",,, "Input event list, counts cube or observation definition file"
  28 +expcube, f, a, NONE,,, "Exposure cube file (only needed for stacked analysis)"
  29 +psfcube, f, a, NONE,,, "PSF cube file (only needed for stacked analysis)"
  30 +caldb, s, a, "dummy",,, "Calibration database"
29 31 irf, s, a, "cta_dummy_irf",,, "Instrument response function"
30 32 ra, r, a, 83.63,0,360, "RA of pointing (degrees)"
31 33 dec, r, a, 22.01,-90,90, "Dec of pointing (degrees)"
... ...