diff --git a/tutorials/CMakeLists.txt b/tutorials/CMakeLists.txt index 9d0b23f214f7c..7602af4c7f7c1 100644 --- a/tutorials/CMakeLists.txt +++ b/tutorials/CMakeLists.txt @@ -216,6 +216,7 @@ if(NOT xrootd) roofit/roofit/rf618_mixture_models.py # depends on df106_HiggsToFourLeptons.py visualisation/rcanvas/df104.py visualisation/rcanvas/df105.py + io/tree/imt_parTreeProcessing.C ) endif() @@ -281,8 +282,6 @@ endif() if(MSVC) #---Multiproc is not supported on Windows set(imt_veto ${imt_veto} analysis/parallel/mp*.C io/tree/mp*.C legacy/multicore/mp*.C multicore/mp*.C ./analysis/parallel/mtbb_parallelHistoFill.C) - #---XRootD is not supported on Windows - set(imt_veto ${imt_veto} io/tree/imt_parTreeProcessing.C) endif() if(ROOT_CLASSIC_BUILD) @@ -879,6 +878,7 @@ if(ROOT_pyroot_FOUND) tutorial-legacy-g3d-na49view-py tutorial-hist-hist015_TH1_read_and_draw-py tutorial-io-tree-ntuple1-py) + set(hist-hist015_TH1_read_and_draw_uhi-depends tutorial-hsimple-py) set(math-fit-fit1-depends tutorial-hist-hist001_TH1_fillrandom-py) set(legacy-g3d-na49view-depends tutorial-legacy-g3d-geometry-py) set(roofit-roofit-rf503_wspaceread-depends tutorial-roofit-roofit-rf502_wspacewrite-py) @@ -897,6 +897,9 @@ if(ROOT_pyroot_FOUND) # To add a new requirement, add a glob expression that's named requires_, # and add it to the list "fixtureLists" below. file(GLOB requires_numpy RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + hsimple.py + io/tree/ntuple1.py # indirect dependency from hsimple.py + hist/hist015_TH1_read_and_draw.py # indirect dependency from hsimple.py analysis/dataframe/df017_vecOpsHEP.py analysis/dataframe/df026_AsNumpyArrays.py analysis/dataframe/df032_RDFFromNumpy.py diff --git a/tutorials/hist/hist015_TH1_read_and_draw.py b/tutorials/hist/hist015_TH1_read_and_draw.py index da54c4ce929e0..5dffaae1526da 100644 --- a/tutorials/hist/hist015_TH1_read_and_draw.py +++ b/tutorials/hist/hist015_TH1_read_and_draw.py @@ -22,14 +22,10 @@ pad2.Draw() pad3.Draw() # -# We connect the ROOT file generated in a previous tutorial +# We connect the ROOT file generated in the hsimple.py tutorial # -File = "py-hsimple.root" -if (ROOT.gSystem.AccessPathName(File)) : - ROOT.Info("hist015_TH1_read_and_draw.py", File+" does not exist") - exit() -example = TFile(File) +example = TFile("py-hsimple.root") example.ls() # Draw a global picture title @@ -86,4 +82,4 @@ c1.Update() if (example.IsOpen()): - example.Close() \ No newline at end of file + example.Close() diff --git a/tutorials/hist/hist015_TH1_read_and_draw_uhi.py b/tutorials/hist/hist015_TH1_read_and_draw_uhi.py index f4562cc4ec381..16d9970af40af 100644 --- a/tutorials/hist/hist015_TH1_read_and_draw_uhi.py +++ b/tutorials/hist/hist015_TH1_read_and_draw_uhi.py @@ -19,13 +19,9 @@ mpl_fig = plt.figure(figsize=(14, 12)) gs = mpl_fig.add_gridspec(3, 2, height_ratios=[1.5, 1.5, 1.5]) -# We connect the ROOT file generated in a previous tutorial -File = "py-hsimple.root" -if ROOT.gSystem.AccessPathName(File): - ROOT.Info("hist015_TH1_read_and_draw.py", File + " does not exist") - exit() +# We connect the ROOT file generated in the hsimple.py tutorial -example = TFile(File) +example = TFile("py-hsimple.root") example.ls() # Draw histogram hpx in first pad.