Binary op (for testing)

cmake/modules/SearchInstalledSoftware.cmake

@@ -72,7 +72,7 @@ if(NOT builtin_nlohmannjson)
   if(fail-on-missing)
     find_package(nlohmann_json REQUIRED)
   else()
-    find_package(nlohmann_json QUIET)
+    find_package(nlohmann_json 3.9 QUIET)
     if(nlohmann_json_FOUND)
       get_target_property(_nlohmann_json_incl nlohmann_json::nlohmann_json INTERFACE_INCLUDE_DIRECTORIES)
       message(STATUS "Found nlohmann/json.hpp in ${_nlohmann_json_incl} (found version ${nlohmann_json_VERSION})")

core/base/doc/macros/textalign.C

@@ -2,12 +2,13 @@
    auto *Ta = new TCanvas("Ta","Ta",0,0,500,200);
    Ta->Range(0,0,1,1);
 
-   auto *lv = new TLine;
-   lv->SetLineStyle(3); lv->SetLineColor(kBlue);
-   lv->DrawLine(0.33,0.0,0.33,1.0);
-   lv->DrawLine(0.6,0.165,1.,0.165);
-   lv->DrawLine(0.6,0.493,1.,0.493);
-   lv->DrawLine(0.6,0.823,1.,0.823);
+   TLine lv;
+   lv.SetLineStyle(3);
+   lv.SetLineColor(kBlue);
+   lv.DrawLine(0.33,0.0,0.33,1.0);
+   lv.DrawLine(0.6,0.165,1.,0.165);
+   lv.DrawLine(0.6,0.493,1.,0.493);
+   lv.DrawLine(0.6,0.823,1.,0.823);
 
    // Horizontal alignment.
    auto *th1 = new TText(0.33,0.165,"Left adjusted");

core/base/doc/macros/textangle.C

@@ -1,18 +1,18 @@
 {
    auto *Ta = new TCanvas("Ta","Text angle",0,0,300,326);
    Ta->Range(0,0,1,1);
-   auto *l = new TLine();
-   l->SetLineColor(kRed);
-   l->DrawLine(0.1,0.1,0.9,0.1);
-   l->DrawLine(0.1,0.1,0.9,0.9);
-   auto *m = new TMarker();
-   m->SetMarkerStyle(20);
-   m->SetMarkerColor(kBlue);
-   m->DrawMarker(0.1,0.1);
-   auto *a = new TArc();
-   a->SetFillStyle(0);
-   a->SetLineColor(kBlue); a->SetLineStyle(3);
-   a->DrawArc(0.1, 0.1, 0.2, 0.,45.,"only");
+   TLine l;
+   l.SetLineColor(kRed);
+   l.DrawLine(0.1,0.1,0.9,0.1);
+   l.DrawLine(0.1,0.1,0.9,0.9);
+   TMarker m;
+   m.SetMarkerStyle(20);
+   m.SetMarkerColor(kBlue);
+   m.DrawMarker(0.1,0.1);
+   TArc a;
+   a.SetFillStyle(0);
+   a.SetLineColor(kBlue); a->SetLineStyle(3);
+   a.DrawArc(0.1, 0.1, 0.2, 0.,45.,"only");
    auto *tt = new TText(0.1,0.1,"Text angle is 45 degrees");
    tt->SetTextAlign(11); tt->SetTextSize(0.1);
    tt->SetTextAngle(45);

etc/RooFitHS3_wsexportkeys.json

@@ -54,7 +54,14 @@
         "proxies": {
             "set": "summands"
         }
-    },    
+    },
+    "RooBernstein": {
+        "type": "BernsteinPolynomial",
+        "proxies": {
+            "coefList": "coefficients",
+            "x": "x"	    
+        }
+    },        
     "RooArgusBG": {
         "type": "ARGUS",
         "proxies": {
@@ -63,5 +70,24 @@
             "c": "slope",
             "p": "power"
         }
+    },
+    "RooCBShape": {
+        "type": "CrystalBallShape",
+        "proxies": {
+            "alpha": "alpha",
+            "m": "m",
+            "m0": "m0",
+            "n": "n",
+            "sigma": "sigma"
+        }
+    },
+    "RooBifurGauss": {
+        "type": "BifurkatedGaussian",
+        "proxies": {
+            "x": "x",
+            "mean": "mean",
+            "sigmaL": "sigmaL",
+            "sigmaR": "sigmaR"	    
+        }
     }
 }

etc/RooFitHS3_wsfactoryexpressions.json

@@ -57,5 +57,31 @@
             "slope",
             "power"
         ]
+    },
+    "BernsteinPolynomial": {
+        "class": "RooBernstein",
+        "arguments": [
+            "x",
+            "coefficients"
+        ]
+    },
+    "CrystalBallShape": {
+        "class": "RooCBShape",
+        "arguments": [
+            "m",
+            "m0",
+            "sigma",
+            "alpha",
+	    "n"
+        ]
+    },
+    "BifurkatedGaussian": {
+        "class": "RooBifurGauss",
+        "arguments": [
+            "x",
+            "mean",
+            "sigmaL",
+            "sigmaR"	    
+        ]
     }
 }

graf2d/asimage/src/TASImage.cxx

@@ -57,9 +57,10 @@ Several examples showing how to use this class are available in the
 ROOT tutorials: `$ROOTSYS/tutorials/image/`
 */
 
-#  include <ft2build.h>
-#  include FT_FREETYPE_H
-#  include FT_GLYPH_H
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#include FT_GLYPH_H
+
 #include "TASImage.h"
 #include "TASImagePlugin.h"
 #include "TROOT.h"
@@ -89,6 +90,8 @@ ROOT tutorials: `$ROOTSYS/tutorials/image/`
 #include "TVirtualPadPainter.h"
 #include "snprintf.h"
 
+#include <memory>
+
 #ifndef WIN32
 #ifndef R__HAS_COCOA
 #   include <X11/Xlib.h>
@@ -1703,7 +1706,7 @@ Int_t TASImage::DistancetoPrimitive(Int_t px, Int_t py)
 
 void TASImage::ExecuteEvent(Int_t event, Int_t px, Int_t py)
 {
-   static TBox *ZoomBox;
+   static std::unique_ptr<TBox> ZoomBox;
 
    if (!gPad) return;
 
@@ -1762,9 +1765,8 @@ void TASImage::ExecuteEvent(Int_t event, Int_t px, Int_t py)
                ZoomBox->SetY1(gPad->AbsPixeltoY(pyl));
                ZoomBox->SetX2(gPad->AbsPixeltoX(pxt));
                ZoomBox->SetY2(gPad->AbsPixeltoY(pyt));
-            }
-            else {
-               ZoomBox = new TBox(pxl, pyl, pxt, pyt);
+            } else {
+               ZoomBox = std::make_unique<TBox>(pxl, pyl, pxt, pyt);
                ZoomBox->SetFillStyle(0);
                ZoomBox->Draw("l*");
             }
@@ -1800,10 +1802,9 @@ void TASImage::ExecuteEvent(Int_t event, Int_t px, Int_t py)
             Zoom((imgX1 < imgX2) ? imgX1 : imgX2, (imgY1 < imgY2) ? imgY1 : imgY2,
                  TMath::Abs(imgX1 - imgX2) + 1, TMath::Abs(imgY1 - imgY2) + 1);
 
-            if (ZoomBox) {
-               ZoomBox->Delete();
-               ZoomBox = 0;
-            }
+            if (ZoomBox)
+               ZoomBox.reset();
+
             gPad->Modified(kTRUE);
             gPad->Update();
             break;

graf2d/gpad/inc/TPad.h

@@ -14,6 +14,7 @@
 
 #include "TVirtualPad.h"
 #include "TAttBBox2D.h"
+#include <vector>
 
 class TVirtualViewer3D;
 class TVirtualPadPainter;
@@ -111,7 +112,7 @@ class TPad : public TVirtualPad, public TAttBBox2D {
    static Int_t  fgMaxPickDistance; ///<  Maximum Pick Distance
    Int_t         fNumPaletteColor;  ///<  Number of objects with an automatic color
    Int_t         fNextPaletteColor; ///<  Next automatic color
-   Bool_t       *fCollideGrid;      ///<! Grid used to find empty space when adding a box (Legend) in a pad
+   std::vector<Bool_t> fCollideGrid;///<! Grid used to find empty space when adding a box (Legend) in a pad
    Int_t         fCGnx;             ///<! Size of the collide grid along x
    Int_t         fCGny;             ///<! Size of the collide grid along y
 

graf2d/gpad/src/TCanvas.cxx

@@ -160,18 +160,18 @@ TCanvas::TCanvas(Bool_t build) : TPad(), fDoubleBuffer(0)
       Constructor();
    } else {
       const char *defcanvas = gROOT->GetDefCanvasName();
-      char *cdef;
+      TString cdef;
 
       auto lc = (TList*)gROOT->GetListOfCanvases();
       if (lc->FindObject(defcanvas)) {
-         Int_t n = lc->GetSize()+1;
-         while (lc->FindObject(Form("%s_n%d",defcanvas,n))) n++;
-         cdef = StrDup(Form("%s_n%d",defcanvas,n));
+         Int_t n = lc->GetSize() + 1;
+         do {
+            cdef.Form("%s_n%d",defcanvas,n++);
+         }  while (lc->FindObject(cdef.Data()));
       } else {
-         cdef = StrDup(Form("%s",defcanvas));
+         cdef = defcanvas;
       }
-      Constructor(cdef, cdef, 1);
-      delete [] cdef;
+      Constructor(cdef.Data(), cdef.Data(), 1);
    }
 }
 
@@ -1504,22 +1504,20 @@ void TCanvas::ls(Option_t *option) const
 TCanvas *TCanvas::MakeDefCanvas()
 {
    const char *defcanvas = gROOT->GetDefCanvasName();
-   char *cdef;
+   TString cdef;
 
    auto lc = (TList*)gROOT->GetListOfCanvases();
    if (lc->FindObject(defcanvas)) {
       Int_t n = lc->GetSize() + 1;
-      cdef = new char[strlen(defcanvas)+15];
       do {
-         strlcpy(cdef,Form("%s_n%d", defcanvas, n++),strlen(defcanvas)+15);
-      } while (lc->FindObject(cdef));
+         cdef.Form("%s_n%d", defcanvas, n++);
+      } while (lc->FindObject(cdef.Data()));
    } else
-      cdef = StrDup(Form("%s",defcanvas));
+      cdef = defcanvas;
 
-   TCanvas *c = new TCanvas(cdef, cdef, 1);
+   TCanvas *c = new TCanvas(cdef.Data(), cdef.Data(), 1);
 
-   ::Info("TCanvas::MakeDefCanvas"," created default TCanvas with name %s",cdef);
-   delete [] cdef;
+   ::Info("TCanvas::MakeDefCanvas"," created default TCanvas with name %s",cdef.Data());
    return c;
 }
 
@@ -1834,32 +1832,25 @@ void TCanvas::SaveSource(const char *filename, Option_t *option)
 
    char quote = '"';
    std::ofstream out;
-   Int_t lenfile = strlen(filename);
-   char * fname;
-   char lcname[10];
+   TString fname;
    const char *cname = GetName();
    Bool_t invalid = kFALSE;
    //    if filename is given, open this file, otherwise create a file
    //    with a name equal to the canvasname.C
-   if (lenfile) {
-      fname = (char*)filename;
-      out.open(fname, std::ios::out);
+   if (filename && (strlen(filename) > 0)) {
+      fname = filename;
    } else {
-      Int_t nch = strlen(cname);
-      if (nch < 10) {
-         strlcpy(lcname,cname,10);
-         for (Int_t k=1;k<=nch;k++) {if (lcname[nch-k] == ' ') lcname[nch-k] = 0;}
-         if (lcname[0] == 0) {invalid = kTRUE; strlcpy(lcname,"c1",10); nch = 2;}
-         cname = lcname;
+      fname = cname;
+      fname = fname.Strip(TString::kBoth);
+      if (fname.IsNull()) {
+         invalid = kTRUE;
+         fname = "c1";
       }
-      fname = new char[nch+3];
-      strlcpy(fname,cname,nch+3);
-      strncat(fname,".C",3);
-      out.open(fname, std::ios::out);
-   }
-   if (!out.good ()) {
-      Error("SaveSource", "Cannot open file: %s",fname);
-      if (!lenfile) delete [] fname;
+      fname.Append(".C");
+   }
+   out.open(fname.Data(), std::ios::out);
+   if (!out.good()) {
+      Error("SaveSource", "Cannot open file: %s", fname.Data());
       return;
    }
 
@@ -1887,7 +1878,7 @@ void TCanvas::SaveSource(const char *filename, Option_t *option)
       topx = 1;    topy = 1;
    }
 
-   TString mname(fname);
+   TString mname = fname;
    out << R"CODE(#ifdef __CLING__
 #pragma cling optimize(0)
 #endif
@@ -1960,14 +1951,13 @@ void TCanvas::SaveSource(const char *filename, Option_t *option)
 
    out <<"}"<<std::endl;
    out.close();
-   Info("SaveSource","C++ Macro file: %s has been generated", fname);
+   Info("SaveSource","C++ Macro file: %s has been generated", fname.Data());
 
    //    reset bit TClass::kClassSaved for all classes
    next.Reset();
    while((cl = (TClass*)next())) {
       cl->ResetBit(TClass::kClassSaved);
    }
-   if (!lenfile) delete [] fname;
 }
 
 ////////////////////////////////////////////////////////////////////////////////