adapted ctprob files

ldivenere
1 parent 3d85a1fb
Showing 6 changed files with 62 additions and 59 deletions
src/Makefile.am
src/ctprob/Makefile.am
src/ctprob/ctprob.cpp
src/ctprob/ctprob.hpp
src/ctprob/ctprob.par
src/ctprob/main.cpp
@@ -40,7 +40,8 @@ SUBDIRS = support \
           cttsmap \
           ctbutterfly \
           ctulimit \
-          cterror
+          cterror \
+          ctprob
 # Scripts to be distributed
 scripts = ctools-setup \
@@ -68,7 +69,8 @@ libctools_la_LIBADD = support/libsupport.la \
                       cttsmap/libcttsmap.la \
                       ctbutterfly/libctbutterfly.la \
                       ctulimit/libctulimit.la \
-                      cterror/libcterror.la
+                      cterror/libcterror.la \
+                      ctprob/libctprob.la
 libctools_la_LDFLAGS = -version-info $(CTOOLS_LT_VERSION) @OPENMP_LIB_LDFLAGS@
 # Distribute scripts
 #############################################################################
-# Makefile.am for ctmodel tool                                              #
+# Makefile.am for ctprob tool                                              #
 # ------------------------------------------------------------------------- #
 # Copyright (C) 2016 Juergen Knoedlseder                                    #
 # ------------------------------------------------------------------------- #
@@ -23,25 +23,25 @@
 INCLUDES = -I$(top_srcdir)/src/support
 # Program name
-bin_PROGRAMS = ctmodel
+bin_PROGRAMS = ctprob
 # Sources
-sources = ctmodel.cpp ctmodel.hpp
+sources = ctprob.cpp ctprob.hpp
 # Libtool library
-noinst_LTLIBRARIES = libctmodel.la
-libctmodel_la_SOURCES = $(sources)
-libctmodel_la_LDFLAGS = @OPENMP_LIB_LDFLAGS@
+noinst_LTLIBRARIES = libctprob.la
+libctprob_la_SOURCES = $(sources)
+libctprob_la_LDFLAGS = @OPENMP_LIB_LDFLAGS@
 # Program definition
-ctmodel_SOURCES = main.cpp
-ctmodel_LDFLAGS = $(LIB_LINK_OPTION) @LDFLAGS@
-ctmodel_CPPFLAGS = @CPPFLAGS@
-ctmodel_LDADD = libctmodel.la $(top_builddir)/src/support/libsupport.la
+ctprob_SOURCES = main.cpp
+ctprob_LDFLAGS = $(LIB_LINK_OPTION) @LDFLAGS@
+ctprob_CPPFLAGS = @CPPFLAGS@
+ctprob_LDADD = libctprob.la $(top_builddir)/src/support/libsupport.la
 # Parameter files
 pfilesdir = $(prefix)/syspfiles
-pfiles_DATA = $(srcdir)/ctmodel.par
+pfiles_DATA = $(srcdir)/ctprob.par
 # Extra files to be distributed in the tar file
 EXTRA_DIST = $(pfiles_DATA)
 /***************************************************************************
- *                  ctmodel - Model cube generation tool                   *
+ *           ctprob - Computes probability for a given model               *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2012-2016 by Juergen Knoedlseder                         *
+ *  copyright (C) 2012-2016 by Leonardo Di Venere                          *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -19,9 +19,9 @@
  *                                                                         *
  ***************************************************************************/
 /**
- * @file ctmodel.cpp
- * @brief Model cube generation tool implementation
- * @author Juergen Knoedlseder
+ * @file ctprob.cpp
+ * @brief Computes probability for a given model
+ * @author Leonardo Di Venere
  */
 /* __ Includes ___________________________________________________________ */
@@ -29,12 +29,12 @@
 #include <config.h>
 #endif
 #include <cstdio>
-#include "ctmodel.hpp"
+#include "ctprob.hpp"
 #include "GTools.hpp"
 /* __ Method name definitions ____________________________________________ */
-#define G_GET_PARAMETERS                          "ctmodel::get_parameters()"
-#define G_FILL_CUBE                    "ctmodel::fill_cube(GCTAObservation*)"
+#define G_GET_PARAMETERS                          "ctprob::get_parameters()"
+#define G_FILL_CUBE                    "ctprob::fill_cube(GCTAObservation*)"
 /* __ Debug definitions __________________________________________________ */
@@ -53,7 +53,7 @@ const GEnergy g_energy_margin(1.0e-12, &quot;TeV&quot;);
 /***********************************************************************//**
  * @brief Void constructor
  ***************************************************************************/
-ctmodel::ctmodel(void) : ctobservation(CTMODEL_NAME, CTMODEL_VERSION)
+ctprob::ctprob(void) : ctobservation(CTPROB_NAME, CTPROB_VERSION)
 {
     // Initialise members
     init_members();
@@ -71,8 +71,8 @@ ctmodel::ctmodel(void) : ctobservation(CTMODEL_NAME, CTMODEL_VERSION)
  * This method creates an instance of the class by copying an existing
  * observations container.
  ***************************************************************************/
-ctmodel::ctmodel(const GObservations& obs) :
-         ctobservation(CTMODEL_NAME, CTMODEL_VERSION, obs)
+ctprob::ctprob(const GObservations& obs) :
+         ctobservation(CTPROB_NAME, CTPROB_VERSION, obs)
 {
     // Initialise members
     init_members();
@@ -89,8 +89,8 @@ ctmodel::ctmodel(const GObservations&amp; obs) :
  * @param[in] argc Number of arguments in command line.
  * @param[in] argv Array of command line arguments.
  ***************************************************************************/
-ctmodel::ctmodel(int argc, char *argv[]) :
-         ctobservation(CTMODEL_NAME, CTMODEL_VERSION, argc, argv)
+ctprob::ctprob(int argc, char *argv[]) :
+         ctobservation(CTPROB_NAME, CTPROB_VERSION, argc, argv)
 {
     // Initialise members
     init_members();
@@ -105,7 +105,7 @@ ctmodel::ctmodel(int argc, char *argv[]) :
  *
  * @param[in] app Application.
  ***************************************************************************/
-ctmodel::ctmodel(const ctmodel& app) : ctobservation(app)
+ctprob::ctprob(const ctprob& app) : ctobservation(app)
 {
     // Initialise members
     init_members();
@@ -121,7 +121,7 @@ ctmodel::ctmodel(const ctmodel&amp; app) : ctobservation(app)
 /***********************************************************************//**
  * @brief Destructor
  ***************************************************************************/
-ctmodel::~ctmodel(void)
+ctprob::~ctprob(void)
 {
     // Free members
     free_members();
@@ -143,7 +143,7 @@ ctmodel::~ctmodel(void)
  * @param[in] app Application.
  * @return Application.
  ***************************************************************************/
-ctmodel& ctmodel::operator=(const ctmodel& app)
+ctprob& ctprob::operator=(const ctprob& app)
 {
     // Execute only if object is not identical
     if (this != &app) {
@@ -174,11 +174,11 @@ ctmodel&amp; ctmodel::operator=(const ctmodel&amp; app)
  ==========================================================================*/
 /***********************************************************************//**
- * @brief Clear ctmodel tool
+ * @brief Clear ctprob tool
  *
- * Clears ctmodel tool.
+ * Clears ctprob tool.
  ***************************************************************************/
-void ctmodel::clear(void)
+void ctprob::clear(void)
 {
     // Free members
     free_members();
@@ -208,7 +208,7 @@ void ctmodel::clear(void)
  * observation container, loops over all CTA observations in the container
  * and generates a model map for each CTA observation.
  ***************************************************************************/
-void ctmodel::run(void)
+void ctprob::run(void)
 {
     // If we're in debug mode then all output is also dumped on the screen
     if (logDebug()) {
@@ -296,7 +296,7 @@ void ctmodel::run(void)
  * Saves the model cube into a FITS file specified using the "outfile"
  * task parameter.
  ***************************************************************************/
-void ctmodel::save(void)
+void ctprob::save(void)
 {
     // Write header
     log_header1(TERSE, "Save model cube");
@@ -326,7 +326,7 @@ void ctmodel::save(void)
  *
  * @param[in] name Model cube name.
  ***************************************************************************/
-void ctmodel::publish(const std::string& name)
+void ctprob::publish(const std::string& name)
 {
     // Write header into logger
     log_header1(TERSE, "Publish model cube");
@@ -334,7 +334,7 @@ void ctmodel::publish(const std::string&amp; name)
     // Set default name is user name is empty
     std::string user_name(name);
     if (user_name.empty()) {
-        user_name = CTMODEL_NAME;
+        user_name = CTPROB_NAME;
     }
     // Log filename
@@ -355,7 +355,7 @@ void ctmodel::publish(const std::string&amp; name)
  *
  * Set model cube and set all cube bins to zero.
  ***************************************************************************/
-void ctmodel::cube(const GCTAEventCube& cube)
+void ctprob::cube(const GCTAEventCube& cube)
 {
     // Set cube
     m_cube = cube;
@@ -382,7 +382,7 @@ void ctmodel::cube(const GCTAEventCube&amp; cube)
 /***********************************************************************//**
  * @brief Initialise class members
  ***************************************************************************/
-void ctmodel::init_members(void)
+void ctprob::init_members(void)
 {
     // Initialise members
     m_outcube.clear();
@@ -407,7 +407,7 @@ void ctmodel::init_members(void)
  *
  * @param[in] app Application.
  ***************************************************************************/
-void ctmodel::copy_members(const ctmodel& app)
+void ctprob::copy_members(const ctprob& app)
 {
     // Copy attributes
     m_outcube     = app.m_outcube;
@@ -430,7 +430,7 @@ void ctmodel::copy_members(const ctmodel&amp; app)
 /***********************************************************************//**
  * @brief Delete class members
  ***************************************************************************/
-void ctmodel::free_members(void)
+void ctprob::free_members(void)
 {
     // Return
     return;
@@ -443,7 +443,7 @@ void ctmodel::free_members(void)
  * Get all task parameters from parameter file or (if required) by querying
  * the user. The parameters are read in the correct order.
  ***************************************************************************/
-void ctmodel::get_parameters(void)
+void ctprob::get_parameters(void)
 {
     // Reset cube append flag
     m_append_cube = false;
@@ -598,7 +598,7 @@ void ctmodel::get_parameters(void)
  *
  * @todo Support stacked energy dispersion
  ***************************************************************************/
-void ctmodel::get_obs(void)
+void ctprob::get_obs(void)
 {
     // Get the filename from the input parameters
     std::string filename = (*this)["inobs"].filename();
@@ -723,7 +723,7 @@ void ctmodel::get_obs(void)
  * GTI of the model cube so that cube GTI is a list of the GTIs of all
  * observations that were used to generate the model cube.
  ***************************************************************************/
-void ctmodel::fill_cube(const GCTAObservation* obs)
+void ctprob::fill_cube(const GCTAObservation* obs)
 {
     // Get references to GTI and energy boundaries for the event list
     const GGti&     gti         = obs->events()->gti();
 /***************************************************************************
- *                  ctmodel - Model cube generation tool                   *
+ *           ctprob - Computes probability for a given model               *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2012-2016 by Juergen Knoedlseder                         *
+ *  copyright (C) 2012-2016 by Leonardo Di Venere                          *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -19,11 +19,12 @@
  *                                                                         *
  ***************************************************************************/
 /**
- * @file ctmodel.hpp
- * @brief Model cube generation tool definition
- * @author Juergen Knoedlseder
+ * @file ctprob.hpp
+ * @brief Computes probability for a given model
+ * @author Leonardo Di Venere
  */
+
 #ifndef CTMODEL_HPP
 #define CTMODEL_HPP
@@ -4,13 +4,13 @@
 #                                                                           #
 # ------------------------------------------------------------------------- #
 #                                                                           #
-#  File:      ctmodel.par                                                   #
+#  File:      ctprob.par                                                    #
 #                                                                           #
-#  Author:    Juergen Knoedlseder                                           #
-#             Jurgen.Knodlseder@irap.omp.eu                                 #
-#             IRAP                                                          #
+#  Author:    Leonardo Di Venere                                            #
+#             leonardo.divenere@ba.infn.it                                  #
+#             INFN                                	                    #
 #                                                                           #
-#  Purpose:   Parameter file for the ctmodel application                    #
+#  Purpose:   Parameter file for the ctprob application                     #
 #                                                                           #
 #############################################################################
 #
@@ -67,4 +67,4 @@ chatter, i, h, 2,0,4, &quot;Chattiness of output&quot;
 clobber, b, h, yes,,, "Overwrite existing output files with new output files?"
 debug,   b, h, no,,, "Debugging mode activated"
 mode,    s, h, "ql",,, "Mode of automatic parameters"
-logfile, f, h, "ctmodel.log",,, "Log filename"
+logfile, f, h, "ctprob.log",,, "Log filename"
 /***************************************************************************
- *                     ctmodel - CTA counts model tool                     *
+ *           ctprob - Computes probability for a given model               *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2012-2016 by Juergen Knoedlseder                         *
+ *  copyright (C) 2012-2016 by Leonardo Di Venere                          *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -19,9 +19,9 @@
  *                                                                         *
  ***************************************************************************/
 /**
- * @file ctmodel/main.cpp
- * @brief CTA counts model tool main code
- * @author Juergen Knoedlseder
+ * @file main.cpp
+ * @brief Computes probability for a given model
+ * @author Leonardo Di Venere
  */
 /* __ Includes ___________________________________________________________ */