Skip to content

Commit e933ef7

Browse files
ferdymercuryguitargeek
ferdymercury
authored and
guitargeek
committed
[RF] rename CINT to Cling
1 parent 28e600a commit e933ef7

File tree

6 files changed

+31
-31
lines changed

6 files changed

+31
-31
lines changed

‎roofit/roofitcore/inc/RooAbsData.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ class RooAbsData : public TNamed, public RooPrintable {
176176

177177
virtual RooPlot* plotOn(RooPlot* frame, const RooLinkedList& cmdList) const ;
178178

179-
// WVE --- This needs to be public to avoid CINT problems
179+
// WVE --- This needs to be public to avoid Cling problems
180180
struct PlotOpt {
181181
const char* cuts = "";
182182
Option_t* drawOptions = "P";

‎roofit/roofitcore/inc/RooFactoryWSTool.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ class RooFactoryWSTool : public TNamed, public RooPrintable {
8282
std::vector<std::string> splitFunctionArgs(const char* funcExpr) ;
8383

8484

85-
// --- Internal stuff that must be public so that CINT can access it ---
85+
// --- Internal stuff that must be public so that Cling can access it ---
8686

87-
// CINT constructor interface
87+
// Cling constructor interface
8888
static RooAbsArg& as_ARG(UInt_t idx) { checkIndex(idx) ; return of()->of()->asARG(of()->_args[idx].c_str()) ; }
8989

9090
static RooAbsPdf& as_PDF(UInt_t idx) { checkIndex(idx) ; return of()->asPDF(of()->_args[idx].c_str()) ; }
@@ -178,7 +178,7 @@ class RooFactoryWSTool : public TNamed, public RooPrintable {
178178

179179
TClass* resolveClassName(const char* className) ;
180180

181-
// CINT constructor interface back end
181+
// Cling constructor interface back end
182182
static RooFactoryWSTool* of() ;
183183
static RooFactoryWSTool* _of ;
184184
std::vector<std::string> _args ;

‎roofit/roofitcore/inc/RooWorkspace.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,8 @@ class RooWorkspace : public TNamed {
271271

272272
std::unique_ptr<RooFactoryWSTool> _factory; ///<! Factory tool associated with workspace
273273

274-
bool _doExport; ///<! Export contents of workspace to CINT?
275-
std::string _exportNSName; ///<! Name of CINT namespace to which contents are exported
274+
bool _doExport; ///<! Export contents of workspace to Cling?
275+
std::string _exportNSName; ///<! Name of Cling namespace to which contents are exported
276276

277277
bool _openTrans = false; ///<! Is there a transaction open?
278278
RooArgSet _sandboxNodes; ///<! Sandbox for incoming objects in a transaction

‎roofit/roofitcore/src/RooFactoryWSTool.cxx‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ RooAbsArg* RooFactoryWSTool::createArg(const char* className, const char* objNam
320320
}
321321
_args.push_back(tmp.substr(start_tok, end_tok));
322322

323-
// Try CINT interface
323+
// Try Cling interface
324324
pair<list<string>,unsigned int> ca = ctorArgs(className,_args.size()+2) ;
325325
if (ca.first.empty()) {
326326
coutE(ObjectHandling) << "RooFactoryWSTool::createArg() ERROR no suitable constructor found for class " << className << std::endl ;
@@ -343,10 +343,10 @@ RooAbsArg* RooFactoryWSTool::createArg(const char* className, const char* objNam
343343
return nullptr ;
344344
}
345345

346-
// Now construct CINT constructor spec, start with mandatory name and title args
346+
// Now construct Cling constructor spec, start with mandatory name and title args
347347
string cintExpr(Form("new %s(\"%s\",\"%s\"",className,objName,objName)) ;
348348

349-
// Install argument in static data member to be accessed below through static CINT interface functions
349+
// Install argument in static data member to be accessed below through static Cling interface functions
350350
_of = this ;
351351

352352

@@ -452,7 +452,7 @@ RooAbsArg* RooFactoryWSTool::createArg(const char* className, const char* objNam
452452

453453
cxcoutD(ObjectHandling) << "RooFactoryWSTool::createArg() Construct expression is " << cintExpr << std::endl ;
454454

455-
// Call CINT to perform constructor call. Catch any error thrown by argument conversion method
455+
// Call Cling to perform constructor call. Catch any error thrown by argument conversion method
456456
if (std::unique_ptr<RooAbsArg> arg{reinterpret_cast<RooAbsArg*>(gROOT->ProcessLineFast(cintExpr.c_str()))}) {
457457
if (string(className)=="RooGenericPdf") {
458458
arg->setStringAttribute("factory_tag",Form("EXPR::%s(%s)",objName,varList)) ;
@@ -465,7 +465,7 @@ RooAbsArg* RooFactoryWSTool::createArg(const char* className, const char* objNam
465465
RooAbsArg* ret = _ws->arg(objName) ;
466466
return ret ;
467467
} else {
468-
coutE(ObjectHandling) << "RooFactoryWSTool::createArg() ERROR in CINT constructor call to create object" << std::endl ;
468+
coutE(ObjectHandling) << "RooFactoryWSTool::createArg() ERROR in Cling constructor call to create object" << std::endl ;
469469
logError() ;
470470
return nullptr ;
471471
}
@@ -1508,7 +1508,7 @@ void RooFactoryWSTool::checkIndex(UInt_t idx)
15081508

15091509

15101510
////////////////////////////////////////////////////////////////////////////////
1511-
/// CINT constructor interface, return constructor string argument `#idx` as RooAbsArg reference found in workspace
1511+
/// Cling constructor interface, return constructor string argument `#idx` as RooAbsArg reference found in workspace
15121512

15131513
RooAbsArg& RooFactoryWSTool::asARG(const char* arg)
15141514
{
@@ -1528,7 +1528,7 @@ RooAbsArg& RooFactoryWSTool::asARG(const char* arg)
15281528

15291529

15301530
////////////////////////////////////////////////////////////////////////////////
1531-
/// CINT constructor interface, return constructor string argument `#idx` as RooAbsReal reference found in workspace
1531+
/// Cling constructor interface, return constructor string argument `#idx` as RooAbsReal reference found in workspace
15321532

15331533
RooAbsReal& RooFactoryWSTool::asFUNC(const char* arg)
15341534
{
@@ -1551,7 +1551,7 @@ RooAbsReal& RooFactoryWSTool::asFUNC(const char* arg)
15511551

15521552

15531553
////////////////////////////////////////////////////////////////////////////////
1554-
/// CINT constructor interface, return constructor string argument `#idx` as RooAbsRealLValue reference found in workspace
1554+
/// Cling constructor interface, return constructor string argument `#idx` as RooAbsRealLValue reference found in workspace
15551555

15561556
RooAbsRealLValue& RooFactoryWSTool::asVARLV(const char* arg)
15571557
{
@@ -1574,7 +1574,7 @@ RooAbsRealLValue& RooFactoryWSTool::asVARLV(const char* arg)
15741574

15751575

15761576
////////////////////////////////////////////////////////////////////////////////
1577-
/// CINT constructor interface, return constructor string argument `#idx` as RooRealVar reference found in workspace
1577+
/// Cling constructor interface, return constructor string argument `#idx` as RooRealVar reference found in workspace
15781578

15791579
RooRealVar& RooFactoryWSTool::asVAR(const char* arg)
15801580
{
@@ -1589,7 +1589,7 @@ RooRealVar& RooFactoryWSTool::asVAR(const char* arg)
15891589

15901590

15911591
////////////////////////////////////////////////////////////////////////////////
1592-
/// CINT constructor interface, return constructor string argument `#idx` as RooAbsPdf reference found in workspace
1592+
/// Cling constructor interface, return constructor string argument `#idx` as RooAbsPdf reference found in workspace
15931593

15941594
RooAbsPdf& RooFactoryWSTool::asPDF(const char* arg)
15951595
{
@@ -1604,7 +1604,7 @@ RooAbsPdf& RooFactoryWSTool::asPDF(const char* arg)
16041604

16051605

16061606
////////////////////////////////////////////////////////////////////////////////
1607-
/// CINT constructor interface, return constructor string argument `#idx` as RooResolutionModel reference found in workspace
1607+
/// Cling constructor interface, return constructor string argument `#idx` as RooResolutionModel reference found in workspace
16081608

16091609
RooResolutionModel& RooFactoryWSTool::asRMODEL(const char* arg)
16101610
{
@@ -1623,7 +1623,7 @@ RooResolutionModel& RooFactoryWSTool::asRMODEL(const char* arg)
16231623

16241624

16251625
////////////////////////////////////////////////////////////////////////////////
1626-
/// CINT constructor interface, return constructor string argument `#idx` as RooAbsCategory reference found in workspace
1626+
/// Cling constructor interface, return constructor string argument `#idx` as RooAbsCategory reference found in workspace
16271627

16281628
RooAbsCategory& RooFactoryWSTool::asCATFUNC(const char* arg)
16291629
{
@@ -1641,7 +1641,7 @@ RooAbsCategory& RooFactoryWSTool::asCATFUNC(const char* arg)
16411641

16421642

16431643
////////////////////////////////////////////////////////////////////////////////
1644-
/// CINT constructor interface, return constructor string argument `#idx` as RooAbsCategoryLValue reference found in workspace
1644+
/// Cling constructor interface, return constructor string argument `#idx` as RooAbsCategoryLValue reference found in workspace
16451645

16461646
RooAbsCategoryLValue& RooFactoryWSTool::asCATLV(const char* arg)
16471647
{
@@ -1660,7 +1660,7 @@ RooAbsCategoryLValue& RooFactoryWSTool::asCATLV(const char* arg)
16601660

16611661

16621662
////////////////////////////////////////////////////////////////////////////////
1663-
/// CINT constructor interface, return constructor string argument `#idx` as RooCategory reference found in workspace
1663+
/// Cling constructor interface, return constructor string argument `#idx` as RooCategory reference found in workspace
16641664

16651665
RooCategory& RooFactoryWSTool::asCAT(const char* arg)
16661666
{
@@ -1676,7 +1676,7 @@ RooCategory& RooFactoryWSTool::asCAT(const char* arg)
16761676

16771677

16781678
////////////////////////////////////////////////////////////////////////////////
1679-
/// CINT constructor interface, return constructor string argument `#idx` as RooArgSet of objects found in workspace
1679+
/// Cling constructor interface, return constructor string argument `#idx` as RooArgSet of objects found in workspace
16801680

16811681
RooArgSet RooFactoryWSTool::asSET(const char* arg)
16821682
{
@@ -1725,7 +1725,7 @@ RooArgSet RooFactoryWSTool::asSET(const char* arg)
17251725

17261726

17271727
////////////////////////////////////////////////////////////////////////////////
1728-
/// CINT constructor interface, return constructor string argument `#idx` as RooArgList of objects found in workspace
1728+
/// Cling constructor interface, return constructor string argument `#idx` as RooArgList of objects found in workspace
17291729

17301730
RooArgList RooFactoryWSTool::asLIST(const char* arg)
17311731
{
@@ -1761,7 +1761,7 @@ RooArgList RooFactoryWSTool::asLIST(const char* arg)
17611761

17621762

17631763
////////////////////////////////////////////////////////////////////////////////
1764-
/// CINT constructor interface, return constructor string argument `#idx` as RooAbsData object found in workspace
1764+
/// Cling constructor interface, return constructor string argument `#idx` as RooAbsData object found in workspace
17651765

17661766
RooAbsData& RooFactoryWSTool::asDATA(const char* arg)
17671767
{
@@ -1775,7 +1775,7 @@ RooAbsData& RooFactoryWSTool::asDATA(const char* arg)
17751775

17761776

17771777
////////////////////////////////////////////////////////////////////////////////
1778-
/// CINT constructor interface, return constructor string argument `#idx` as RooDataHist object found in workspace
1778+
/// Cling constructor interface, return constructor string argument `#idx` as RooDataHist object found in workspace
17791779

17801780
RooDataHist& RooFactoryWSTool::asDHIST(const char* arg)
17811781
{
@@ -1792,7 +1792,7 @@ RooDataHist& RooFactoryWSTool::asDHIST(const char* arg)
17921792

17931793

17941794
////////////////////////////////////////////////////////////////////////////////
1795-
/// CINT constructor interface, return constructor string argument `#idx` as RooDataSet object found in workspace
1795+
/// Cling constructor interface, return constructor string argument `#idx` as RooDataSet object found in workspace
17961796

17971797
RooDataSet& RooFactoryWSTool::asDSET(const char* arg)
17981798
{
@@ -1823,7 +1823,7 @@ TObject& RooFactoryWSTool::asOBJ(const char* arg)
18231823

18241824

18251825
////////////////////////////////////////////////////////////////////////////////
1826-
/// CINT constructor interface, return constructor string argument `#idx` as const char*
1826+
/// Cling constructor interface, return constructor string argument `#idx` as const char*
18271827

18281828
const char* RooFactoryWSTool::asSTRING(const char* arg)
18291829
{
@@ -1853,7 +1853,7 @@ const char* RooFactoryWSTool::asSTRING(const char* arg)
18531853

18541854

18551855
////////////////////////////////////////////////////////////////////////////////
1856-
/// CINT constructor interface, return constructor string argument `#idx` as Int_t
1856+
/// Cling constructor interface, return constructor string argument `#idx` as Int_t
18571857

18581858
Int_t RooFactoryWSTool::asINT(const char* arg)
18591859
{
@@ -1862,7 +1862,7 @@ Int_t RooFactoryWSTool::asINT(const char* arg)
18621862

18631863

18641864
////////////////////////////////////////////////////////////////////////////////
1865-
/// CINT constructor interface, return constructor string argument `#idx` as double
1865+
/// Cling constructor interface, return constructor string argument `#idx` as double
18661866

18671867
double RooFactoryWSTool::asDOUBLE(const char* arg)
18681868
{

‎roofit/roofitcore/src/RooProduct.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Represents the product of a given set of RooAbsReal objects.
3737

3838
class RooProduct::ProdMap : public std::vector<std::pair<RooArgSet*,RooArgList*> > {} ;
3939

40-
// Namespace with helper functions that have STL stuff that we don't want to expose to CINT
40+
// Namespace with helper functions that have STL stuff that we don't want to expose to Cling
4141
namespace {
4242
typedef RooProduct::ProdMap::iterator RPPMIter ;
4343
std::pair<RPPMIter,RPPMIter> findOverlap2nd(RPPMIter i, RPPMIter end) ;

‎roofit/roofitcore/src/RooWorkspace.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ RooWorkspace::RooWorkspace(const char* name, const char* title) :
178178

179179
////////////////////////////////////////////////////////////////////////////////
180180
/// Construct empty workspace with given name and option to export reference to
181-
/// all workspace contents to a CINT namespace with the same name.
181+
/// all workspace contents to a Cling namespace with the same name.
182182

183183
RooWorkspace::RooWorkspace(const char* name, bool /*doCINTExport*/) :
184184
TNamed(name,name), _classes(this)
@@ -1075,7 +1075,7 @@ bool RooWorkspace::commitTransaction()
10751075
return false ;
10761076
}
10771077

1078-
// Publish sandbox nodes in directory and/or CINT if requested
1078+
// Publish sandbox nodes in directory and/or Cling if requested
10791079
for(RooAbsArg* sarg : _sandboxNodes) {
10801080
if (_dir && sarg->IsA() != RooConstVar::Class()) {
10811081
_dir->InternalAppend(sarg) ;

0 commit comments

Comments
 (0)