Skip to content

[RF] Remove deprecated RooFit parts that are marked for removal in 6.30 #11952

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 1 commit into from
Dec 21, 2022
Merged

[RF] Remove deprecated RooFit parts that are marked for removal in 6.30 #11952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions roofit/roofitcore/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,6 @@ ROOT_STANDARD_LIBRARY_PACKAGE(RooFitCore
RooBinWidthFunction.h
RooFitLegacy/RooCatTypeLegacy.h
RooFitLegacy/RooCategorySharedProperties.h
RooFitLegacy/RooMinuit.h
RooFitLegacy/RooTreeData.h
RooFit/TestStatistics/LikelihoodGradientWrapper.h
RooFit/TestStatistics/LikelihoodWrapper.h
Expand Down Expand Up @@ -452,7 +451,6 @@ ROOT_STANDARD_LIBRARY_PACKAGE(RooFitCore
src/RooBinSamplingPdf.cxx
src/RooBinWidthFunction.cxx
src/RooFitLegacy/RooCatTypeLegacy.cxx
src/RooFitLegacy/RooMinuit.cxx
src/RunContext.cxx
src/TestStatistics/ConstantTermsOptimizer.cxx
src/TestStatistics/LikelihoodGradientWrapper.cxx
Expand Down
9 changes: 1 addition & 8 deletions roofit/roofitcore/inc/RooAbsData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
#include "RooFit/UniqueId.h"
#include "RooFit/Detail/DataMap.h"

#include <ROOT/RConfig.hxx> // R__DEPRECATED
#include "TNamed.h"

#include <map>
Expand Down Expand Up @@ -216,17 +215,11 @@ class RooAbsData : public TNamed, public RooPrintable {
const RooCmdArg& arg3=RooCmdArg::none(), const RooCmdArg& arg4=RooCmdArg::none(),
const RooCmdArg& arg5=RooCmdArg::none(), const RooCmdArg& arg6=RooCmdArg::none(),
const RooCmdArg& arg7=RooCmdArg::none(), const RooCmdArg& arg8=RooCmdArg::none()) const ;
// Developer note: the `binArgX` parameter has no default `none` value,
// because then the signature would be ambiguous with the deprecated bin
// integer overload below. When the deprecated overload is removed, a default
// value must be set (tutorial failures will remind us to do that).
TH1 *createHistogram(const char* varNameList,
const RooCmdArg& binArgX, const RooCmdArg& binArgY=RooCmdArg::none(),
const RooCmdArg& binArgX=RooCmdArg::none(), const RooCmdArg& binArgY=RooCmdArg::none(),
const RooCmdArg& binArgZ=RooCmdArg::none()) const;
/// Create and fill a ROOT histogram TH1,TH2 or TH3 with the values of this dataset.
TH1 *createHistogram(const char *name, const RooAbsRealLValue& xvar, const RooLinkedList& argList) const ;
TH1 *createHistogram(const char* varNameList, Int_t xbins=0, Int_t ybins=0, Int_t zbins=0) const
R__DEPRECATED(6, 30, "Use the overload of RooAbsData::createHistogram that takes RooFit command arguments.");
TH2F* createHistogram(const RooAbsRealLValue& var1, const RooAbsRealLValue& var2, const char* cuts="",
const char *name= "hist") const;
TH2F* createHistogram(const RooAbsRealLValue& var1, const RooAbsRealLValue& var2, int nx, int ny,
Expand Down
158 changes: 0 additions & 158 deletions roofit/roofitcore/inc/RooFitLegacy/RooMinuit.h
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion roofit/roofitcore/inc/RooFitResult.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@ class RooFitResult : public TNamed, public RooPrintable, public RooDirItem {
protected:

friend class RooAbsPdf ;
friend class RooMinuit ;
friend class RooMinimizer ;
void setCovarianceMatrix(TMatrixDSym& V) ;
void setConstParList(const RooArgList& list) ;
Expand Down
5 changes: 0 additions & 5 deletions roofit/roofitcore/inc/RooMinuit.h
View file
Open in desktop

This file was deleted.

74 changes: 0 additions & 74 deletions roofit/roofitcore/src/RooAbsData.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,80 +608,6 @@ RooPlot* RooAbsData::plotOn(RooPlot* frame, const RooCmdArg& arg1, const RooCmdA
return plotOn(frame,l) ;
}

////////////////////////////////////////////////////////////////////////////////
/// Create and fill a ROOT histogram TH1,TH2 or TH3 with the values of this dataset for the variables with given names
/// The range of each observable that is histogrammed is always automatically calculated from the distribution in
/// the dataset. The number of bins can be controlled using the [xyz]bins parameters. For a greater degree of control
/// use the createHistogram() method below with named arguments
///
/// The caller takes ownership of the returned histogram
///
/// \deprecated This function is deprecated and will be removed in ROOT v6.30.
/// Use the overload
/// RooAbsData::createHistogram(const char*, const RooCmdArg&, const RooCmdArg&, const RooCmdArg&)
/// that takes RooFit command arguments.

TH1 *RooAbsData::createHistogram(const char* varNameList, Int_t xbins, Int_t ybins, Int_t zbins) const
{
coutW(DataHandling) << "'RooAbsData::createHistogram' is deprecated and will be removed in ROOT v6.30: "
<< "Use the overload of 'RooAbsData::createHistogram' that takes RooFit command arguments."
<< std::endl;

// Parse list of variable names
const auto varNames = ROOT::Split(varNameList, ",:");
RooLinkedList argList;
RooRealVar* vars[3] = {nullptr, nullptr, nullptr};

for (unsigned int i = 0; i < varNames.size(); ++i) {
if (i >= 3) {
coutW(InputArguments) << "RooAbsData::createHistogram(" << GetName() << "): Can only create 3-dimensional histograms. Variable "
<< i << " " << varNames[i] << " unused." << std::endl;
continue;
}

vars[i] = static_cast<RooRealVar*>( get()->find(varNames[i].data()) );
if (!vars[i]) {
coutE(InputArguments) << "RooAbsData::createHistogram(" << GetName() << ") ERROR: dataset does not contain an observable named " << varNames[i] << std::endl;
return nullptr;
}
}

if (!vars[0]) {
coutE(InputArguments) << "RooAbsData::createHistogram(" << GetName() << "): No variable to be histogrammed in list '" << varNameList << "'" << std::endl;
return nullptr;
}

if (xbins<=0 || !vars[0]->hasMax() || !vars[0]->hasMin() ) {
argList.Add(RooFit::AutoBinning(xbins==0?vars[0]->numBins():abs(xbins)).Clone()) ;
} else {
argList.Add(RooFit::Binning(xbins).Clone()) ;
}

if (vars[1]) {
if (ybins<=0 || !vars[1]->hasMax() || !vars[1]->hasMin() ) {
argList.Add(RooFit::YVar(*vars[1],RooFit::AutoBinning(ybins==0?vars[1]->numBins():abs(ybins))).Clone()) ;
} else {
argList.Add(RooFit::YVar(*vars[1],RooFit::Binning(ybins)).Clone()) ;
}
}
if (vars[2]) {
if (zbins<=0 || !vars[2]->hasMax() || !vars[2]->hasMin() ) {
argList.Add(RooFit::ZVar(*vars[2],RooFit::AutoBinning(zbins==0?vars[2]->numBins():abs(zbins))).Clone()) ;
} else {
argList.Add(RooFit::ZVar(*vars[2],RooFit::Binning(zbins)).Clone()) ;
}
}


// Call implementation function
TH1* result = createHistogram(GetName(), *vars[0], argList);

// Delete temporary list of RooCmdArgs
argList.Delete() ;

return result ;
}


TH1 *RooAbsData::createHistogram(const char *name, const RooAbsRealLValue& xvar,
const RooCmdArg& arg1, const RooCmdArg& arg2, const RooCmdArg& arg3, const RooCmdArg& arg4,
Expand Down
Loading