From 9462371444c04b7e61d5dc885acbed190b2728af Mon Sep 17 00:00:00 2001 From: ferdymercury Date: Fri, 19 Dec 2025 09:39:07 +0100 Subject: [PATCH 1/4] [hist] rename CINT to Cling todos --- hist/hist/inc/TF1.h | 2 +- hist/hist/inc/THn.h | 12 ++++++------ hist/hist/inc/THnSparse.h | 15 ++++++--------- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/hist/hist/inc/TF1.h b/hist/hist/inc/TF1.h index e1e6a774ee9d2..8bacc9bb2fe3f 100644 --- a/hist/hist/inc/TF1.h +++ b/hist/hist/inc/TF1.h @@ -341,7 +341,7 @@ class TF1 : public TNamed, public TAttLine, public TAttFill, public TAttMarker { /// The class name is not needed when using compile code, while it is required when using /// interpreted code via the specialized constructor with void *. /// An instance of the C++ function class or its pointer can both be used. The former is recommended when using - /// C++ compiled code, but if CINT-compatibility is needed, then a pointer to the function class must be used. + /// C++ compiled code, but for historical CINT-compatibility needs, a pointer to the function class had be supported, too. /// xmin and xmax specify the plotting range, npar is the number of parameters. /// See the tutorial math/exampleFunctor.C for an example of using this constructor template diff --git a/hist/hist/inc/THn.h b/hist/hist/inc/THn.h index 6f0a3f41a4d5c..338d2e746622c 100644 --- a/hist/hist/inc/THn.h +++ b/hist/hist/inc/THn.h @@ -93,7 +93,7 @@ class THn: public THnBase { } /// Forwards to THnBase::SetBinContent(). - /// Non-virtual, CINT-compatible replacement of a using declaration. + /// Non-virtual, CINT-compatible replacement of a using declaration. @todo recheck with Cling void SetBinContent(const Int_t* idx, Double_t v) { THnBase::SetBinContent(idx, v); } @@ -105,7 +105,7 @@ class THn: public THnBase { fSumw2.At(bin) = e2; } /// Forwards to THnBase::SetBinContent(). - /// Non-virtual, CINT-compatible replacement of a using declaration. + /// Non-virtual, CINT-compatible replacement of a using declaration. @todo recheck with Cling void AddBinContent(const Int_t* idx, Double_t v = 1.) { THnBase::AddBinContent(idx, v); } @@ -116,7 +116,7 @@ class THn: public THnBase { fSumw2.At(bin) += e2; } /// Forwards to THnBase::GetBinContent() overload. - /// Non-virtual, CINT-compatible replacement of a using declaration. + /// Non-virtual, CINT-compatible replacement of a using declaration. @todo recheck with Cling Double_t GetBinContent(const Int_t *idx) const { return THnBase::GetBinContent(idx); } @@ -143,20 +143,20 @@ class THn: public THnBase { void Sumw2() override; /// Forwards to THnBase::Projection(). - /// Non-virtual, as a CINT-compatible replacement of a using declaration. + /// Non-virtual, as a CINT-compatible replacement of a using declaration. @todo recheck with Cling TH1D* Projection(Int_t xDim, Option_t* option = "") const { return THnBase::Projection(xDim, option); } /// Forwards to THnBase::Projection(). - /// Non-virtual, as a CINT-compatible replacement of a using declaration. + /// Non-virtual, as a CINT-compatible replacement of a using declaration. @todo recheck with Cling TH2D* Projection(Int_t yDim, Int_t xDim, Option_t* option = "") const { return THnBase::Projection(yDim, xDim, option); } /// Forwards to THnBase::Projection(). - /// Non-virtual, as a CINT-compatible replacement of a using declaration. + /// Non-virtual, as a CINT-compatible replacement of a using declaration. @todo recheck with Cling TH3D* Projection(Int_t xDim, Int_t yDim, Int_t zDim, Option_t* option = "") const { return THnBase::Projection(xDim, yDim, zDim, option); diff --git a/hist/hist/inc/THnSparse.h b/hist/hist/inc/THnSparse.h index 6260ff1dcccde..a48574fe6f356 100644 --- a/hist/hist/inc/THnSparse.h +++ b/hist/hist/inc/THnSparse.h @@ -110,7 +110,7 @@ class THnSparse: public THnBase { Long64_t GetBin(const char* name[], Bool_t allocate = kTRUE) override; /// Forwards to THnBase::SetBinContent(). - /// Non-virtual, CINT-compatible replacement of a using declaration. + /// Non-virtual, CINT-compatible replacement of a using declaration. @todo recheck with Cling void SetBinContent(const Int_t* idx, Double_t v) { THnBase::SetBinContent(idx, v); } @@ -118,7 +118,7 @@ class THnSparse: public THnBase { void SetBinError2(Long64_t bin, Double_t e2) override; /// Forwards to THnBase::AddBinContent(). - /// Non-virtual, CINT-compatible replacement of a using declaration. + /// Non-virtual, CINT-compatible replacement of a using declaration. @todo recheck with Cling void AddBinContent(const Int_t* idx, Double_t v = 1.) { THnBase::AddBinContent(idx, v); } @@ -126,7 +126,7 @@ class THnSparse: public THnBase { void AddBinError2(Long64_t bin, Double_t e2) override; /// Forwards to THnBase::GetBinContent() overload. - /// Non-virtual, CINT-compatible replacement of a using declaration. + /// Non-virtual, CINT-compatible replacement of a using declaration. @todo recheck with Cling Double_t GetBinContent(const Int_t *idx) const { return THnBase::GetBinContent(idx); @@ -138,23 +138,20 @@ class THnSparse: public THnBase { Double_t GetSparseFractionMem() const; /// Forwards to THnBase::Projection(). - /// Non-virtual, as a CINT-compatible replacement of a using - /// declaration. + /// Non-virtual, as a CINT-compatible replacement of a using declaration. @todo recheck with Cling TH1D* Projection(Int_t xDim, Option_t* option = "") const{ return THnBase::Projection(xDim, option); } /// Forwards to THnBase::Projection(). - /// Non-virtual, as a CINT-compatible replacement of a using - /// declaration. + /// Non-virtual, as a CINT-compatible replacement of a using declaration. @todo recheck with Cling TH2D* Projection(Int_t yDim, Int_t xDim, Option_t* option = "") const { return THnBase::Projection(yDim, xDim, option); } /// Forwards to THnBase::Projection(). - /// Non-virtual, as a CINT-compatible replacement of a using - /// declaration. + /// Non-virtual, as a CINT-compatible replacement of a using declaration. @todo recheck with Cling TH3D* Projection(Int_t xDim, Int_t yDim, Int_t zDim, Option_t* option = "") const { return THnBase::Projection(xDim, yDim, zDim, option); From a6d336db1e51b79d11c078e305af1b092724bb76 Mon Sep 17 00:00:00 2001 From: ferdymercury Date: Fri, 19 Dec 2025 09:39:21 +0100 Subject: [PATCH 2/4] [bindings] rename CINT to Cling todos --- .../cppyy/cppyy-backend/clingwrapper/src/clingwrapper.cxx | 2 +- bindings/tpython/src/TPyReturn.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bindings/pyroot/cppyy/cppyy-backend/clingwrapper/src/clingwrapper.cxx b/bindings/pyroot/cppyy/cppyy-backend/clingwrapper/src/clingwrapper.cxx index 820556f9fa739..7d8bb23a5fc75 100644 --- a/bindings/pyroot/cppyy/cppyy-backend/clingwrapper/src/clingwrapper.cxx +++ b/bindings/pyroot/cppyy/cppyy-backend/clingwrapper/src/clingwrapper.cxx @@ -2417,7 +2417,7 @@ intptr_t Cppyy::GetDatamemberOffset(TCppScope_t scope, TCppIndex_t idata) if (m->Property() & kIsStatic) { if (strchr(cr->GetName(), '<')) gInterpreter->ProcessLine(((std::string)cr->GetName()+"::"+m->GetName()+";").c_str()); - offset = (intptr_t)m->GetOffsetCint(); // yes, Cling (GetOffset() is both wrong + offset = (intptr_t)m->GetOffsetCint(); // yes, Cling GetOffset() is both wrong (TODO: rename to GetOffsetCling?) // and caches that wrong result! if (offset == (intptr_t)-1) return (intptr_t)gInterpreter->ProcessLine((std::string("&")+cr->GetName()+"::"+m->GetName()+";").c_str()); diff --git a/bindings/tpython/src/TPyReturn.cxx b/bindings/tpython/src/TPyReturn.cxx index a569a669cbb85..a79fc761226f0 100644 --- a/bindings/tpython/src/TPyReturn.cxx +++ b/bindings/tpython/src/TPyReturn.cxx @@ -201,7 +201,7 @@ TPyReturn::operator Double_t() const //////////////////////////////////////////////////////////////////////////////// /// Cast python return value to ROOT object with dictionary (may fail; note that -/// you have to use the void* converter, as CINT will not call any other). +/// you have to use the void* converter, as Cling will not call any other). TPyReturn::operator void *() const { From 85ac9e292e1f66613f2c507214ba7ef52fb743cb Mon Sep 17 00:00:00 2001 From: ferdymercury Date: Fri, 19 Dec 2025 09:56:36 +0100 Subject: [PATCH 3/4] [test] rename CINT to Cling --- test/MainEvent.cxx | 4 +- test/Readme.md | 4 +- test/RootIDE/TGRootIDE.cxx | 265 ++++++++++++++++++------------------- test/histviewer/README | 2 +- test/stress.cxx | 8 +- test/stressGeometry.cxx | 2 +- test/stressMathCore.cxx | 6 +- test/stressMathMore.cxx | 1 - test/stressShapes.cxx | 2 +- 9 files changed, 142 insertions(+), 152 deletions(-) diff --git a/test/MainEvent.cxx b/test/MainEvent.cxx index df81d67020222..9559157a8c037 100644 --- a/test/MainEvent.cxx +++ b/test/MainEvent.cxx @@ -72,8 +72,8 @@ // - Event.h event class description // - Event.C event class implementation // - MainEvent.C the main program to demo this class might be used (this file) -// - EventCint.C the CINT dictionary for the event and Track classes -// this file is automatically generated by rootcint (see Makefile), +// - EventCint.C the Cling dictionary for the event and Track classes +// this file is automatically generated by rootcling (see Makefile), // when the class definition in Event.h is modified. // // ---Analyzing the Event.root file with the interactive root diff --git a/test/Readme.md b/test/Readme.md index 60b846c7ca167..caca84ba76294 100644 --- a/test/Readme.md +++ b/test/Readme.md @@ -12,8 +12,8 @@ MainEvent.cxx - Simple test program that creates a ROOT Tree object and histograms. This program uses the files Event.cxx, EventCint.cxx and Event.h. An example of a procedure to link this program is in bind_Event. Note that the Makefile - invokes the rootcint utility to generate the CINT interface - EventCint.cxx. + invokes the rootcling utility to generate the interface + EventCint.cxx (ROOT dictionary). Event.cxx - Implementation for classes Event and Track. diff --git a/test/RootIDE/TGRootIDE.cxx b/test/RootIDE/TGRootIDE.cxx index 9b648396cd62e..74aacf535f8a8 100644 --- a/test/RootIDE/TGRootIDE.cxx +++ b/test/RootIDE/TGRootIDE.cxx @@ -9,144 +9,135 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -////////////////////////////////////////////////////////////////////////// -// // -// TGRootIDE // -// // -// A simple IDE editor that uses the TGTextEdit widget. // -// It provides all functionalities of TGTextEdit as copy, paste, cut, // -// search, go to a given line number. In addition, it provides the // -// possibilities for compiling, executing or interrupting a running // -// macro. // -// // -// This class can be used in following ways: // -// - with file name as argument: // -// new TGRootIDE("hsimple.C"); // -// - with a TMacro* as argument: // -// TMacro *macro = new TMacro("hsimple.C"); // -// new TGRootIDE(macro); // -// // -// Basic Features: // -// // -// New Document // -// // -// To create a new blank document, select File menu / New, or click // -// the New toolbar button. It will create a new instance of // -// TGRootIDE. // -// // -// Open/Save File // -// // -// To open a file, select File menu / Open or click on the Open // -// toolbar button. This will bring up the standard File Dialog for // -// opening files. // -// If the current document has not been saved yet, you will be asked // -// either to save or abandon the changes. // -// To save the file using the same name, select File menu / Save or // -// the toolbar Save button. To change the file name use File menu / // -// Save As... or corresponding SaveAs button on the toolbar. // -// // -// Text Selection // -// // -// You can move the cursor by simply clicking on the desired location // -// with the left mouse button. To highlight some text, press the mouse // -// and drag the mouse while holding the left button pressed. // -// To select a word, double-click on it; // -// to select the text line - triple-click on it; // -// to select all do quadruple-click. // -// // -// Cut, Copy, Paste // -// // -// After selecting some text, you can cut or copy it to the clipboard. // -// A subsequent paste operation will insert the contents of the // -// clipboard at the current cursor location. // -// // -// Text Search // -// // -// The editor uses a standard Search dialog. You can specify a forward // -// or backward search direction starting from the current cursor // -// location according to the selection made of a case sensitive mode // -// or not. The last search can be repeated by pressing F3. // -// // -// Text Font // -// // -// You can change the text font by selecting Edit menu / Set Font. // -// The Font Dialog pops up and shows the Name, Style, and Size of any // -// available font. The selected font sample is shown in the preview // -// area. // -// // -// Executing Macros // -// // -// You can execute the currently loaded macro in the editor by // -// selecting Tools menu / Execute Macro; by clicking on the // -// corresponding toolbar button, or by using Ctrl+F5 accelerator keys. // -// This is identical to the command ".x macro.C" in the root prompt // -// command line. // -// // -// Compiling Macros // -// // -// The currently loaded macro can be compiled with ACLiC if you select // -// Tools menu / Compile Macro; by clicking on the corresponding // -// toolbar button, or by using Ctrl+F7 accelerator keys. // -// This is identical to the command ".L macro.C++" in the root prompt // -// command line. // -// // -// Interrupting a Running Macro // -// // -// You can interrupt a running macro by selecting the Tools menu / // -// Interrupt; by clicking on the corresponding toolbar button, or by // -// using Shift+F5 accelerator keys. // -// // -// Interface to CINT Interpreter // -// // -// Any command entered in the Command combo box will be passed to // -// the CINT interpreter. This combo box will keep the commands history // -// and will allow you to re-execute the same commands during an editor // -// session. // -// // -// Keyboard Bindings // -// // -// The following table lists the keyboard shortcuts and accelerator // -// keys. // -// // -// Key: Action: // -// ==== ======= // -// // -// Up Move cursor up. // -// Shift+Up Move cursor up and extend selection. // -// Down Move cursor down. // -// Shift+Down Move cursor down and extend selection. // -// Left Move cursor left. // -// Shift+Left Move cursor left and extend selection. // -// Right Move cursor right. // -// Shift+Right Move cursor right and extend selection. // -// Home Move cursor to begin of line. // -// Shift+Home Move cursor to begin of line and extend selection.// -// Ctrl+Home Move cursor to top of page. // -// End Move cursor to end of line. // -// Shift+End Move cursor to end of line and extend selection. // -// Ctrl+End Move cursor to end of page. // -// PgUp Move cursor up one page. // -// Shift+PgUp Move cursor up one page and extend selection. // -// PgDn Move cursor down one page. // -// Shift+PgDn Move cursor down one page and extend selection. // -// Delete Delete character after cursor, or text selection. // -// BackSpace Delete character before cursor, or text selection.// -// Ctrl+B Move cursor left. // -// Ctrl+D Delete character after cursor, or text selection. // -// Ctrl+E Move cursor to end of line. // -// Ctrl+H Delete character before cursor, or text selection.// -// Ctrl+K Delete characters from current position to the // -// end of line. // -// Ctrl+U Delete current line. // -// // -//Begin_Html -/* - +/** + \class TGRootIDE + + A simple IDE editor that uses the TGTextEdit widget. + It provides all functionalities of TGTextEdit as copy, paste, cut, + search, go to a given line number. In addition, it provides the + possibilities for compiling, executing or interrupting a running + macro. + + This class can be used in following ways: + - with file name as argument: + new TGRootIDE("hsimple.C"); + - with a TMacro* as argument: + TMacro *macro = new TMacro("hsimple.C"); + new TGRootIDE(macro); + + Basic Features: + + New Document + + To create a new blank document, select File menu / New, or click + the New toolbar button. It will create a new instance of + TGRootIDE. + + Open/Save File + + To open a file, select File menu / Open or click on the Open + toolbar button. This will bring up the standard File Dialog for + opening files. + If the current document has not been saved yet, you will be asked + either to save or abandon the changes. + To save the file using the same name, select File menu / Save or + the toolbar Save button. To change the file name use File menu / + Save As... or corresponding SaveAs button on the toolbar. + + Text Selection + + You can move the cursor by simply clicking on the desired location + with the left mouse button. To highlight some text, press the mouse + and drag the mouse while holding the left button pressed. + To select a word, double-click on it; + to select the text line - triple-click on it; + to select all do quadruple-click. + + Cut, Copy, Paste + + After selecting some text, you can cut or copy it to the clipboard. + A subsequent paste operation will insert the contents of the + clipboard at the current cursor location. + + Text Search + + The editor uses a standard Search dialog. You can specify a forward + or backward search direction starting from the current cursor + location according to the selection made of a case sensitive mode + or not. The last search can be repeated by pressing F3. + + Text Font + + You can change the text font by selecting Edit menu / Set Font. + The Font Dialog pops up and shows the Name, Style, and Size of any + available font. The selected font sample is shown in the preview + area. + + Executing Macros + + You can execute the currently loaded macro in the editor by + selecting Tools menu / Execute Macro; by clicking on the + corresponding toolbar button, or by using Ctrl+F5 accelerator keys. + This is identical to the command ".x macro.C" in the root prompt + command line. + + Compiling Macros + + The currently loaded macro can be compiled with ACLiC if you select + Tools menu / Compile Macro; by clicking on the corresponding + toolbar button, or by using Ctrl+F7 accelerator keys. + This is identical to the command ".L macro.C++" in the root prompt + command line. + + Interrupting a Running Macro + + You can interrupt a running macro by selecting the Tools menu / + Interrupt; by clicking on the corresponding toolbar button, or by + using Shift+F5 accelerator keys. + + Interface to Cling Interpreter + + Any command entered in the Command combo box will be passed to + the Cling interpreter. This combo box will keep the commands history + and will allow you to re-execute the same commands during an editor + session. + + Keyboard Bindings + + The following table lists the keyboard shortcuts and accelerator + keys. + + Key: Action: + ==== ======= + + Up Move cursor up. + Shift+Up Move cursor up and extend selection. + Down Move cursor down. + Shift+Down Move cursor down and extend selection. + Left Move cursor left. + Shift+Left Move cursor left and extend selection. + Right Move cursor right. + Shift+Right Move cursor right and extend selection. + Home Move cursor to begin of line. + Shift+Home Move cursor to begin of line and extend selection. + Ctrl+Home Move cursor to top of page. + End Move cursor to end of line. + Shift+End Move cursor to end of line and extend selection. + Ctrl+End Move cursor to end of page. + PgUp Move cursor up one page. + Shift+PgUp Move cursor up one page and extend selection. + PgDn Move cursor down one page. + Shift+PgDn Move cursor down one page and extend selection. + Delete Delete character after cursor, or text selection. + BackSpace Delete character before cursor, or text selection. + Ctrl+B Move cursor left. + Ctrl+D Delete character after cursor, or text selection. + Ctrl+E Move cursor to end of line. + Ctrl+H Delete character before cursor, or text selection. + Ctrl+K Delete characters from current position to the + end of line. + Ctrl+U Delete current line. */ -//End_Html -// // -////////////////////////////////////////////////////////////////////////// - #include "TROOT.h" #include "TApplication.h" diff --git a/test/histviewer/README b/test/histviewer/README index b70e55823d854..e45e67fd74cae 100644 --- a/test/histviewer/README +++ b/test/histviewer/README @@ -21,7 +21,7 @@ from the last beam test in GSI (December 1998), then LinkDef.h -necessary for the ROOT CINT and finally +necessary for the ROOT Cling and finally rootlogon.C diff --git a/test/stress.cxx b/test/stress.cxx index 8741a54de4b43..b966e959c5f60 100644 --- a/test/stress.cxx +++ b/test/stress.cxx @@ -55,7 +55,7 @@ // Test 13 : Test merging files of a chain......................... OK // Test 14 : Check correct rebuilt of Event.root in test 13........ OK // Test 15 : Divert Tree branches to separate files................ OK -// Test 16 : CINT test (3 nested loops) with LHCb trigger.......... OK +// Test 16 : Cling test (3 nested loops) with LHCb trigger......... OK // Test 17 : Test mkdir............................................ OK // ****************************************************************** //* Linux pcbrun.cern.ch 2.4.20 #1 Thu Jan 9 12:21:02 MET 2003 @@ -272,7 +272,7 @@ void Bprint(Int_t id, const char *title) ///One function "f1form" will be computed by the TFormula class ///The second function "f1int" will be /// - compiled when running in batch mode -/// - interpreted by CINT when running in interactive mode +/// - interpreted by Cling when running in interactive mode void stress1() { @@ -323,7 +323,7 @@ void stress1() Double_t rint = TMath::Abs(f1form->Integral(-8,6) - 1923.74578); //Some slight differences are authorized to take into account - //different math libraries used by the compiler, CINT and TFormula + //different math libraries used by the compiler, Cling and TFormula Bool_t OK = kTRUE; if (hdiff > 0.1 || pdifftot > 2.e-3 || rint > 10) OK = kFALSE; if (OK) printf("OK\n"); @@ -1493,7 +1493,7 @@ void stress16() // A canvas with subpads containing the results is sent to Postscript. // We check graphics results by counting the number of lines in the ps file. - Bprint(16,"CINT test (3 nested loops) with LHCb trigger"); + Bprint(16,"Cling test (3 nested loops) with LHCb trigger"); const int nbuf = 153; // buffer size const int nlev = 4; // number of trigger levels diff --git a/test/stressGeometry.cxx b/test/stressGeometry.cxx index 253bc8574e974..772098d927196 100644 --- a/test/stressGeometry.cxx +++ b/test/stressGeometry.cxx @@ -21,7 +21,7 @@ // // The ReadRef case is also used as a benchmark // The ROOTMARKS reported are relative to a Linux/P IV 2.8 GHz gcc3.2.3 machine -// normalized at 800 ROOTMARKS when running with CINT. +// normalized at 800 ROOTMARKS when running with historical CINT. // // To run this script, do // stressGeometry diff --git a/test/stressMathCore.cxx b/test/stressMathCore.cxx index ccc417e5bff50..49b3da1be9cb9 100644 --- a/test/stressMathCore.cxx +++ b/test/stressMathCore.cxx @@ -10,7 +10,7 @@ // pdf, cdf and quantiles. cdf are estimated directly and compared with calculated integral from pdf // - physics vectors (2D, 3D and 4D) including I/O for every type and for both double and Double32_t // - SMatrix and SVectors including I/O for double and Double32_t types -// - I/O of complex objects which dictionary has been generated using CINT (default) or Reflex +// - I/O of complex objects which dictionary has been generated using rootcling (default) or Reflex // TrackD and TrackD32 which contain physics vectors of double and Double32_t // TrackErrD and TrackErrD32 which contain physics vectors and an SMatrix of double and Double32_t // VecTrackD which contains an std::vector @@ -30,7 +30,7 @@ // > ./stressMathMore // // to run inside ROOT using ACliC -// for using CINT you need first to have the library libTrackMathCoreDict.so +// for using Cling you need first to have the library libTrackMathCoreDict.so // (type: make libTrackMathCoreDict.so to make it) // // root> gSystem->Load("libMathCore"); @@ -1482,7 +1482,7 @@ int testCompositeObj(int ngen) { std::cout << "\tTest of a Composite Object (containing Vector's and Matrices)\n"; std::cout <<"******************************************************************************\n"; - std::cout << "Test Using CINT library\n\n"; + std::cout << "Test Using Cling library\n\n"; // put path relative to LD_LIBRARY_PATH diff --git a/test/stressMathMore.cxx b/test/stressMathMore.cxx index fc12092c47ea9..ae01e1195b1c7 100644 --- a/test/stressMathMore.cxx +++ b/test/stressMathMore.cxx @@ -108,7 +108,6 @@ int compare( std::string name, double v1, double v2, double scale = 2.0) { } // typedef for a free function like gamma(double x, double a, double b) -// (dont have blank spaces between for not confusing CINT parser) typedef double (*FreeFunc3)(double, double, double ); typedef double (*FreeFunc4)(double, double, double, double ); diff --git a/test/stressShapes.cxx b/test/stressShapes.cxx index a46c75e5d30b1..607a3774a88f1 100644 --- a/test/stressShapes.cxx +++ b/test/stressShapes.cxx @@ -34,7 +34,7 @@ int main(int argc, char **argv) // // This test program is automatically created by $ROOTSYS/test/Makefile. // To run it in batch, execute stressGeom. -// To run this test with interactive CINT, do +// To run this test with interactive interpreter, do // root > .x stressShapes.cxx++ // or // root > .x stressShapes.cxx From e926c0dfbaf0b241836acbb465bc9afa89093d1f Mon Sep 17 00:00:00 2001 From: ferdymercury Date: Fri, 19 Dec 2025 10:11:11 +0100 Subject: [PATCH 4/4] [tutorials] rename CINT with Cling --- tutorials/analysis/unfold/testUnfold5c.C | 8 ++++---- tutorials/hist/hist105_TExec_dynamic_slice.py | 2 +- tutorials/legacy/cont/TListAndSTL.C | 2 +- tutorials/legacy/net/fastMergeServer.C | 2 +- tutorials/legacy/net/parallelMergeServer.C | 2 +- tutorials/legacy/net/treeClient.C | 2 +- tutorials/visualisation/eve/geom_alias.C | 4 +--- tutorials/visualisation/eve/geom_alice_its.C | 2 +- tutorials/visualisation/eve/geom_atlas.C | 4 +--- tutorials/visualisation/eve/geom_cms.C | 4 +--- tutorials/visualisation/eve/geom_cms_stereo.C | 4 +--- tutorials/visualisation/eve/geom_lhcb.C | 4 +--- tutorials/visualisation/gui/guiWithCLING.C | 8 ++++---- tutorials/visualisation/gui/guitest.C | 18 ------------------ 14 files changed, 19 insertions(+), 47 deletions(-) diff --git a/tutorials/analysis/unfold/testUnfold5c.C b/tutorials/analysis/unfold/testUnfold5c.C index 13b657b624997..d2d4352047eee 100644 --- a/tutorials/analysis/unfold/testUnfold5c.C +++ b/tutorials/analysis/unfold/testUnfold5c.C @@ -64,7 +64,7 @@ // uncomment this to read the binning schemes from the root file // by default the binning is read from the XML file -// #define READ_BINNING_CINT +// #define READ_BINNING_TFILE #include @@ -73,7 +73,7 @@ #include #include #include -#ifndef READ_BINNING_CINT +#ifndef READ_BINNING_TFILE #include #include #include "TUnfoldBinningXML.h" @@ -98,7 +98,7 @@ void testUnfold5c() // Step 2: read binning from XML // and save them to output file -#ifdef READ_BINNING_CINT +#ifdef READ_BINNING_TFILE TFile *binningSchemes=new TFile("testUnfold5_binning.root"); #endif @@ -107,7 +107,7 @@ void testUnfold5c() outputFile->cd(); // read binning schemes in XML format -#ifndef READ_BINNING_CINT +#ifndef READ_BINNING_TFILE TDOMParser parser; Int_t error=parser.ParseFile("testUnfold5binning.xml"); if(error) cout<<"error="<ReadInt(clientId); mess->ReadTString(filename); - mess->ReadLong64(length); // '*mess >> length;' is broken in CINT for Long64_t. + mess->ReadLong64(length); // '*mess >> length;' was broken in CINT for Long64_t. TODO: recheck with Cling Info("fastMergeServer","Receive input from client %d for %s",clientId,filename.Data()); diff --git a/tutorials/legacy/net/parallelMergeServer.C b/tutorials/legacy/net/parallelMergeServer.C index 702841d827a7d..fd95fc356dd28 100644 --- a/tutorials/legacy/net/parallelMergeServer.C +++ b/tutorials/legacy/net/parallelMergeServer.C @@ -406,7 +406,7 @@ void parallelMergeServer(bool cache = false) { Int_t clientId; mess->ReadInt(clientId); mess->ReadTString(filename); - mess->ReadLong64(length); // '*mess >> length;' is broken in CINT for Long64_t. + mess->ReadLong64(length); // '*mess >> length;' was broken in CINT for Long64_t. TODO: recheck with Cling // Info("fastMergeServerHist","Received input from client %d for %s",clientId,filename.Data()); diff --git a/tutorials/legacy/net/treeClient.C b/tutorials/legacy/net/treeClient.C index 5282f976e00ab..b72e8a33f055c 100644 --- a/tutorials/legacy/net/treeClient.C +++ b/tutorials/legacy/net/treeClient.C @@ -93,7 +93,7 @@ void treeClient(Bool_t evol=kFALSE) mess.Reset(kMESS_ANY); // re-use TMessage object mess.WriteInt(idx); mess.WriteTString(file->GetName()); - mess.WriteLong64(file->GetEND()); // 'mess << file->GetEND();' is broken in CINT for Long64_t + mess.WriteLong64(file->GetEND()); // 'mess << file->GetEND();' was broken in CINT for Long64_t file->CopyTo(mess); sock->Send(mess); // send message messlen += mess.Length(); diff --git a/tutorials/visualisation/eve/geom_alias.C b/tutorials/visualisation/eve/geom_alias.C index 3dc6a759e016f..454c062cd3d93 100644 --- a/tutorials/visualisation/eve/geom_alias.C +++ b/tutorials/visualisation/eve/geom_alias.C @@ -28,10 +28,8 @@ void geom_alias() gEve->FullRedraw3D(kTRUE); - // EClipType not exported to CINT (see TGLUtil.h): - // 0 - no clip, 1 - clip plane, 2 - clip box auto v = gEve->GetDefaultGLViewer(); - v->GetClipSet()->SetClipType(TGLClip::EType(2)); + v->GetClipSet()->SetClipType(TGLClip::EType::kClipBox); v->RefreshPadEditor(v); v->CurrentCamera().RotateRad(-0.5, -2.4); diff --git a/tutorials/visualisation/eve/geom_alice_its.C b/tutorials/visualisation/eve/geom_alice_its.C index 3d309b2b4eaea..e9ae815a0428d 100644 --- a/tutorials/visualisation/eve/geom_alice_its.C +++ b/tutorials/visualisation/eve/geom_alice_its.C @@ -34,7 +34,7 @@ void geom_alice_its() // Demonstrate extraction of volumes matching certain criteria. //============================================================================== -// Should be run in compiled mode -- CINT has issues with recursion. +// Should be run in compiled mode -- CINT had issues with recursion. TODO: recheck with Cling // // 1. Creation: // root diff --git a/tutorials/visualisation/eve/geom_atlas.C b/tutorials/visualisation/eve/geom_atlas.C index 3839431d43b76..f505b084f6e21 100644 --- a/tutorials/visualisation/eve/geom_atlas.C +++ b/tutorials/visualisation/eve/geom_atlas.C @@ -29,10 +29,8 @@ void geom_atlas() gEve->FullRedraw3D(kTRUE); - // EClipType not exported to CINT (see TGLUtil.h): - // 0 - no clip, 1 - clip plane, 2 - clip box auto v = gEve->GetDefaultGLViewer(); - v->GetClipSet()->SetClipType(TGLClip::EType(1)); + v->GetClipSet()->SetClipType(TGLClip::EType::kClipPlane); v->RefreshPadEditor(v); v->CurrentCamera().RotateRad(-.7, 0.5); diff --git a/tutorials/visualisation/eve/geom_cms.C b/tutorials/visualisation/eve/geom_cms.C index 6471179de4e9a..f6e8da75274a6 100644 --- a/tutorials/visualisation/eve/geom_cms.C +++ b/tutorials/visualisation/eve/geom_cms.C @@ -31,10 +31,8 @@ void geom_cms() gEve->FullRedraw3D(kTRUE); - // EClipType not exported to CINT (see TGLUtil.h): - // 0 - no clip, 1 - clip plane, 2 - clip box auto v = gEve->GetDefaultGLViewer(); - v->GetClipSet()->SetClipType(TGLClip::EType(1)); + v->GetClipSet()->SetClipType(TGLClip::EType::kClipPlane); v->ColorSet().Background().SetColor(kMagenta + 4); v->SetGuideState(TGLUtil::kAxesEdge, kTRUE, kFALSE, 0); v->RefreshPadEditor(v); diff --git a/tutorials/visualisation/eve/geom_cms_stereo.C b/tutorials/visualisation/eve/geom_cms_stereo.C index b95f5a498c106..81776c39d18a3 100644 --- a/tutorials/visualisation/eve/geom_cms_stereo.C +++ b/tutorials/visualisation/eve/geom_cms_stereo.C @@ -53,10 +53,8 @@ void geom_cms_stereo(Bool_t quad_buf = kTRUE) // --- Fix editor --- - // EClipType not exported to CINT (see TGLUtil.h): - // 0 - no clip, 1 - clip plane, 2 - clip box auto v = gEve->GetDefaultGLViewer(); - v->GetClipSet()->SetClipType(TGLClip::EType(1)); + v->GetClipSet()->SetClipType(TGLClip::EType::kClipPlane); v->ColorSet().Background().SetColor(kMagenta + 4); v->SetGuideState(TGLUtil::kAxesEdge, kTRUE, kFALSE, 0); v->RefreshPadEditor(v); diff --git a/tutorials/visualisation/eve/geom_lhcb.C b/tutorials/visualisation/eve/geom_lhcb.C index 4433695157570..200cec069370c 100644 --- a/tutorials/visualisation/eve/geom_lhcb.C +++ b/tutorials/visualisation/eve/geom_lhcb.C @@ -21,10 +21,8 @@ void geom_lhcb() gEve->FullRedraw3D(kTRUE); - // EClipType not exported to CINT (see TGLUtil.h): - // 0 - no clip, 1 - clip plane, 2 - clip box auto v = gEve->GetDefaultGLViewer(); - v->GetClipSet()->SetClipType(TGLClip::EType(1)); + v->GetClipSet()->SetClipType(TTGLClip::EType::kClipPlane); v->ColorSet().Background().SetColor(kMagenta + 4); v->SetGuideState(TGLUtil::kAxesEdge, kTRUE, kFALSE, 0); v->RefreshPadEditor(v); diff --git a/tutorials/visualisation/gui/guiWithCLING.C b/tutorials/visualisation/gui/guiWithCLING.C index dfa82ec3829d9..c900048b4e6ae 100644 --- a/tutorials/visualisation/gui/guiWithCLING.C +++ b/tutorials/visualisation/gui/guiWithCLING.C @@ -131,10 +131,10 @@ void MyApplication::DoEnteredCommand() if (strlen(command)) { // form temporary file path prompt = ((TRint *)gROOT->GetApplication())->GetPrompt(); - FILE *cintout = fopen(fName.Data(), "a+t"); - if (cintout) { - fputs(Form("%s%s\n", prompt.Data(), command), cintout); - fclose(cintout); + FILE *clingout = fopen(fName.Data(), "a+t"); + if (clingout) { + fputs(Form("%s%s\n", prompt.Data(), command), clingout); + fclose(clingout); } gSystem->RedirectOutput(fName.Data(), "a"); gROOT->ProcessLine(command); diff --git a/tutorials/visualisation/gui/guitest.C b/tutorials/visualisation/gui/guitest.C index d5bccaf7ea30d..260be0f70e9cc 100644 --- a/tutorials/visualisation/gui/guitest.C +++ b/tutorials/visualisation/gui/guitest.C @@ -1618,56 +1618,38 @@ void TestSliders::DoSlider(Int_t pos) char buf[32]; snprintf(buf, 32, "%d", pos); -#ifdef CINT_FIXED switch (id) { case HSId1: -#else - if (id == HSId1) { -#endif fTbh1->Clear(); fTbh1->AddText(0, buf); // Re-align the cursor with the characters. fTeh1->SetCursorPosition(fTeh1->GetCursorPosition()); fTeh1->Deselect(); gClient->NeedRedraw(fTeh1); -#ifdef CINT_FIXED break; case VSId1: -#else - } else if (id == VSId1) { -#endif fTbv1->Clear(); fTbv1->AddText(0, buf); fTev1->SetCursorPosition(fTev1->GetCursorPosition()); fTev1->Deselect(); gClient->NeedRedraw(fTev1); -#ifdef CINT_FIXED break; case HSId2: -#else - } else if (id == HSId2) { -#endif fTbh2->Clear(); fTbh2->AddText(0, buf); fTeh2->SetCursorPosition(fTeh2->GetCursorPosition()); fTeh2->Deselect(); gClient->NeedRedraw(fTeh2); -#ifdef CINT_FIXED break; case VSId2: -#else - } else if (id == VSId2) { -#endif snprintf(buf, 32, "%f", fVslider2->GetMinPosition()); fTbv2->Clear(); fTbv2->AddText(0, buf); fTev2->SetCursorPosition(fTev2->GetCursorPosition()); fTev2->Deselect(); gClient->NeedRedraw(fTev2); -#ifdef CINT_FIXED break; default: break; -#endif } }