From 2bbcbd3bb15cb556ba1c6df556a3bfcfef097272 Mon Sep 17 00:00:00 2001 From: Raffaella De Vita Date: Fri, 23 Oct 2020 14:26:17 +0200 Subject: [PATCH 1/2] switch to groot 3.0.0 --- common-tools/clas-analysis/pom.xml | 2 +- .../src/main/java/org/jlab/analysis/plotting/TCanvasP.java | 5 +++-- common-tools/clas-detector/pom.xml | 2 +- common-tools/clas-reco/pom.xml | 2 +- reconstruction/cvt/pom.xml | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/common-tools/clas-analysis/pom.xml b/common-tools/clas-analysis/pom.xml index c8f8dc149f..841b21e963 100644 --- a/common-tools/clas-analysis/pom.xml +++ b/common-tools/clas-analysis/pom.xml @@ -60,7 +60,7 @@ org.jlab groot - 2.2.0-SNAPSHOT + 3.0.0-SNAPSHOT diff --git a/common-tools/clas-analysis/src/main/java/org/jlab/analysis/plotting/TCanvasP.java b/common-tools/clas-analysis/src/main/java/org/jlab/analysis/plotting/TCanvasP.java index 3ed8d76755..cbc4a5bb31 100644 --- a/common-tools/clas-analysis/src/main/java/org/jlab/analysis/plotting/TCanvasP.java +++ b/common-tools/clas-analysis/src/main/java/org/jlab/analysis/plotting/TCanvasP.java @@ -21,8 +21,8 @@ public TCanvasP(String name, int xsize, int ysize, int nColumns, int nRows) { this.divide(nColumns, nRows); } - @Override - public void divide(int nColumns, int nRows) { + @Override + public TCanvasP divide(int nColumns, int nRows) { super.divide(nColumns, nRows); this.nColumns = nColumns; this.nRows = nRows; @@ -30,6 +30,7 @@ public void divide(int nColumns, int nRows) { else if(nColumns*nRows > 9 && nColumns*nRows <= 16) setFontSizes(20); else if(nColumns*nRows > 16 && nColumns*nRows <= 25) setFontSizes(16); else setFontSizes(14); + return this; } public void setFontSizes(int size) { diff --git a/common-tools/clas-detector/pom.xml b/common-tools/clas-detector/pom.xml index 16bb8e226d..89e837edef 100644 --- a/common-tools/clas-detector/pom.xml +++ b/common-tools/clas-detector/pom.xml @@ -54,7 +54,7 @@ org.jlab groot - 2.2.0-SNAPSHOT + 3.0.0-SNAPSHOT diff --git a/common-tools/clas-reco/pom.xml b/common-tools/clas-reco/pom.xml index 49d442dde8..42f1ce0b8e 100644 --- a/common-tools/clas-reco/pom.xml +++ b/common-tools/clas-reco/pom.xml @@ -37,7 +37,7 @@ org.jlab groot - 2.2.0-SNAPSHOT + 3.0.0-SNAPSHOT diff --git a/reconstruction/cvt/pom.xml b/reconstruction/cvt/pom.xml index 6ffde39709..fd91f4d54c 100644 --- a/reconstruction/cvt/pom.xml +++ b/reconstruction/cvt/pom.xml @@ -106,7 +106,7 @@ org.jlab groot - 2.2.0-SNAPSHOT + 3.0.0-SNAPSHOT From 3775ffbbc6fd7d60a2e53f8ce8467bc203fb8b9a Mon Sep 17 00:00:00 2001 From: Raffaella De Vita Date: Fri, 23 Oct 2020 14:26:40 +0200 Subject: [PATCH 2/2] version bump --- common-tools/clas-analysis/pom.xml | 14 +++++++------- common-tools/clas-detector/pom.xml | 10 +++++----- common-tools/clas-geometry/pom.xml | 4 ++-- common-tools/clas-io/pom.xml | 6 +++--- common-tools/clas-jcsg/pom.xml | 8 ++++---- common-tools/clas-math/pom.xml | 4 ++-- common-tools/clas-physics/pom.xml | 4 ++-- common-tools/clas-reco/pom.xml | 14 +++++++------- common-tools/clas-utils/pom.xml | 4 ++-- common-tools/cnuphys/ced/pom.xml | 8 ++++---- common-tools/cnuphys/magfield/pom.xml | 2 +- common-tools/cnuphys/swimmer/pom.xml | 2 +- common-tools/coat-lib/deployDistribution.sh | 2 +- common-tools/coat-lib/pom.xml | 20 ++++++++++---------- common-tools/parent/pom.xml | 2 +- common-tools/pom.xml | 4 ++-- common-tools/swim-tools/pom.xml | 6 +++--- parent/pom.xml | 2 +- pom.xml | 4 ++-- reconstruction/band/pom.xml | 2 +- reconstruction/cnd/pom.xml | 2 +- reconstruction/cvt/pom.xml | 10 +++++----- reconstruction/dc/pom.xml | 12 ++++++------ reconstruction/eb/pom.xml | 10 +++++----- reconstruction/ec/pom.xml | 14 +++++++------- reconstruction/ft/pom.xml | 8 ++++---- reconstruction/fvt/pom.xml | 6 +++--- reconstruction/htcc/pom.xml | 8 ++++---- reconstruction/ltcc/pom.xml | 6 +++--- reconstruction/pom.xml | 4 ++-- reconstruction/rich/pom.xml | 8 ++++---- reconstruction/rtpc/pom.xml | 6 +++--- reconstruction/swaps/pom.xml | 12 ++++++------ reconstruction/tof/pom.xml | 4 ++-- 34 files changed, 116 insertions(+), 116 deletions(-) diff --git a/common-tools/clas-analysis/pom.xml b/common-tools/clas-analysis/pom.xml index 841b21e963..600ea9cfc7 100644 --- a/common-tools/clas-analysis/pom.xml +++ b/common-tools/clas-analysis/pom.xml @@ -3,14 +3,14 @@ 4.0.0 org.jlab.clas clas-analysis - 6.5.11-SNAPSHOT + 6.5.12-SNAPSHOT jar org.jlab.clas clas12rec ../../parent/pom.xml - 6.5.11-SNAPSHOT + 6.5.12-SNAPSHOT @@ -30,31 +30,31 @@ org.jlab.clas clas-utils - 6.5.11-SNAPSHOT + 6.5.12-SNAPSHOT org.jlab.clas clas-physics - 6.5.11-SNAPSHOT + 6.5.12-SNAPSHOT org.jlab.clas clas-io - 6.5.11-SNAPSHOT + 6.5.12-SNAPSHOT org.jlab.clas clas-geometry - 6.5.11-SNAPSHOT + 6.5.12-SNAPSHOT org.jlab.clas clas-detector - 6.5.11-SNAPSHOT + 6.5.12-SNAPSHOT diff --git a/common-tools/clas-detector/pom.xml b/common-tools/clas-detector/pom.xml index 89e837edef..5f67f53402 100644 --- a/common-tools/clas-detector/pom.xml +++ b/common-tools/clas-detector/pom.xml @@ -3,14 +3,14 @@ 4.0.0 org.jlab.clas clas-detector - 6.5.11-SNAPSHOT + 6.5.12-SNAPSHOT jar org.jlab.clas clas12rec ../../parent/pom.xml - 6.5.11-SNAPSHOT + 6.5.12-SNAPSHOT @@ -30,7 +30,7 @@ org.jlab.clas clas-utils - 6.5.11-SNAPSHOT + 6.5.12-SNAPSHOT @@ -42,13 +42,13 @@ org.jlab.clas clas-io - 6.5.11-SNAPSHOT + 6.5.12-SNAPSHOT org.jlab.clas clas-geometry - 6.5.11-SNAPSHOT + 6.5.12-SNAPSHOT diff --git a/common-tools/clas-geometry/pom.xml b/common-tools/clas-geometry/pom.xml index cafc6a1782..17bc50ee84 100644 --- a/common-tools/clas-geometry/pom.xml +++ b/common-tools/clas-geometry/pom.xml @@ -3,14 +3,14 @@ 4.0.0 org.jlab.clas clas-geometry - 6.5.11-SNAPSHOT + 6.5.12-SNAPSHOT jar org.jlab.clas clas12rec ../../parent/pom.xml - 6.5.11-SNAPSHOT + 6.5.12-SNAPSHOT diff --git a/common-tools/clas-io/pom.xml b/common-tools/clas-io/pom.xml index 244f4481de..1cee661fc3 100644 --- a/common-tools/clas-io/pom.xml +++ b/common-tools/clas-io/pom.xml @@ -3,14 +3,14 @@ 4.0.0 org.jlab.clas clas-io - 6.5.11-SNAPSHOT + 6.5.12-SNAPSHOT jar org.jlab.clas clas12rec ../../parent/pom.xml - 6.5.11-SNAPSHOT + 6.5.12-SNAPSHOT @@ -75,7 +75,7 @@ org.jlab.clas clas-utils - 6.5.11-SNAPSHOT + 6.5.12-SNAPSHOT diff --git a/common-tools/clas-jcsg/pom.xml b/common-tools/clas-jcsg/pom.xml index 83b33109f4..90045cd2c1 100644 --- a/common-tools/clas-jcsg/pom.xml +++ b/common-tools/clas-jcsg/pom.xml @@ -3,14 +3,14 @@ 4.0.0 org.jlab.clas clas-jcsg - 6.5.11-SNAPSHOT + 6.5.12-SNAPSHOT jar org.jlab.clas clas12rec ../../parent/pom.xml - 6.5.11-SNAPSHOT + 6.5.12-SNAPSHOT @@ -40,12 +40,12 @@ org.jlab.clas clas-geometry - 6.5.11-SNAPSHOT + 6.5.12-SNAPSHOT org.jlab.clas clas-detector - 6.5.11-SNAPSHOT + 6.5.12-SNAPSHOT java3d diff --git a/common-tools/clas-math/pom.xml b/common-tools/clas-math/pom.xml index 62fd5f13d2..9490adeba0 100644 --- a/common-tools/clas-math/pom.xml +++ b/common-tools/clas-math/pom.xml @@ -3,14 +3,14 @@ 4.0.0 org.jlab.clas clas-math - 6.5.11-SNAPSHOT + 6.5.12-SNAPSHOT jar org.jlab.clas clas12rec ../../parent/pom.xml - 6.5.11-SNAPSHOT + 6.5.12-SNAPSHOT diff --git a/common-tools/clas-physics/pom.xml b/common-tools/clas-physics/pom.xml index f4f3e68473..99336706f8 100644 --- a/common-tools/clas-physics/pom.xml +++ b/common-tools/clas-physics/pom.xml @@ -4,7 +4,7 @@ org.jlab.clas clas-physics - 6.5.11-SNAPSHOT + 6.5.12-SNAPSHOT jar @@ -23,7 +23,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 6.5.11-SNAPSHOT + 6.5.12-SNAPSHOT diff --git a/common-tools/clas-reco/pom.xml b/common-tools/clas-reco/pom.xml index 42f1ce0b8e..78220ad47f 100644 --- a/common-tools/clas-reco/pom.xml +++ b/common-tools/clas-reco/pom.xml @@ -3,14 +3,14 @@ 4.0.0 org.jlab.clas clas-reco - 6.5.11-SNAPSHOT + 6.5.12-SNAPSHOT jar org.jlab.clas clas12rec ../../parent/pom.xml - 6.5.11-SNAPSHOT + 6.5.12-SNAPSHOT @@ -67,7 +67,7 @@ org.jlab.clas clas-math - 6.5.11-SNAPSHOT + 6.5.12-SNAPSHOT