ROOT now uses llvm/clang version 9 (updated from version 5)
No longer exclude arch s390x (better supported in llvm/clang 9)
Drop patches accepted upstream or previously backported
Backport some fixes that make more tests work
New subpackages: python{2,3}-distrdf, root-roofit-batchcompute
Require js-jsroot >= 6
275 lines
12 KiB
Diff
275 lines
12 KiB
Diff
diff -ur root-6.24.02.orig/tutorials/dataframe/df002_dataModel.C root-6.24.02/tutorials/dataframe/df002_dataModel.C
|
|
--- root-6.24.02.orig/tutorials/dataframe/df002_dataModel.C 2021-06-28 11:17:14.000000000 +0200
|
|
+++ root-6.24.02/tutorials/dataframe/df002_dataModel.C 2021-08-11 03:55:11.021149115 +0200
|
|
@@ -7,7 +7,6 @@
|
|
/// complex than flat ntuples with RDataFrame
|
|
///
|
|
/// \macro_code
|
|
-/// \macro_image
|
|
///
|
|
/// \date December 2016
|
|
/// \author Danilo Piparo (CERN)
|
|
diff -ur root-6.24.02.orig/tutorials/dataframe/df002_dataModel.py root-6.24.02/tutorials/dataframe/df002_dataModel.py
|
|
--- root-6.24.02.orig/tutorials/dataframe/df002_dataModel.py 2021-06-28 11:17:14.000000000 +0200
|
|
+++ root-6.24.02/tutorials/dataframe/df002_dataModel.py 2021-08-11 03:55:11.084149272 +0200
|
|
@@ -7,7 +7,6 @@
|
|
## complex than flat ntuples with RDataFrame
|
|
##
|
|
## \macro_code
|
|
-## \macro_image
|
|
##
|
|
## \date May 2017
|
|
## \author Danilo Piparo (CERN)
|
|
diff -ur root-6.24.02.orig/tutorials/dataframe/df003_profiles.C root-6.24.02/tutorials/dataframe/df003_profiles.C
|
|
--- root-6.24.02.orig/tutorials/dataframe/df003_profiles.C 2021-06-28 11:17:14.000000000 +0200
|
|
+++ root-6.24.02/tutorials/dataframe/df003_profiles.C 2021-08-11 03:55:11.148149432 +0200
|
|
@@ -7,7 +7,6 @@
|
|
/// RDataFrame. See the documentation of TProfile and TProfile2D to better
|
|
/// understand the analogy of this code with the example one.
|
|
///
|
|
-/// \macro_image
|
|
/// \macro_code
|
|
///
|
|
/// \date February 2017
|
|
diff -ur root-6.24.02.orig/tutorials/dataframe/df003_profiles.py root-6.24.02/tutorials/dataframe/df003_profiles.py
|
|
--- root-6.24.02.orig/tutorials/dataframe/df003_profiles.py 2021-06-28 11:17:14.000000000 +0200
|
|
+++ root-6.24.02/tutorials/dataframe/df003_profiles.py 2021-08-11 03:55:11.211149590 +0200
|
|
@@ -8,7 +8,6 @@
|
|
## understand the analogy of this code with the example one.
|
|
##
|
|
## \macro_code
|
|
-## \macro_image
|
|
##
|
|
## \date February 2017
|
|
## \author Danilo Piparo (CERN)
|
|
diff -ur root-6.24.02.orig/tutorials/dataframe/df005_fillAnyObject.C root-6.24.02/tutorials/dataframe/df005_fillAnyObject.C
|
|
--- root-6.24.02.orig/tutorials/dataframe/df005_fillAnyObject.C 2021-06-28 11:17:14.000000000 +0200
|
|
+++ root-6.24.02/tutorials/dataframe/df005_fillAnyObject.C 2021-08-11 03:55:11.275149750 +0200
|
|
@@ -7,7 +7,6 @@
|
|
/// `Fill` method.
|
|
///
|
|
/// \macro_code
|
|
-/// \macro_image
|
|
///
|
|
/// \date March 2017
|
|
/// \author Danilo Piparo (CERN)
|
|
diff -ur root-6.24.02.orig/tutorials/dataframe/df007_snapshot.C root-6.24.02/tutorials/dataframe/df007_snapshot.C
|
|
--- root-6.24.02.orig/tutorials/dataframe/df007_snapshot.C 2021-06-28 11:17:14.000000000 +0200
|
|
+++ root-6.24.02/tutorials/dataframe/df007_snapshot.C 2021-08-11 03:55:11.338149907 +0200
|
|
@@ -5,7 +5,6 @@
|
|
///
|
|
/// This tutorial shows how to write out datasets in ROOT format using the RDataFrame
|
|
///
|
|
-/// \macro_image
|
|
/// \macro_code
|
|
///
|
|
/// \date April 2017
|
|
diff -ur root-6.24.02.orig/tutorials/dataframe/df007_snapshot.py root-6.24.02/tutorials/dataframe/df007_snapshot.py
|
|
--- root-6.24.02.orig/tutorials/dataframe/df007_snapshot.py 2021-06-28 11:17:14.000000000 +0200
|
|
+++ root-6.24.02/tutorials/dataframe/df007_snapshot.py 2021-08-11 03:55:11.402150067 +0200
|
|
@@ -5,7 +5,6 @@
|
|
##
|
|
## This tutorial shows how to write out datasets in ROOT format using the RDataFrame
|
|
##
|
|
-## \macro_image
|
|
## \macro_code
|
|
##
|
|
## \date April 2017
|
|
diff -ur root-6.24.02.orig/tutorials/dataframe/df014_CSVDataSource.C root-6.24.02/tutorials/dataframe/df014_CSVDataSource.C
|
|
--- root-6.24.02.orig/tutorials/dataframe/df014_CSVDataSource.C 2021-06-28 11:17:14.000000000 +0200
|
|
+++ root-6.24.02/tutorials/dataframe/df014_CSVDataSource.C 2021-08-11 03:55:11.465150225 +0200
|
|
@@ -14,7 +14,6 @@
|
|
/// DOI: [10.7483/OPENDATA.CMS.CB8H.MFFA](http://opendata.cern.ch/record/700).
|
|
///
|
|
/// \macro_code
|
|
-/// \macro_image
|
|
///
|
|
/// \date October 2017
|
|
/// \author Enric Tejedor (CERN)
|
|
diff -ur root-6.24.02.orig/tutorials/dataframe/df014_CSVDataSource.py root-6.24.02/tutorials/dataframe/df014_CSVDataSource.py
|
|
--- root-6.24.02.orig/tutorials/dataframe/df014_CSVDataSource.py 2021-06-28 11:17:14.000000000 +0200
|
|
+++ root-6.24.02/tutorials/dataframe/df014_CSVDataSource.py 2021-08-11 03:55:11.529150385 +0200
|
|
@@ -14,7 +14,6 @@
|
|
## DOI: [10.7483/OPENDATA.CMS.CB8H.MFFA](http://opendata.cern.ch/record/700).
|
|
##
|
|
## \macro_code
|
|
-## \macro_image
|
|
##
|
|
## \date October 2017
|
|
## \author Enric Tejedor (CERN)
|
|
diff -ur root-6.24.02.orig/tutorials/dataframe/df015_LazyDataSource.C root-6.24.02/tutorials/dataframe/df015_LazyDataSource.C
|
|
--- root-6.24.02.orig/tutorials/dataframe/df015_LazyDataSource.C 2021-06-28 11:17:14.000000000 +0200
|
|
+++ root-6.24.02/tutorials/dataframe/df015_LazyDataSource.C 2021-08-11 03:55:11.593150545 +0200
|
|
@@ -14,7 +14,6 @@
|
|
/// From the ROOT website: https://root.cern.ch/files/tutorials/tdf014_CsvDataSource_MuRun2010B.csv
|
|
///
|
|
/// \macro_code
|
|
-/// \macro_image
|
|
///
|
|
/// \date February 2018
|
|
/// \author Danilo Piparo (CERN)
|
|
diff -ur root-6.24.02.orig/tutorials/dataframe/df016_vecOps.C root-6.24.02/tutorials/dataframe/df016_vecOps.C
|
|
--- root-6.24.02.orig/tutorials/dataframe/df016_vecOps.C 2021-06-28 11:17:14.000000000 +0200
|
|
+++ root-6.24.02/tutorials/dataframe/df016_vecOps.C 2021-08-11 03:55:11.656150702 +0200
|
|
@@ -7,7 +7,6 @@
|
|
/// stored in datasets, a situation very common in HEP data analysis.
|
|
///
|
|
/// \macro_code
|
|
-/// \macro_image
|
|
///
|
|
/// \date February 2018
|
|
/// \author Danilo Piparo (CERN)
|
|
diff -ur root-6.24.02.orig/tutorials/dataframe/df016_vecOps.py root-6.24.02/tutorials/dataframe/df016_vecOps.py
|
|
--- root-6.24.02.orig/tutorials/dataframe/df016_vecOps.py 2021-06-28 11:17:14.000000000 +0200
|
|
+++ root-6.24.02/tutorials/dataframe/df016_vecOps.py 2021-08-11 03:55:11.720150862 +0200
|
|
@@ -6,7 +6,6 @@
|
|
## This tutorial shows the potential of the VecOps approach for treating collections
|
|
## stored in datasets, a situation very common in HEP data analysis.
|
|
##
|
|
-## \macro_image
|
|
## \macro_code
|
|
##
|
|
## \date February 2018
|
|
diff -ur root-6.24.02.orig/tutorials/dataframe/df017_vecOpsHEP.C root-6.24.02/tutorials/dataframe/df017_vecOpsHEP.C
|
|
--- root-6.24.02.orig/tutorials/dataframe/df017_vecOpsHEP.C 2021-06-28 11:17:14.000000000 +0200
|
|
+++ root-6.24.02/tutorials/dataframe/df017_vecOpsHEP.C 2021-08-11 03:55:11.783151020 +0200
|
|
@@ -11,7 +11,6 @@
|
|
/// greater than 100.
|
|
///
|
|
/// \macro_code
|
|
-/// \macro_image
|
|
///
|
|
/// \date March 2018
|
|
/// \authors Danilo Piparo (CERN), Andre Vieira Silva
|
|
diff -ur root-6.24.02.orig/tutorials/dataframe/df017_vecOpsHEP.py root-6.24.02/tutorials/dataframe/df017_vecOpsHEP.py
|
|
--- root-6.24.02.orig/tutorials/dataframe/df017_vecOpsHEP.py 2021-06-28 11:17:14.000000000 +0200
|
|
+++ root-6.24.02/tutorials/dataframe/df017_vecOpsHEP.py 2021-08-11 03:55:11.846151177 +0200
|
|
@@ -7,7 +7,6 @@
|
|
## model typically adopted in HEP for analysis.
|
|
##
|
|
## \macro_code
|
|
-## \macro_image
|
|
##
|
|
## \date March 2018
|
|
## \authors Danilo Piparo (CERN), Andre Vieira Silva
|
|
diff -ur root-6.24.02.orig/tutorials/dataframe/df019_Cache.C root-6.24.02/tutorials/dataframe/df019_Cache.C
|
|
--- root-6.24.02.orig/tutorials/dataframe/df019_Cache.C 2021-06-28 11:17:14.000000000 +0200
|
|
+++ root-6.24.02/tutorials/dataframe/df019_Cache.C 2021-08-11 03:55:11.910151337 +0200
|
|
@@ -18,7 +18,6 @@
|
|
/// only when the event loop is triggered on it.
|
|
///
|
|
/// \macro_code
|
|
-/// \macro_image
|
|
///
|
|
/// \date June 2018
|
|
/// \author Danilo Piparo (CERN)
|
|
diff -ur root-6.24.02.orig/tutorials/dataframe/df019_Cache.py root-6.24.02/tutorials/dataframe/df019_Cache.py
|
|
--- root-6.24.02.orig/tutorials/dataframe/df019_Cache.py 2021-06-28 11:17:14.000000000 +0200
|
|
+++ root-6.24.02/tutorials/dataframe/df019_Cache.py 2021-08-11 03:55:11.973151495 +0200
|
|
@@ -18,7 +18,6 @@
|
|
## only when the event loop is triggered on it.
|
|
##
|
|
## \macro_code
|
|
-## \macro_image
|
|
##
|
|
## \date June 2018
|
|
## \author Danilo Piparo (CERN)
|
|
diff -ur root-6.24.02.orig/tutorials/dataframe/df021_createTGraph.C root-6.24.02/tutorials/dataframe/df021_createTGraph.C
|
|
--- root-6.24.02.orig/tutorials/dataframe/df021_createTGraph.C 2021-06-28 11:17:14.000000000 +0200
|
|
+++ root-6.24.02/tutorials/dataframe/df021_createTGraph.C 2021-08-11 03:55:12.037151655 +0200
|
|
@@ -4,7 +4,6 @@
|
|
/// Fill a TGraph using RDataFrame.
|
|
///
|
|
/// \macro_code
|
|
-/// \macro_image
|
|
///
|
|
/// \date July 2018
|
|
/// \authors Enrico Guiraud, Danilo Piparo (CERN), Massimo Tumolo (Politecnico di Torino)
|
|
diff -ur root-6.24.02.orig/tutorials/dataframe/df021_createTGraph.py root-6.24.02/tutorials/dataframe/df021_createTGraph.py
|
|
--- root-6.24.02.orig/tutorials/dataframe/df021_createTGraph.py 2021-06-28 11:17:14.000000000 +0200
|
|
+++ root-6.24.02/tutorials/dataframe/df021_createTGraph.py 2021-08-11 03:55:12.100151813 +0200
|
|
@@ -4,7 +4,6 @@
|
|
## Fill a TGraph using RDataFrame.
|
|
##
|
|
## \macro_code
|
|
-## \macro_image
|
|
##
|
|
## \date July 2018
|
|
## \authors Enrico Guiraud, Danilo Piparo (CERN), Massimo Tumolo (Politecnico di Torino)
|
|
diff -ur root-6.24.02.orig/tutorials/tmva/tmva003_RReader.C root-6.24.02/tutorials/tmva/tmva003_RReader.C
|
|
--- root-6.24.02.orig/tutorials/tmva/tmva003_RReader.C 2021-06-28 11:17:14.000000000 +0200
|
|
+++ root-6.24.02/tutorials/tmva/tmva003_RReader.C 2021-08-11 04:16:33.833359421 +0200
|
|
@@ -5,7 +5,6 @@
|
|
/// TMVA XML files.
|
|
///
|
|
/// \macro_code
|
|
-/// \macro_output
|
|
///
|
|
/// \date July 2019
|
|
/// \author Stefan Wunsch
|
|
diff -ur root-6.24.02.orig/tutorials/tmva/tmva103_Application.C root-6.24.02/tutorials/tmva/tmva103_Application.C
|
|
--- root-6.24.02.orig/tutorials/tmva/tmva103_Application.C 2021-06-28 11:17:14.000000000 +0200
|
|
+++ root-6.24.02/tutorials/tmva/tmva103_Application.C 2021-08-11 21:56:49.387390340 +0200
|
|
@@ -6,7 +6,6 @@
|
|
/// event-by-event inference, batch inference and pipelines with RDataFrame.
|
|
///
|
|
/// \macro_code
|
|
-/// \macro_output
|
|
///
|
|
/// \date December 2018
|
|
/// \author Stefan Wunsch
|
|
diff -ur root-6.24.02.orig/tutorials/tmva/TMVA_CNN_Classification.C root-6.24.02/tutorials/tmva/TMVA_CNN_Classification.C
|
|
--- root-6.24.02.orig/tutorials/tmva/TMVA_CNN_Classification.C 2021-06-28 11:17:14.000000000 +0200
|
|
+++ root-6.24.02/tutorials/tmva/TMVA_CNN_Classification.C 2021-08-10 15:21:03.306171069 +0200
|
|
@@ -6,7 +6,6 @@
|
|
/// This is an example of using a CNN in TMVA. We do classification using a toy image data set
|
|
/// that is generated when running the example macro
|
|
///
|
|
-/// \macro_image
|
|
/// \macro_output
|
|
/// \macro_code
|
|
///
|
|
diff -ur root-6.24.02.orig/tutorials/tmva/TMVA_Higgs_Classification.C root-6.24.02/tutorials/tmva/TMVA_Higgs_Classification.C
|
|
--- root-6.24.02.orig/tutorials/tmva/TMVA_Higgs_Classification.C 2021-06-28 11:17:14.000000000 +0200
|
|
+++ root-6.24.02/tutorials/tmva/TMVA_Higgs_Classification.C 2021-08-10 15:21:33.974251559 +0200
|
|
@@ -7,7 +7,6 @@
|
|
/// used in this paper: Baldi, P., P. Sadowski, and D. Whiteson. “Searching for Exotic Particles in High-energy Physics
|
|
/// with Deep Learning.” Nature Communications 5 (July 2, 2014).
|
|
///
|
|
-/// \macro_image
|
|
/// \macro_output
|
|
/// \macro_code
|
|
///
|
|
diff -ur root-6.24.02.orig/tutorials/tmva/TMVA_RNN_Classification.C root-6.24.02/tutorials/tmva/TMVA_RNN_Classification.C
|
|
--- root-6.24.02.orig/tutorials/tmva/TMVA_RNN_Classification.C 2021-06-28 11:17:14.000000000 +0200
|
|
+++ root-6.24.02/tutorials/tmva/TMVA_RNN_Classification.C 2021-08-10 15:21:15.657203486 +0200
|
|
@@ -6,7 +6,6 @@
|
|
/// This is an example of using a RNN in TMVA. We do classification using a toy time dependent data set
|
|
/// that is generated when running this example macro
|
|
///
|
|
-/// \macro_image
|
|
/// \macro_output
|
|
/// \macro_code
|
|
///
|
|
diff -ur root-6.24.02.orig/tutorials/v7/line.cxx root-6.24.02/tutorials/v7/line.cxx
|
|
--- root-6.24.02.orig/tutorials/v7/line.cxx 2021-06-28 11:17:14.000000000 +0200
|
|
+++ root-6.24.02/tutorials/v7/line.cxx 2021-08-16 14:25:32.528867781 +0200
|
|
@@ -6,7 +6,6 @@
|
|
/// "normal" coordinates' system and changing the line color linearly from black
|
|
/// to red.
|
|
///
|
|
-/// \macro_image (line.png)
|
|
/// \macro_code
|
|
///
|
|
/// \date 2018-03-18
|
|
diff -ur root-6.24.02.orig/tutorials/v7/ntuple/ntpl005_introspection.C root-6.24.02/tutorials/v7/ntuple/ntpl005_introspection.C
|
|
--- root-6.24.02.orig/tutorials/v7/ntuple/ntpl005_introspection.C 2021-06-28 11:17:14.000000000 +0200
|
|
+++ root-6.24.02/tutorials/v7/ntuple/ntpl005_introspection.C 2021-08-10 15:22:06.504336763 +0200
|
|
@@ -4,7 +4,6 @@
|
|
/// Write and read an RNTuple from a user-defined class. Adapted from tv3.C
|
|
/// Illustrates various RNTuple introspection methods.
|
|
///
|
|
-/// \macro_image
|
|
/// \macro_code
|
|
///
|
|
/// \date April 2020
|