resolve conflicts

Author: cjones051073

CMakeLists.txt

@@ -142,7 +142,10 @@ if(cxxmodules)
 
   set(ROOT_CXXMODULES_COMMONFLAGS "${ROOT_CXXMODULES_COMMONFLAGS} -fmodules -fmodules-cache-path=${CMAKE_BINARY_DIR}/include/pcms/ -fno-autolink -fdiagnostics-show-note-include-stack")
 
-  set(ROOT_CXXMODULES_COMMONFLAGS "${ROOT_CXXMODULES_COMMONFLAGS} -fno-implicit-module-maps -fmodule-map-file=${CMAKE_BINARY_DIR}/include/module.modulemap")
+  # FIXME: We should remove this once libc++ supports -fmodules-local-submodule-visibility.
+  if (APPLE)
+    set(ROOT_CXXMODULES_COMMONFLAGS "${ROOT_CXXMODULES_COMMONFLAGS} -fno-implicit-module-maps -fmodule-map-file=${CMAKE_BINARY_DIR}/include/module.modulemap")
+  endif(APPLE)
 
   configure_file("${CMAKE_SOURCE_DIR}/build/unix/module.modulemap" "${CMAKE_BINARY_DIR}/include/module.modulemap" COPYONLY)
 

README.md

@@ -1,5 +1,6 @@
-The ROOT System
-===============
+<img src="https://root-forum.cern.ch/uploads/default/original/2X/3/3fb82b650635bc6d61461f3c47f41786afad4548.png" align="right"  height="50"/>
+
+## About
 
 The ROOT system provides a set of OO frameworks with all the functionality
 needed to handle and analyze large amounts of data in a very efficient way.
@@ -14,17 +15,76 @@ framework, PROOF, that can considerably speed up an analysis.
 
 Thanks to the built-in C++ interpreter cling, the command, the
 scripting and the programming language are all C++. The interpreter
-allows for fast prototyping of the macros since it removes the, time
-consuming, compile/link cycle. It also provides a good environment to
+allows for fast prototyping of the macros since it removes the time
+consuming compile/link cycle. It also provides a good environment to
 learn C++. If more performance is needed the interactively developed
 macros can be compiled using a C++ compiler via a machine independent
 transparent compiler interface called ACliC.
 
-
 The system has been designed in such a way that it can query its databases
 in parallel on clusters of workstations or many-core machines. ROOT is
 an open system that can be dynamically extended by linking external
 libraries. This makes ROOT a premier platform on which to build data
 acquisition, simulation and data analysis systems.
 
-ROOT is available under the LGPL license.
+[![License: LGPL v2.1](https://img.shields.io/badge/License-LGPL%20v2.1-blue.svg)](http://www.gnu.org/licenses/lgpl-2.1)
+
+## Build Status
+| Branch | Continuous | Nightly |
+|--------|------------|---------|
+| master | [![Build Status](https://phsft-jenkins.cern.ch/buildStatus/icon?job=root-incremental-master)](https://phsft-jenkins.cern.ch/view/ROOT/job/root-incremental-master/) | [![Build Status](https://phsft-jenkins.cern.ch/buildStatus/icon?job=root-nightly-master)](https://phsft-jenkins.cern.ch/view/ROOT/job/root-nightly-master/) |
+| master-imt | [![Build Status](https://phsft-jenkins.cern.ch/buildStatus/icon?job=root-incremental-master-imt)](https://phsft-jenkins.cern.ch/view/ROOT/job/root-incremental-master-imt/) | [![Build Status](https://phsft-jenkins.cern.ch/buildStatus/icon?job=root-nightly-master-imt)](https://phsft-jenkins.cern.ch/view/ROOT/job/root-nightly-master-imt/) |
+| v5-34-00-patches | [![Build Status](https://phsft-jenkins.cern.ch/buildStatus/icon?job=root-incremental-v5-34-00-patches)](https://phsft-jenkins.cern.ch/view/ROOT/job/root-incremental-v5-34-00-patches/) | [![Build Status](https://phsft-jenkins.cern.ch/buildStatus/icon?job=root-nightly-v5-34-00-patches)](https://phsft-jenkins.cern.ch/view/ROOT/job/root-nightly-v5-34-00-patches/) |
+| v6-08-00-patches |  [![Build Status](https://phsft-jenkins.cern.ch/buildStatus/icon?job=root-incremental-v6-08-00-patches)](https://phsft-jenkins.cern.ch/view/ROOT/job/root-incremental-v6-08-00-patches/) | [![Build Status](https://phsft-jenkins.cern.ch/buildStatus/icon?job=root-nightly-v6-08-00-patches)](https://phsft-jenkins.cern.ch/view/ROOT/job/root-nightly-v6-08-00-patches/) |
+
+## Live Demo
+[![](https://swanserver.web.cern.ch/swanserver/images/badge_swan_white_150.png)](http://cern.ch/swanserver/cgi-bin/go?projurl=https://github.com/cernphsft/rootbinder.git)
+
+## Screenshots
+These screenshots shows some of the plots (produced using ROOT) presented when the Higgs boson discovery was [announced at CERN](http://home.cern/topics/higgs-boson):
+
+![CMS Data MC Ratio Plot](https://d35c7d8c.web.cern.ch/sites/d35c7d8c.web.cern.ch/files/CMS04_1.png)
+
+![Atlas P0 Trends](https://d35c7d8c.web.cern.ch/sites/d35c7d8c.web.cern.ch/files/Atlas06_0.png)
+
+See more screenshots on our [gallery](https://root.cern/gallery).
+
+## Download and Getting Started
+See [root.cern download page](https://root.cern/downloading-root) for the latest binary releases. 
+
+[Getting started with ROOT.](https://root.cern/getting-started)
+
+## Building
+Clone the repo
+
+    $ git clone https://github.com/root-project/root.git
+    
+Make a directory for building
+
+    $ mkdir build
+    $ cd build
+    
+Run cmake and make
+
+    $ cmake ../root
+    $ make -j8
+
+Setup and run ROOT
+
+    $ source bin/thisroot.sh
+    $ root
+    
+[More information](https://root.cern/building-root) regarding building.
+
+## Help and Support
+- [Forum](https://root.cern/forum/)
+- [Issue tracker](https://sft.its.cern.ch/jira/projects/ROOT/issues/ROOT-5820?filter=allopenissues)
+- [Report a bug](https://root.cern/bugs) (Requires a [CERN lightweight account](https://account.cern.ch/account/Externals/RegisterAccount.aspx))
+- [Mailing lists](https://groups.cern.ch/group/root-dev/default.aspx)
+- [Documentation](https://root.cern/guides/reference-guide)
+- [Tutorials](https://root.cern/doc/master/group__Tutorials.html)
+
+## Contribution Guidelines
+- [Bug reporting guidelines](https://root.cern/guidelines-submitting-bug)
+- [Coding conventions](https://root.cern/coding-conventions)
+- [Meetings](https://root.cern/meetings)

cmake/modules/RootBuildOptions.cmake

@@ -90,7 +90,11 @@ ROOT_BUILD_OPTION(cxx14 OFF "Build using C++14 compatible mode, requires gcc > 4
 ROOT_BUILD_OPTION(libcxx OFF "Build using libc++, requires cxx11 option (MacOS X only, for the time being)")
 ROOT_BUILD_OPTION(cxxmodules "Compile with C++ modules enabled." OFF)
 ROOT_BUILD_OPTION(castor ON "CASTOR support, requires libshift from CASTOR >= 1.5.2")
-ROOT_BUILD_OPTION(ccache OFF "Enable ccache usage for speeding up builds")
+if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
+  ROOT_BUILD_OPTION(ccache ON "Enable ccache usage for speeding up builds")
+else()
+  ROOT_BUILD_OPTION(ccache OFF "Enable ccache usage for speeding up builds")
+endif()
 ROOT_BUILD_OPTION(chirp ON "Chirp support (Condor remote I/O), requires libchirp_client")
 ROOT_BUILD_OPTION(cling ON "Enable new CLING C++ interpreter")
 ROOT_BUILD_OPTION(cocoa OFF "Use native Cocoa/Quartz graphics backend (MacOS X only)")

core/base/inc/TROOT.h

@@ -89,7 +89,8 @@ namespace ROOT {
    // Enable support for multi-threading within the ROOT code,
    // in particular, enables the global mutex to make ROOT thread safe/aware.
    void EnableThreadSafety();
-   // Manage implicit multi-threading within ROOT
+   /// \brief Enable ROOT's implicit multi-threading for all objects and methods that provide an internal
+   /// parallelisation mechanism.
    void EnableImplicitMT(UInt_t numthreads = 0);
    void DisableImplicitMT();
    Bool_t IsImplicitMTEnabled();

core/base/src/TROOT.cxx

@@ -503,18 +503,25 @@ namespace Internal {
    }
 
    ////////////////////////////////////////////////////////////////////////////////
-   /// Globally enables the implicit multi-threading in ROOT, activating the
-   /// parallel execution of those methods in ROOT that provide an internal
-   /// parallelisation.
-   /// The 'numthreads' parameter allows to control the number of threads to
-   /// be used by the implicit multi-threading. However, this parameter is just
-   /// a hint for ROOT, which will try to satisfy the request if the execution
-   /// scenario allows it. For example, if ROOT is configured to use an external
-   /// scheduler, setting a value for 'numthreads' might not have any effect.
    /// @param[in] numthreads Number of threads to use. If not specified or
    ///                       set to zero, the number of threads is automatically
    ///                       decided by the implementation. Any other value is
    ///                       used as a hint.
+   ///
+   /// ROOT must be built with the compilation flag `imt=ON` for this feature to be available.
+   /// The following objects and methods automatically take advantage of
+   /// multi-threading if a call to `EnableImplicitMT` has been made before usage:
+   ///
+   ///  - TDataFrame internally runs the event-loop by parallelizing over clusters of entries
+   ///  - TTree::GetEntry reads multiple branches in parallel
+   ///  - TTree::FlushBaskets writes multiple baskets to disk in parallel
+   ///
+   /// EnableImplicitMT calls in turn EnableThreadSafety.
+   /// The 'numthreads' parameter allows to control the number of threads to
+   /// be used by the implicit multi-threading. However, this parameter is just
+   /// a hint for ROOT: it will try to satisfy the request if the execution
+   /// scenario allows it. For example, if ROOT is configured to use an external
+   /// scheduler, setting a value for 'numthreads' might not have any effect.
    void EnableImplicitMT(UInt_t numthreads)
    {
 #ifdef R__USE_IMT
@@ -528,7 +535,7 @@ namespace Internal {
    }
 
    ////////////////////////////////////////////////////////////////////////////////
-   /// Disables the implicit multi-threading in ROOT.
+   /// Disables the implicit multi-threading in ROOT (see EnableImplicitMT).
    void DisableImplicitMT()
    {
 #ifdef R__USE_IMT

interpreter/CMakeLists.txt

@@ -89,8 +89,8 @@ if(NOT DEFINED LLVM_BUILD_TYPE)
   set(LLVM_BUILD_TYPE Release CACHE STRING "Build type for LLVM (used to set CMAKE_BUILD_TYPE)")
 endif()
 if( CMAKE_BUILD_TYPE STREQUAL "Debug" AND NOT LLVM_BUILD_TYPE STREQUAL "Debug")
-  message(WARNING "Selected a 'Debug' build (CMAKE_BUILD_TYPE), be aware that the embedded LLVM will still be built as 'Release'."
-                  " Use the variable LLVM_BUILD_TYPE to control it.")
+  message(STATUS "Selected a 'Debug' build (CMAKE_BUILD_TYPE), be aware that the embedded LLVM will still be built as 'Release'."
+                 " Use the variable LLVM_BUILD_TYPE to control it.")
 endif()
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
   set(LLVM_ENABLE_ASSERTIONS "YES")

test/stressGraphics.cxx

@@ -1984,8 +1984,7 @@ void th2poly()
    Double_t lat2 = 50;
    TH2Poly *p = new TH2Poly("USA","USA Population",lon1,lon2,lat1,lat2);
 
-   TFile::SetCacheFileDir(".");
-   TFile *f = TFile::Open("http://root.cern.ch/files/usa.root", "CACHEREAD");
+   TFile *f = TFile::Open("http://root.cern.ch/files/usa.root");
 
    if (!f) {
       printf("Cannot access usa.root. Is internet working ?\n");

test/stressHistogram.cxx

@@ -4390,7 +4390,7 @@ bool testMerge1DLabelAll()
    h3->LabelsOption(">");
 
    auto h0 = (TH1*) h1->Clone("h1clone");
-   
+
    h1->Merge(list);
 
    h4->LabelsOption("a");
@@ -5558,11 +5558,11 @@ bool testMerge2DExtend(UInt_t extendType = TH1::kAllAxes)
 
 
    h1->Sumw2();h2->Sumw2();h4->Sumw2();
-   
+
    h1->SetCanExtend(extendType);
    h2->SetCanExtend(extendType);
    h4->SetCanExtend(extendType);
-     
+
    for ( Int_t e = 0; e < nEvents; ++e ) {
       Double_t x = r.Uniform( minRange,  maxRange);
       Double_t y = r.Uniform( minRange,  maxRange);
@@ -5648,13 +5648,13 @@ bool testMerge3DExtend(UInt_t extendType = TH1::kAllAxes)
 }
 
 bool testMerge3DExtendAll() {
-   return testMerge3DExtend(TH1::kAllAxes); 
+   return testMerge3DExtend(TH1::kAllAxes);
 }
 bool testMerge3DExtendX() {
-   return testMerge3DExtend(TH1::kXaxis); 
+   return testMerge3DExtend(TH1::kXaxis);
 }
 bool testMerge3DExtendZ() {
-   return testMerge3DExtend(TH1::kZaxis); 
+   return testMerge3DExtend(TH1::kZaxis);
 }
 
 bool testMerge1DExtendProf()
@@ -10183,7 +10183,7 @@ int stressHistogram()
    testSuite.push_back( &conversionsTestSuite);
    testSuite.push_back( &fillDataTestSuite);
 
-   unsigned int numberOfSuits = testSuite.size(); 
+   unsigned int numberOfSuits = testSuite.size();
 
    status = 0;
    for ( unsigned int i = 0; i < numberOfSuits; ++i ) {
@@ -10215,8 +10215,7 @@ int stressHistogram()
       refFile = TFile::Open(refFileName, "RECREATE");
    }
    else {
-      TFile::SetCacheFileDir(".");
-      refFile = TFile::Open(refFileName, "CACHEREAD");
+      refFile = TFile::Open(refFileName);
    }
 
    if ( refFile != 0 ) {

tree/tree/src/TLeaf.cxx

@@ -130,8 +130,9 @@ void TLeaf::Browse(TBrowser* b)
    } else {
       if ((fBranch->GetListOfLeaves()->GetEntries() > 1) ||
           (strcmp(fBranch->GetName(), GetName()) != 0)) {
-         TString name;
-         name.Form("%s.%s", fBranch->GetName(), GetName());
+         TString name(fBranch->GetName());
+         if (!name.EndsWith(".")) name += ".";
+         name += GetName();
          fBranch->GetTree()->Draw(name, "", b ? b->GetDrawOption() : "");
       } else {
          fBranch->GetTree()->Draw(GetName(), "", b ? b->GetDrawOption() : "");