Skip to content
Snippets Groups Projects
Verified Commit 69745ff4 authored by Tadej Novak's avatar Tadej Novak
Browse files

Backport some ISF_FastCaloSimEvent fixes from master

parent 21735050
No related branches found
No related tags found
No related merge requests found
/*
Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef ISF_FASTCALOSIMEVENT_TFCS1DFunctionHistogram_h
......@@ -33,13 +33,13 @@ class TFCS1DFunctionHistogram:public TFCS1DFunction
double sample_from_histo(TH1* hist, double);
double sample_from_histovalues(double);
vector<float> get_HistoBorders() {return m_HistoBorders;};
vector<float> get_HistoContents() {return m_HistoContents;};
std::vector<float> get_HistoBorders() {return m_HistoBorders;};
std::vector<float> get_HistoContents() {return m_HistoContents;};
protected:
vector<float> m_HistoBorders;
vector<float> m_HistoContents;
std::vector<float> m_HistoBorders;
std::vector<float> m_HistoContents;
ClassDef(TFCS1DFunctionHistogram,1) //TFCS1DFunctionHistogram
......
/*
Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef ISF_FASTCALOSIMEVENT_TFCS1DFunctionRegression_h
......@@ -10,7 +10,6 @@
#include "TH1.h"
#include <vector>
using namespace std;
class TFCS1DFunctionRegression:public TFCS1DFunction
{
......@@ -22,13 +21,13 @@ class TFCS1DFunctionRegression:public TFCS1DFunction
using TFCS1DFunction::rnd_to_fct;
virtual double rnd_to_fct(double rnd) const;
double regression_value(double uniform) const;
void set_weights(vector<vector<double> > fWeightMatrix0to1, vector<vector<double> > fWeightMatrix1to2);
void set_weights(std::vector<std::vector<double> > fWeightMatrix0to1, std::vector<std::vector<double> > fWeightMatrix1to2);
double sigmoid(double) const;
private:
vector<vector<double> > m_fWeightMatrix0to1;
vector<vector<double> > m_fWeightMatrix1to2;
std::vector<std::vector<double> > m_fWeightMatrix0to1;
std::vector<std::vector<double> > m_fWeightMatrix1to2;
ClassDef(TFCS1DFunctionRegression,1) //TFCS1DFunctionRegression
......
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef ISF_FASTCALOSIMEVENT_TFCS1DFunctionRegressionTF_h
......@@ -23,8 +23,8 @@ class TFCS1DFunctionRegressionTF:public TFCS1DFunctionRegression
private:
vector<vector<double> > m_fWeightMatrix0to1;
vector<vector<double> > m_fWeightMatrix1to2;
std::vector<std::vector<double> > m_fWeightMatrix0to1;
std::vector<std::vector<double> > m_fWeightMatrix1to2;
float m_rangeval;
float m_startval;
......
/*
Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
using namespace std;
#include "ISF_FastCaloSimEvent/TFCS1DFunctionHistogram.h"
#include "TMath.h"
#include "TFile.h"
#include <iostream>
using namespace std;
//=============================================
//======= TFCS1DFunctionHistogram =========
......
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
using namespace std;
#include "ISF_FastCaloSimEvent/TFCS1DFunctionRegressionTF.h"
#include "TFile.h"
#include "TString.h"
#include "TMath.h"
using namespace std;
//=============================================
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment