Commit e15ac061 authored by Florian Goth's avatar Florian Goth
Browse files

Fix compilation

parent 4e61455a
......@@ -5,8 +5,9 @@
#include <valarray>
#include <cmath>
# include "errordata.h"
# include "analysis_common.h"
#include "errordata.h"
#include "analysis_common.h"
#include "analysis_functions.h"
namespace mc_analysis
{
......@@ -44,7 +45,7 @@ namespace mc_analysis
inline void rebin_data(unsigned int binsize__ = 1);
inline void fractional_rebinning(unsigned int num_bins__);
inline void print_data(void);
inline void clear(void);
inline void clear_tmp(void);
template <typename Func>
inline errordata<typename Func::res_t> jack_eval(Func& f);
......@@ -74,7 +75,7 @@ namespace mc_analysis
This function strips the observable class of all its content. It is intended for use in memory-sparse situations.
*/
template <typename S, class Cont>
void Scalar_Observable<S, Cont>::clear(void)
void Scalar_Observable<S, Cont>::clear_tmp(void)
{
data.resize(1);
num_bins = 0;
......@@ -124,7 +125,7 @@ namespace mc_analysis
void Scalar_Observable<S, Cont>::rebin_data(unsigned int binsize__)
/**
* \brief This function has to be called before using the data analysis functions. Rebinning is mandatory
* as it fills the data vector. The original data remains intact in the data_orig vector
* as it fills the data vector. The original data remains intact in the underlying container
* \param binsize__ Specifies, how many data points should be averaged to give a new bin
*/
{
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment