Skip to content

[RF] Several improvements to RooClassFactory #13624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
guitargeek merged 4 commits into from
Sep 11, 2023
Merged

[RF] Several improvements to RooClassFactory #13624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9a4ee37
[RF] Reduce code duplication in RooClassFactory
guitargeek Sep 5, 2023
6519742
[RF] Support expressions with complex numbers in RooClassFactory
guitargeek Sep 7, 2023
eeef70f
[RF] Use `std::string` instead of C-style strings in RooClassFactory
guitargeek Sep 7, 2023
ee72f8a
[RF] Don't recompile when requesting the same class instance twice
guitargeek Sep 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 30 additions & 20 deletions roofit/roofitcore/inc/RooClassFactory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* listed in LICENSE (http://roofit.sourceforge.net/license.txt) *
*****************************************************************************/

#ifndef ROO_CODE_FACTORY
#define ROO_CODE_FACTORY
#ifndef RooFit_RooClassFactory_h
#define RooFit_RooClassFactory_h

#include <string>

Expand All @@ -27,23 +27,33 @@ class RooArgList;
class RooClassFactory {

public:

static RooAbsReal* makeFunctionInstance(const char* className, const char* name, const char* expression, const RooArgList& vars, const char* intExpression=nullptr) ;
static RooAbsReal* makeFunctionInstance(const char* name, const char* expression, const RooArgList& vars, const char* intExpression=nullptr) ;

static RooAbsPdf* makePdfInstance(const char* className, const char* name, const char* expression, const RooArgList& vars, const char* intExpression=nullptr) ;
static RooAbsPdf* makePdfInstance(const char* name, const char* expression, const RooArgList& vars, const char* intExpression=nullptr) ;

static bool makeAndCompilePdf(const char* name, const char* expression, const RooArgList& vars, const char* intExpression=nullptr) ;
static bool makeAndCompileFunction(const char* name, const char* expression, const RooArgList& args, const char* intExpression=nullptr) ;

static bool makePdf(const char* name, const char* realArgNames=nullptr, const char* catArgNames=nullptr,
const char* expression="1.0", bool hasAnaInt=false, bool hasIntGen=false, const char* intExpression=nullptr) ;
static bool makeFunction(const char* name, const char* realArgNames=nullptr, const char* catArgNames=nullptr,
const char* expression="1.0", bool hasAnaInt=false, const char* intExpression=nullptr) ;
static bool makeClass(std::string const& baseName, const std::string& className, const char* realArgNames=nullptr, const char* catArgNames=nullptr,
const char* expression="1.0", bool hasAnaInt=false, bool hasIntGen=false, const char* intExpression=nullptr) ;

} ;
static RooAbsReal *makeFunctionInstance(std::string const &className, std::string const &name,
std::string const &expression, const RooArgList &vars,
std::string const &intExpression = "");
static RooAbsReal *makeFunctionInstance(std::string const &name, std::string const &expression,
const RooArgList &vars, std::string const &intExpression = "");

static RooAbsPdf *makePdfInstance(std::string const &className, std::string const &name,
std::string const &expression, const RooArgList &vars,
std::string const &intExpression = "");
static RooAbsPdf *makePdfInstance(std::string const &name, std::string const &expression, const RooArgList &vars,
std::string const &intExpression = "");

static bool makeAndCompilePdf(std::string const &name, std::string const &expression, const RooArgList &vars,
std::string const &intExpression = "");
static bool makeAndCompileFunction(std::string const &name, std::string const &expression, const RooArgList &args,
std::string const &intExpression = "");

static bool makePdf(std::string const &name, std::string const &realArgNames = "",
std::string const &catArgNames = "", std::string const &expression = "1.0",
bool hasAnaInt = false, bool hasIntGen = false, std::string const &intExpression = "");
static bool makeFunction(std::string const &name, std::string const &realArgNames = "",
std::string const &catArgNames = "", std::string const &expression = "1.0",
bool hasAnaInt = false, std::string const &intExpression = "");
static bool makeClass(std::string const &baseName, const std::string &className,
std::string const &realArgNames = "", std::string const &catArgNames = "",
std::string const &expression = "1.0", bool hasAnaInt = false, bool hasIntGen = false,
std::string const &intExpression = "");
};

#endif
Loading