diff --git a/doc/source/reference_manual/ctmodel.rst b/doc/source/reference_manual/ctmodel.rst index 6976342..0f6f93f 100644 --- a/doc/source/reference_manual/ctmodel.rst +++ b/doc/source/reference_manual/ctmodel.rst @@ -18,20 +18,30 @@ General parameters ------------------ ``incube [file]`` - Input counts cube. If the parameter is not NONE or blank, the specified - counts cube will be used to define the dimensions of the model cube. - -``outcube [file]`` - Output model counts cube. - + Input counts cube. If a filename is given the counts cube will be + used to define the dimensions of the model cube. The content of + the counts cube is not relevant. + ``inmodel [string]`` Source model XML file. +``outcube [file]`` + Output model counts cube. + ``(edisp = no) [boolean]`` Apply energy dispersion to response computation. ``inobs [file]`` Input event list, counts cube or observation definition XML file. + This information is needed to determine the observation information + (number of observations, duration, liftime, pointing, eventually + observation specific instrument response functions, etc.). + +``expcube = NONE [file]`` + Exposure cube file (only needed for stacked analysis). + +``psfcube = NONE [file]`` + PSF cube file (only needed for stacked analysis). ``caldb [string]`` Calibration database. diff --git a/src/ctmodel/ctmodel.cpp b/src/ctmodel/ctmodel.cpp index 2532cba..f902157 100644 --- a/src/ctmodel/ctmodel.cpp +++ b/src/ctmodel/ctmodel.cpp @@ -427,14 +427,10 @@ void ctmodel::get_parameters(void) } // endif: there were no models - // Read optionally output cube filenames - if (read_ahead()) { - m_outcube = (*this)["outcube"].filename(); - } - // Get energy dispersion flag parameters m_apply_edisp = (*this)["edisp"].boolean(); + // Optionally get input counts cube for model cube definition if (!m_has_cube) { // Read cube definition file @@ -467,6 +463,11 @@ void ctmodel::get_parameters(void) m_has_cube = true; } + // Read optionally output cube filenames + if (read_ahead()) { + m_outcube = (*this)["outcube"].filename(); + } + // Return return; } diff --git a/src/ctmodel/ctmodel.hpp b/src/ctmodel/ctmodel.hpp index 90b8cc4..9bcc51c 100644 --- a/src/ctmodel/ctmodel.hpp +++ b/src/ctmodel/ctmodel.hpp @@ -1,7 +1,7 @@ /*************************************************************************** * ctmodel - Model cube generation tool * * ----------------------------------------------------------------------- * - * copyright (C) 2012-2014 by Juergen Knoedlseder * + * copyright (C) 2012-2015 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -34,7 +34,7 @@ /* __Definitions _________________________________________________________ */ #define CTMODEL_NAME "ctmodel" -#define CTMODEL_VERSION "00-04-00" +#define CTMODEL_VERSION "1.0.0" /***********************************************************************//** diff --git a/src/ctmodel/ctmodel.par b/src/ctmodel/ctmodel.par index 3ec7d7c..904ca16 100644 --- a/src/ctmodel/ctmodel.par +++ b/src/ctmodel/ctmodel.par @@ -5,7 +5,7 @@ # ------------------------------------------------------------------------- # # # # File: ctmodel.par # -# Version: 00-04-00 # +# Version: 1.0.0 # # # # Author: Juergen Knoedlseder # # Jurgen.Knodlseder@irap.omp.eu # @@ -18,14 +18,16 @@ # General parameters #=================== incube, f, a, "NONE",,, "Input counts cube" -outcube, f, a, "modmap.fits",,, "Output counts cube or observation definition file" inmodel, f, a, "$CTOOLS/share/models/crab.xml",,, "Source model" +outcube, f, a, "modcube.fits",,, "Output model cube" edisp, b, h, no,,, "Apply energy dispersion?" # # Observation parameters #======================= -inobs, f, a, "NONE",,, "Input event list, cube or observation definition file" -caldb, s, a, "$CTOOLS/share/caldb/data/cta/dummy",,, "Calibration database" +inobs, f, a, "NONE",,, "Input event list, counts cube or observation definition file" +expcube, f, a, NONE,,, "Exposure cube file (only needed for stacked analysis)" +psfcube, f, a, NONE,,, "PSF cube file (only needed for stacked analysis)" +caldb, s, a, "dummy",,, "Calibration database" irf, s, a, "cta_dummy_irf",,, "Instrument response function" ra, r, a, 83.63,0,360, "RA of pointing (degrees)" dec, r, a, 22.01,-90,90, "Dec of pointing (degrees)"