Skip to content

Commit 99f8c33

Browse files
committed
[Math] Remove TDataPointN class
The only difference between `TDataPoint` and `TDataPointN` was that the the latter used manually allocated memory, and the first uses stack arrays with the size given in a template argument. There is no need to use dynamic allocation then, and it's also not good for performance if the memory for each datapoint has to be allocated. Removing the class at this time should still be fine, as the `TDataPointN` class was only introduced in 2011 (52e7782) and is also undocumented, untested, and not covered by release notes or tutorials. Closes the following JIRA ticket: https://its.cern.ch/jira/browse/ROOT-9323
1 parent 7da2026 commit 99f8c33

File tree

7 files changed

+4
-109
lines changed

7 files changed

+4
-109
lines changed

README/ReleaseNotes/v638/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
* The `RooStats::HLFactory` class that was deprecated in ROOT 6.36 is now removed. It provided little advantage over using the RooWorkspace directly or any of the other higher-level frameworks that exist in the RooFit ecosystem.
55
* The build options `mysql`, `odbc` and `pgsql`, that were deprecated in ROOT 6.36, are now removed.
66
* The `TGLWSIncludes.h` header is deprecated and will be removed in ROOT 6.40
7+
* The `ROOT::Math::TDataPointN` class that can be used with the `ROOT::Math::KDETree` was removed. Use the templated `TDataPoint<N>` instead.
78

89
## Core Libraries
910
* Behavior change: when selecting a template instantiation for a dictionary, all the template arguments have to be fully defined - the forward declarations are not enough any more. The error prompted by the dictionary generator will be `Warning: Unused class rule: MyTemplate<MyFwdDeclaredClass>`.

math/mathcore/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ set(HEADERS
7979
Math/SpecFuncMathCore.h
8080
Math/StdEngine.h
8181
Math/TDataPoint.h
82-
Math/TDataPointN.h
8382
Math/TRandomEngine.h
8483
Math/Types.h
8584
Math/Util.h

math/mathcore/inc/LinkDef2.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,6 @@
183183
#pragma link C++ class ROOT::Math::TDataPoint<1,Double_t>+;
184184
#pragma link C++ typedef ROOT::Math::TDataPoint1F;
185185
#pragma link C++ typedef ROOT::Math::TDataPoint1D;
186-
#pragma link C++ class ROOT::Math::TDataPointN<Double_t>+;
187-
#pragma link C++ class ROOT::Math::TDataPointN<Float_t>+;
188186
//
189187
//N.B. use old streamer (do not use +) for KDTree class because it will not work on Windows
190188
// to work one would need to change the internal classes from private to public

math/mathcore/inc/Math/TDataPointN.h

Lines changed: 0 additions & 99 deletions
This file was deleted.

roottest/root/meta/execTypedefList.C

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,17 +149,17 @@ int execTypedefList() {
149149
// res = check_target("std::list<std::string>::const_iterator","list<string>::const_iterator"); if (res) return res;
150150

151151
#if defined(_MSC_VER)
152-
res = check_file("typelist_win32.v5.txt",336); if (res) return res;
152+
res = check_file("typelist_win32.v5.txt",334); if (res) return res;
153153
#if __cplusplus > 201402L
154154
res = check_file("typelist_win32.v6.cxx17.txt",1408); if (res) return res;
155155
#else
156156
res = check_file("typelist_win32.v6.txt",1420); if (res) return res;
157157
#endif
158158
#elif defined(R__MACOSX) && __cplusplus > 201402L
159-
res = check_file("typelist.v5.txt",336); if (res) return res;
159+
res = check_file("typelist.v5.txt",334); if (res) return res;
160160
res = check_file("typelist.v6.cxx17.txt",1310); if (res) return res;
161161
#else
162-
res = check_file("typelist.v5.txt",336); if (res) return res;
162+
res = check_file("typelist.v5.txt",334); if (res) return res;
163163
res = check_file("typelist.v6.txt",1322); if (res) return res;
164164
#endif
165165

roottest/root/meta/typelist.v5.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ TKDTreeID
6868
basic_ios<char,char_traits<char> >::traits_type
6969
Short_t
7070
TKDTreeIF
71-
ROOT::Math::TDataPointN<double>::value_type
7271
basic_stringbuf<char,char_traits<char>,allocator<char> >::pos_type
7372
Version_t
7473
basic_ifstream<char,char_traits<char> >::char_type
@@ -180,7 +179,6 @@ vector<string,allocator<string> >::reference
180179
vector<TString,allocator<TString> >::const_pointer
181180
vector<double,allocator<double> >::const_iterator
182181
string::pointer
183-
ROOT::Math::TDataPointN<float>::value_type
184182
TColorGradient::SizeType_t
185183
vector<string,allocator<string> >::iterator::reference
186184
vector<double,allocator<double> >::difference_type

roottest/root/meta/typelist_win32.v5.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ TKDTreeID
6868
basic_ios<char,char_traits<char> >::traits_type
6969
Short_t
7070
TKDTreeIF
71-
ROOT::Math::TDataPointN<double>::value_type
7271
basic_stringbuf<char,char_traits<char>,allocator<char> >::pos_type
7372
Version_t
7473
basic_ifstream<char,char_traits<char> >::char_type
@@ -179,7 +178,6 @@ vector<string,allocator<string> >::reference
179178
vector<TString,allocator<TString> >::const_pointer
180179
vector<double,allocator<double> >::const_iterator
181180
string::pointer
182-
ROOT::Math::TDataPointN<float>::value_type
183181
TColorGradient::SizeType_t
184182
vector<string,allocator<string> >::iterator::reference
185183
vector<double,allocator<double> >::difference_type

0 commit comments

Comments
 (0)