Skip to content

Fix copy of TF1Convolution and TF1NormSum #4138

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
lmoneta merged 2 commits into from
Aug 1, 2019
Merged

Fix copy of TF1Convolution and TF1NormSum #4138

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fee5fae
Fix a bug in Copy of Tf1Convolution when created with compiled TF1 ob…
lmoneta Jul 31, 2019
d43674c
Fix same bug in copy constructor for TF1NormSum. Support in this case…
lmoneta Jul 31, 2019
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
Next Next commit
Fix a bug in Copy of Tf1Convolution when created with compiled TF1 ob… 
…jects. One needs to use TF1::Copy instead of TF1::Clone when copying the contained objects
  • Loading branch information
@lmoneta
lmoneta committed Jul 31, 2019
commit fee5faedd0dbc98f043534d9bb15ae2851c4f6b9
44 changes: 26 additions & 18 deletions hist/hist/src/TF1Convolution.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,23 +43,23 @@ ClassImp(TF1Convolution);

class TF1Convolution_EvalWrapper
{
std::unique_ptr<TF1> fFunction1;
std::unique_ptr<TF1> fFunction2;
TF1 * fFunc1;
TF1 * fFunc2;
Double_t fT0;

public:
TF1Convolution_EvalWrapper(std::unique_ptr<TF1> &f1, std::unique_ptr<TF1> &f2, Double_t t) : fT0(t)
{
fFunction1 = std::unique_ptr<TF1>((TF1 *)f1->Clone());
fFunction2 = std::unique_ptr<TF1>((TF1 *)f2->Clone());
}
TF1Convolution_EvalWrapper(TF1 &f1, TF1 &f2, Double_t t) :
fFunc1(&f1),
fFunc2(&f2),
fT0(t)
{}
Double_t operator()(Double_t x) const
{
// use EvalPar that is faster
Double_t xx[2];
xx[0] = x;
xx[1] = fT0-x;
return fFunction1->EvalPar(xx,nullptr) * fFunction2->EvalPar(xx+1,nullptr);
return fFunc1->EvalPar(xx,nullptr) * fFunc2->EvalPar(xx+1,nullptr);
}
};

Expand All @@ -69,14 +69,20 @@ class TF1Convolution_EvalWrapper
void TF1Convolution::InitializeDataMembers(TF1* function1, TF1* function2, Bool_t useFFT)
{
if (function1) {
TF1 * fnew1 = (TF1*) function1->IsA()->New();
function1->Copy(*fnew1);
fFunction1 = std::unique_ptr<TF1>(fnew1);
// functions must be 1d- if not flag an error
if (function1->GetNdim() != 1)
Error("InitializeDataMembers","function1 %s is not of dimension 1 ",function1->GetName());
//TF1 * fnew1 = (TF1*) function1->IsA()->New();
// since function1 is a TF1 (cannot be a derived class) we can instantiate it directly
fFunction1 = std::unique_ptr<TF1> (new TF1());
function1->Copy(*fFunction1);
}
if (function2) {
TF1 * fnew2 = (TF1*) function2->IsA()->New();
function2->Copy(*fnew2);
fFunction2 = std::unique_ptr<TF1>(fnew2);
if (function2->GetNdim() != 1)
Error("InitializeDataMembers","function2 %s is not of dimension 1 ",function2->GetName());
//TF1 * fnew2 = (TF1*) function2->IsA()->New();
fFunction2 = std::unique_ptr<TF1>(new TF1());
function2->Copy(*fFunction2);
}
if (fFunction1.get() == nullptr|| fFunction2.get() == nullptr)
Fatal("InitializeDataMembers","Invalid functions - Abort");
Expand Down Expand Up @@ -330,7 +336,7 @@ Double_t TF1Convolution::EvalFFTConv(Double_t t)

Double_t TF1Convolution::EvalNumConv(Double_t t)
{
TF1Convolution_EvalWrapper fconv( fFunction1, fFunction2, t);
TF1Convolution_EvalWrapper fconv( *fFunction1, *fFunction2, t);
Double_t result = 0;

ROOT::Math::IntegratorOneDim integrator(fconv, ROOT::Math::IntegratorOneDimOptions::DefaultIntegratorType(), 1e-9, 1e-9);
Expand Down Expand Up @@ -480,8 +486,10 @@ void TF1Convolution::Copy(TObject &obj) const
((TF1Convolution &)obj).fParams2 = fParams2;
((TF1Convolution &)obj).fParNames = fParNames;

// Clone unique_ptr's
((TF1Convolution &)obj).fFunction1 = std::unique_ptr<TF1>((TF1 *)fFunction1->Clone());
((TF1Convolution &)obj).fFunction2 = std::unique_ptr<TF1>((TF1 *)fFunction2->Clone());
// we need to copy the content of the unique_ptr's
((TF1Convolution &)obj).fFunction1 = std::unique_ptr<TF1>((TF1 *)new TF1() );
((TF1Convolution &)obj).fFunction2 = std::unique_ptr<TF1>((TF1 *)new TF1() );
fFunction1->Copy(*(((TF1Convolution &)obj).fFunction1 ) );
fFunction2->Copy(*(((TF1Convolution &)obj).fFunction2 ) );
// fGraphConv is transient anyway, so we don't bother to copy it
}