From c5ce209c747dc143416141a724d253ee705f6019 Mon Sep 17 00:00:00 2001 From: Raffaella De Vita Date: Wed, 12 Jun 2024 11:26:36 -0400 Subject: [PATCH 01/20] account for the fact the R3 reference wire is ministaggered --- .../main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java b/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java index 45b2d62e68..cace18ff06 100644 --- a/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java +++ b/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java @@ -398,7 +398,7 @@ public Wire(int sector, int isuperl, int layer, int wire) { // hh: wire distance in the wire plane double hh = (wire-1 + ((double)(layer % 2)) / 2.0) * dw2; if(ireg==2 && isSensitiveWire(isuper, layer, wire) && dbref.getMinistaggerStatus()) - hh += ((layer%2)*2-1)*dbref.ministagger(); + hh += ((layer%2)*2)*dbref.ministagger(); // ll: layer distance double tt = dbref.cellthickness(isuper) * dbref.wpdist(isuper); From 5c99b2670483052c23eed465bde0548e936533d0 Mon Sep 17 00:00:00 2001 From: Raffaella De Vita Date: Fri, 5 Jul 2024 14:41:37 -0400 Subject: [PATCH 02/20] accounting for the wire feedthroughs in DC geometry --- .../detector/geant4/v2/DCGeant4Factory.java | 46 +++++++++++++++---- 1 file changed, 38 insertions(+), 8 deletions(-) diff --git a/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java b/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java index cace18ff06..06297cae6b 100644 --- a/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java +++ b/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java @@ -60,7 +60,14 @@ final class DCdatabase { private final String dcdbpath = "/geometry/dc/"; private static DCdatabase instance = null; - private DCdatabase() { + public final double[] xdistBob = {8.250, 16.970, 18.054}; + public final double[] feedThroughExt = {0.55, 0.1, 0.55}; + public final double feedThroughLength = 0.2; + public final double feedThroughRmin = 0.065; + public final double feedThroughRmax = 0.137; + public final double feedThroughRcurv = (Math.pow(feedThroughRmax-feedThroughRmin, 2)+Math.pow(feedThroughLength, 2))/(feedThroughRmax-feedThroughRmin)/2; + + private DCdatabase() { } public static DCdatabase getInstance() { @@ -264,9 +271,9 @@ final class Wire { private final int wire; private final DCdatabase dbref = DCdatabase.getInstance(); - private final Vector3d midpoint; - private final Vector3d center; - private final Vector3d direction; + private Vector3d midpoint; + private Vector3d center; + private Vector3d direction; private Vector3d leftend; private Vector3d rightend; @@ -306,14 +313,15 @@ public Wire rotateZ(double rotZ) { } private void findEnds() { - // define vector from wire midpoint to chamber tip (z is wrong!!) - Vector3d vnum = new Vector3d(0, dbref.xdist(ireg), 0); - vnum.sub(midpoint); double copen = Math.cos(dbref.thopen(ireg) / 2.0); double sopen = Math.sin(dbref.thopen(ireg) / 2.0); - // define unit vector normal to the sides of the chamber and pointing inside + // define vector from wire midpoint to chamber tip projectedonto the z=0 plane + Vector3d vnum = new Vector3d(0, dbref.xdistBob[ireg]+dbref.feedThroughExt[ireg]/copen, 0); + vnum.sub(midpoint); + + // define unit vector normal to the sides of the chamber and pointing inside, projected onto the z=0 plane Vector3d rnorm = new Vector3d(copen, sopen, 0); Vector3d lnorm = new Vector3d(-copen, sopen, 0); @@ -322,6 +330,28 @@ private void findEnds() { double wlenr = vnum.dot(rnorm) / direction.dot(rnorm); rightend = direction.times(wlenr).add(midpoint); + + // define unit vector parallel to the sides of the chamber and pointing to the chamber tip, projected onto the z=0 plane + Vector3d rpar = new Vector3d(sopen, -copen, 0); + Vector3d lpar = new Vector3d(-sopen, -copen, 0); + + // define the center of the circles that describe the trumpet-like part of the feedthrough + Vector3d rcirc = rnorm.times(-dbref.feedThroughLength).add(rpar.times(dbref.feedThroughRmin+dbref.feedThroughRcurv)).add(rightend); + Vector3d lcirc = lnorm.times(-dbref.feedThroughLength).add(lpar.times(dbref.feedThroughRmin+dbref.feedThroughRcurv)).add(leftend); + + // recalculate the wire direction assuming the wire is tangent to the left and right circles + direction = lcirc.minus(rcirc).normalized(); + + // realculate the wire end point + Vector3d rtang = lpar.times(-dbref.feedThroughRcurv).rotateZ(Math.atan2(direction.y, direction.x)).add(rcirc); + midpoint = rtang.plus(direction.times(-rtang.x/direction.x)); + + wlenl = vnum.dot(lnorm) / direction.dot(lnorm); + leftend = direction.times(wlenl).add(midpoint); + + wlenr = vnum.dot(rnorm) / direction.dot(rnorm); + rightend = direction.times(wlenr).add(midpoint); +//if(sector==1)System.out.println( this.sector + " " + this.layer + " " + this.wire + " " + this.midpoint + " " +this.direction + " " + this.leftend + " " + this.rightend); } /** From 9ac021baec77801eb7122c791c76cf540a8b5d5b Mon Sep 17 00:00:00 2001 From: Raffaella De Vita Date: Mon, 8 Jul 2024 17:13:25 -0400 Subject: [PATCH 03/20] account for tilt --- .../detector/geant4/v2/DCGeant4Factory.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java b/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java index 06297cae6b..147bad23df 100644 --- a/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java +++ b/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java @@ -330,20 +330,27 @@ private void findEnds() { double wlenr = vnum.dot(rnorm) / direction.dot(rnorm); rightend = direction.times(wlenr).add(midpoint); - + // define unit vector parallel to the sides of the chamber and pointing to the chamber tip, projected onto the z=0 plane Vector3d rpar = new Vector3d(sopen, -copen, 0); Vector3d lpar = new Vector3d(-sopen, -copen, 0); // define the center of the circles that describe the trumpet-like part of the feedthrough - Vector3d rcirc = rnorm.times(-dbref.feedThroughLength).add(rpar.times(dbref.feedThroughRmin+dbref.feedThroughRcurv)).add(rightend); - Vector3d lcirc = lnorm.times(-dbref.feedThroughLength).add(lpar.times(dbref.feedThroughRmin+dbref.feedThroughRcurv)).add(leftend); + Vector3d rcirc = rnorm.times(-dbref.feedThroughLength).add(rpar.times(dbref.feedThroughRmin+dbref.feedThroughRcurv)).rotateX(-dbref.thtilt(ireg)).add(rightend); + Vector3d lcirc = lnorm.times(-dbref.feedThroughLength).add(lpar.times(dbref.feedThroughRmin+dbref.feedThroughRcurv)).rotateX(-dbref.thtilt(ireg)).add(leftend); // recalculate the wire direction assuming the wire is tangent to the left and right circles direction = lcirc.minus(rcirc).normalized(); // realculate the wire end point - Vector3d rtang = lpar.times(-dbref.feedThroughRcurv).rotateZ(Math.atan2(direction.y, direction.x)).add(rcirc); + Vector3d vperp = rnorm.cross(rpar).rotateX(-dbref.thtilt(ireg)); + Vector3d rperp = rnorm.clone().rotateX(-dbref.thtilt(ireg)); + double ttang = direction.angle(rperp); + Vector3d rtang = rpar.times(-dbref.feedThroughRcurv).rotateX(-dbref.thtilt(ireg)); +// if(sector==1) System.out.println(ttang + " " + rtang); + vperp.rotate(rtang,ttang); +// if(sector==1) System.out.println(ttang + " " + rtang); + rtang.add(rcirc); midpoint = rtang.plus(direction.times(-rtang.x/direction.x)); wlenl = vnum.dot(lnorm) / direction.dot(lnorm); @@ -351,7 +358,7 @@ private void findEnds() { wlenr = vnum.dot(rnorm) / direction.dot(rnorm); rightend = direction.times(wlenr).add(midpoint); -//if(sector==1)System.out.println( this.sector + " " + this.layer + " " + this.wire + " " + this.midpoint + " " +this.direction + " " + this.leftend + " " + this.rightend); +//if(sector==1)System.out.println( this.sector + " " + this.layer + " " + this.wire + " " + this.midpoint + " " + Math.toDegrees(Math.atan2(direction.y, direction.x)) + " " + this.direction + " " + this.leftend + " " + this.rightend); } /** From 7cd92ebdc36ebd77ebd8d0da539161901a96890e Mon Sep 17 00:00:00 2001 From: Raffaella De Vita Date: Tue, 9 Jul 2024 16:44:35 -0400 Subject: [PATCH 04/20] account for tilt --- .../jlab/detector/geant4/v2/DCGeant4Factory.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java b/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java index 147bad23df..3dad4470c1 100644 --- a/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java +++ b/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java @@ -330,6 +330,7 @@ private void findEnds() { double wlenr = vnum.dot(rnorm) / direction.dot(rnorm); rightend = direction.times(wlenr).add(midpoint); +//if(sector==1)System.out.println( this.sector + " " + this.layer + " " + this.wire + " " + this.midpoint + " " + Math.toDegrees(Math.acos(direction.x))*Math.signum(direction.y) + " " + this.direction + " " + this.leftend + " " + this.rightend); // define unit vector parallel to the sides of the chamber and pointing to the chamber tip, projected onto the z=0 plane Vector3d rpar = new Vector3d(sopen, -copen, 0); @@ -345,12 +346,14 @@ private void findEnds() { // realculate the wire end point Vector3d vperp = rnorm.cross(rpar).rotateX(-dbref.thtilt(ireg)); Vector3d rperp = rnorm.clone().rotateX(-dbref.thtilt(ireg)); - double ttang = direction.angle(rperp); + Vector3d lperp = lnorm.clone().rotateX(-dbref.thtilt(ireg)); Vector3d rtang = rpar.times(-dbref.feedThroughRcurv).rotateX(-dbref.thtilt(ireg)); -// if(sector==1) System.out.println(ttang + " " + rtang); - vperp.rotate(rtang,ttang); -// if(sector==1) System.out.println(ttang + " " + rtang); - rtang.add(rcirc); + double rangle = direction.angle(rperp); + double langle = direction.negated().angle(lperp); +// if(sector==1) System.out.println(Math.toDegrees(langle) + " " + Math.toDegrees(rangle) + " " + rtang); + vperp.rotate(rtang,rangle); +// if(sector==1) System.out.println(Math.toDegrees(langle) + " " + Math.toDegrees(rangle) + " " + rtang); + rtang = rtang.add(rcirc); midpoint = rtang.plus(direction.times(-rtang.x/direction.x)); wlenl = vnum.dot(lnorm) / direction.dot(lnorm); @@ -358,7 +361,7 @@ private void findEnds() { wlenr = vnum.dot(rnorm) / direction.dot(rnorm); rightend = direction.times(wlenr).add(midpoint); -//if(sector==1)System.out.println( this.sector + " " + this.layer + " " + this.wire + " " + this.midpoint + " " + Math.toDegrees(Math.atan2(direction.y, direction.x)) + " " + this.direction + " " + this.leftend + " " + this.rightend); +//if(sector==1)System.out.println( this.sector + " " + this.layer + " " + this.wire + " " + this.midpoint + " " + Math.toDegrees(Math.acos(direction.x))*Math.signum(direction.y) + " " + this.direction + " " + this.leftend + " " + this.rightend); } /** From 3c0af40769a3afcd9f0b497da4f8cb2ae156a4b9 Mon Sep 17 00:00:00 2001 From: Raffaella De Vita Date: Wed, 10 Jul 2024 10:35:06 -0400 Subject: [PATCH 05/20] account for tilt --- .../org/jlab/detector/geant4/v2/DCGeant4Factory.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java b/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java index 3dad4470c1..27165cdf47 100644 --- a/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java +++ b/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java @@ -330,7 +330,7 @@ private void findEnds() { double wlenr = vnum.dot(rnorm) / direction.dot(rnorm); rightend = direction.times(wlenr).add(midpoint); -//if(sector==1)System.out.println( this.sector + " " + this.layer + " " + this.wire + " " + this.midpoint + " " + Math.toDegrees(Math.acos(direction.x))*Math.signum(direction.y) + " " + this.direction + " " + this.leftend + " " + this.rightend); +//if(sector==1)System.out.println( this.sector + " " + this.layer + " " + this.wire + " " + this.midpoint.clone().rotateX(dbref.thtilt(ireg)) + " " + Math.toDegrees(Math.acos(direction.x))*Math.signum(direction.y) + " " + this.direction.clone().rotateX(dbref.thtilt(ireg)) + " " + this.leftend.clone().rotateX(dbref.thtilt(ireg)) + " " + this.rightend.clone().rotateX(dbref.thtilt(ireg))); // define unit vector parallel to the sides of the chamber and pointing to the chamber tip, projected onto the z=0 plane Vector3d rpar = new Vector3d(sopen, -copen, 0); @@ -341,27 +341,27 @@ private void findEnds() { Vector3d lcirc = lnorm.times(-dbref.feedThroughLength).add(lpar.times(dbref.feedThroughRmin+dbref.feedThroughRcurv)).rotateX(-dbref.thtilt(ireg)).add(leftend); // recalculate the wire direction assuming the wire is tangent to the left and right circles - direction = lcirc.minus(rcirc).normalized(); + Vector3d direction1 = lcirc.minus(rcirc).normalized(); // realculate the wire end point Vector3d vperp = rnorm.cross(rpar).rotateX(-dbref.thtilt(ireg)); Vector3d rperp = rnorm.clone().rotateX(-dbref.thtilt(ireg)); Vector3d lperp = lnorm.clone().rotateX(-dbref.thtilt(ireg)); Vector3d rtang = rpar.times(-dbref.feedThroughRcurv).rotateX(-dbref.thtilt(ireg)); - double rangle = direction.angle(rperp); - double langle = direction.negated().angle(lperp); + double rangle = direction1.angle(rperp); + double langle = direction1.negated().angle(lperp); // if(sector==1) System.out.println(Math.toDegrees(langle) + " " + Math.toDegrees(rangle) + " " + rtang); vperp.rotate(rtang,rangle); // if(sector==1) System.out.println(Math.toDegrees(langle) + " " + Math.toDegrees(rangle) + " " + rtang); rtang = rtang.add(rcirc); - midpoint = rtang.plus(direction.times(-rtang.x/direction.x)); + midpoint = rtang.plus(direction1.times(-rtang.x/direction1.x)); wlenl = vnum.dot(lnorm) / direction.dot(lnorm); leftend = direction.times(wlenl).add(midpoint); wlenr = vnum.dot(rnorm) / direction.dot(rnorm); rightend = direction.times(wlenr).add(midpoint); -//if(sector==1)System.out.println( this.sector + " " + this.layer + " " + this.wire + " " + this.midpoint + " " + Math.toDegrees(Math.acos(direction.x))*Math.signum(direction.y) + " " + this.direction + " " + this.leftend + " " + this.rightend); +//if(sector==1)System.out.println( this.sector + " " + this.layer + " " + this.wire + " " + this.midpoint.clone().rotateX(dbref.thtilt(ireg)) + " " + Math.toDegrees(Math.acos(direction.x))*Math.signum(direction.y) + " " + this.direction.clone().rotateX(dbref.thtilt(ireg)) + " " + this.leftend.clone().rotateX(dbref.thtilt(ireg)) + " " + this.rightend.clone().rotateX(dbref.thtilt(ireg))); } /** From 270b6b29415e47798edd90447daa56b434372eca Mon Sep 17 00:00:00 2001 From: Raffaella De Vita Date: Tue, 16 Jul 2024 19:14:36 -0400 Subject: [PATCH 06/20] moved feedthrough parameters to CCDB, code cleanups --- .../jlab/detector/base/GeometryFactory.java | 1 + .../detector/geant4/v2/DCGeant4Factory.java | 135 +++++++++++++++--- 2 files changed, 119 insertions(+), 17 deletions(-) diff --git a/common-tools/clas-detector/src/main/java/org/jlab/detector/base/GeometryFactory.java b/common-tools/clas-detector/src/main/java/org/jlab/detector/base/GeometryFactory.java index 6a14e9c452..6b3ab66f88 100644 --- a/common-tools/clas-detector/src/main/java/org/jlab/detector/base/GeometryFactory.java +++ b/common-tools/clas-detector/src/main/java/org/jlab/detector/base/GeometryFactory.java @@ -48,6 +48,7 @@ public static ConstantProvider getConstants(DetectorType type, int run, String v provider.loadTable("/geometry/dc/alignment"); provider.loadTable("/geometry/dc/ministagger"); provider.loadTable("/geometry/dc/endplatesbow"); + provider.loadTable("/geometry/dc/feedthroughs"); } if(type==DetectorType.ECAL){ diff --git a/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java b/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java index 27165cdf47..391335d916 100644 --- a/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java +++ b/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java @@ -2,6 +2,8 @@ import eu.mihosoft.vrl.v3d.Vector3d; import java.util.HashMap; +import org.jlab.detector.base.DetectorType; +import org.jlab.detector.base.GeometryFactory; import org.jlab.detector.units.SystemOfUnits.Length; import org.jlab.detector.volume.G4Trap; import org.jlab.detector.volume.G4World; @@ -61,11 +63,12 @@ final class DCdatabase { private static DCdatabase instance = null; public final double[] xdistBob = {8.250, 16.970, 18.054}; - public final double[] feedThroughExt = {0.55, 0.1, 0.55}; - public final double feedThroughLength = 0.2; - public final double feedThroughRmin = 0.065; - public final double feedThroughRmax = 0.137; - public final double feedThroughRcurv = (Math.pow(feedThroughRmax-feedThroughRmin, 2)+Math.pow(feedThroughLength, 2))/(feedThroughRmax-feedThroughRmin)/2; + private final double[][] feedThroughExt = new double[nSectors][nSupers]; + private final double[][] feedThroughLength = new double[nSectors][nSupers]; + private final double[][] feedThroughRmin = new double[nSectors][nSupers]; + private final double[][] feedThroughRmax = new double[nSectors][nSupers]; + private final double[][] feedThroughRcurv = new double[nSectors][nSupers];//(Math.pow(feedThroughRmax-feedThroughRmin, 2)+Math.pow(feedThroughLength, 2))/(feedThroughRmax-feedThroughRmin)/2; + private int feedthroughsStatus = 1; private DCdatabase() { } @@ -107,6 +110,17 @@ public void connect(ConstantProvider cp, double[][] shifts) { superwidth[isuper] = wpdist[isuper] * (nsenselayers[isuper] + nguardlayers[isuper] - 1) * cellthickness[isuper]; } + int feedthroughrows = cp.length(dcdbpath+"feedthroughs/sector"); + for(int irow = 0; irow< feedthroughrows; irow++) { + int isec = cp.getInteger(dcdbpath + "feedthroughs/sector",irow)-1; + int isl = cp.getInteger(dcdbpath + "feedthroughs/superlayer",irow)-1; + feedThroughExt[isec][isl] = cp.getDouble(dcdbpath + "feedthroughs/extension", irow); + feedThroughLength[isec][isl] = cp.getDouble(dcdbpath + "feedthroughs/length", irow); + feedThroughRmin[isec][isl] = cp.getDouble(dcdbpath + "feedthroughs/rmin", irow); + feedThroughRmax[isec][isl] = cp.getDouble(dcdbpath + "feedthroughs/rmax", irow); + feedThroughRcurv[isec][isl] = (Math.pow(feedThroughRmax[isec][isl]-feedThroughRmin[isec][isl], 2)+Math.pow(feedThroughLength[isec][isl], 2)) + /(feedThroughRmax[isec][isl]-feedThroughRmin[isec][isl])/2; + } double scaleTest=1; int alignrows = cp.length(dcdbpath+"alignment/dx"); for(int irow = 0; irow< alignrows; irow++) { @@ -244,6 +258,34 @@ public void setEndPlatesStatus(boolean endplatesStatus) { public boolean getEndPlatesStatus(){ return endplatesStatus; } + + public int feedthroughsStatus() { + return feedthroughsStatus; + } + + public void setFeedthroughsStatus(int feedthroughsStatus) { + this.feedthroughsStatus = feedthroughsStatus; + } + + public double feedThroughExt(int isec, int isl) { + return feedThroughExt[isec][isl]; + } + + public double feedThroughLength(int isec, int isl) { + return feedThroughLength[isec][isl]; + } + + public double feedThroughRmin(int isec, int isl) { + return feedThroughRmin[isec][isl]; + } + + public double feedThroughRmax(int isec, int isl) { + return feedThroughRmax[isec][isl]; + } + + public double feedThroughRcurv(int isec, int isl) { + return feedThroughRcurv[isec][isl]; + } public double getAlignmentThetaX(int isec, int ireg) { return align_dthetax[isec][ireg]; @@ -318,7 +360,7 @@ private void findEnds() { double sopen = Math.sin(dbref.thopen(ireg) / 2.0); // define vector from wire midpoint to chamber tip projectedonto the z=0 plane - Vector3d vnum = new Vector3d(0, dbref.xdistBob[ireg]+dbref.feedThroughExt[ireg]/copen, 0); + Vector3d vnum = new Vector3d(0, dbref.xdist(ireg)+dbref.feedThroughExt(sector-1,isuper)/copen, 0); vnum.sub(midpoint); // define unit vector normal to the sides of the chamber and pointing inside, projected onto the z=0 plane @@ -330,29 +372,32 @@ private void findEnds() { double wlenr = vnum.dot(rnorm) / direction.dot(rnorm); rightend = direction.times(wlenr).add(midpoint); -//if(sector==1)System.out.println( this.sector + " " + this.layer + " " + this.wire + " " + this.midpoint.clone().rotateX(dbref.thtilt(ireg)) + " " + Math.toDegrees(Math.acos(direction.x))*Math.signum(direction.y) + " " + this.direction.clone().rotateX(dbref.thtilt(ireg)) + " " + this.leftend.clone().rotateX(dbref.thtilt(ireg)) + " " + this.rightend.clone().rotateX(dbref.thtilt(ireg))); + + if(dbref.feedthroughsStatus()==0) return; // define unit vector parallel to the sides of the chamber and pointing to the chamber tip, projected onto the z=0 plane Vector3d rpar = new Vector3d(sopen, -copen, 0); Vector3d lpar = new Vector3d(-sopen, -copen, 0); // define the center of the circles that describe the trumpet-like part of the feedthrough - Vector3d rcirc = rnorm.times(-dbref.feedThroughLength).add(rpar.times(dbref.feedThroughRmin+dbref.feedThroughRcurv)).rotateX(-dbref.thtilt(ireg)).add(rightend); - Vector3d lcirc = lnorm.times(-dbref.feedThroughLength).add(lpar.times(dbref.feedThroughRmin+dbref.feedThroughRcurv)).rotateX(-dbref.thtilt(ireg)).add(leftend); - + Vector3d rcirc = rnorm.times(-dbref.feedThroughLength(sector-1, isuper)).add(rpar.times(dbref.feedThroughRmin(sector-1, isuper)+dbref.feedThroughRcurv(sector-1, isuper))).rotateX(-dbref.thtilt(ireg)).add(rightend); + Vector3d lcirc = lnorm.times(-dbref.feedThroughLength(sector-1, isuper)).add(lpar.times(dbref.feedThroughRmin(sector-1, isuper)+dbref.feedThroughRcurv(sector-1, isuper))).rotateX(-dbref.thtilt(ireg)).add(leftend); + // recalculate the wire direction assuming the wire is tangent to the left and right circles Vector3d direction1 = lcirc.minus(rcirc).normalized(); + + if(dbref.feedthroughsStatus()!=1) + direction = direction1; - // realculate the wire end point + // recalculate the wire end point Vector3d vperp = rnorm.cross(rpar).rotateX(-dbref.thtilt(ireg)); Vector3d rperp = rnorm.clone().rotateX(-dbref.thtilt(ireg)); Vector3d lperp = lnorm.clone().rotateX(-dbref.thtilt(ireg)); - Vector3d rtang = rpar.times(-dbref.feedThroughRcurv).rotateX(-dbref.thtilt(ireg)); + Vector3d rtang = rpar.times(-dbref.feedThroughRcurv(sector-1, isuper)).rotateX(-dbref.thtilt(ireg)); double rangle = direction1.angle(rperp); double langle = direction1.negated().angle(lperp); -// if(sector==1) System.out.println(Math.toDegrees(langle) + " " + Math.toDegrees(rangle) + " " + rtang); +// System.out.println(lcirc + " " + rcirc + direction1 + " " + rangle + " " + rtang); vperp.rotate(rtang,rangle); -// if(sector==1) System.out.println(Math.toDegrees(langle) + " " + Math.toDegrees(rangle) + " " + rtang); rtang = rtang.add(rcirc); midpoint = rtang.plus(direction1.times(-rtang.x/direction1.x)); @@ -361,7 +406,15 @@ private void findEnds() { wlenr = vnum.dot(rnorm) / direction.dot(rnorm); rightend = direction.times(wlenr).add(midpoint); -//if(sector==1)System.out.println( this.sector + " " + this.layer + " " + this.wire + " " + this.midpoint.clone().rotateX(dbref.thtilt(ireg)) + " " + Math.toDegrees(Math.acos(direction.x))*Math.signum(direction.y) + " " + this.direction.clone().rotateX(dbref.thtilt(ireg)) + " " + this.leftend.clone().rotateX(dbref.thtilt(ireg)) + " " + this.rightend.clone().rotateX(dbref.thtilt(ireg))); +// if(sector==1&&(wire==0||wire==112)) { +// System.out.println( this.sector + " " + (this.layer+this.isuper*6) + " " + this.wire + " " + +// Math.toDegrees(Math.acos(direction.x))*Math.signum(direction.y) + " " + +// this.midpoint.clone().rotateX(dbref.thtilt(ireg)) + " " + +// this.direction.clone().rotateX(dbref.thtilt(ireg)) + " " + +// this.leftend.clone().rotateX(dbref.thtilt(ireg)) + " " + +// this.rightend.clone().rotateX(dbref.thtilt(ireg))); +// System.out.println(); +// } } /** @@ -534,20 +587,33 @@ public final class DCGeant4Factory extends Geant4Factory { /////////////////////////////////////////////////// public DCGeant4Factory(ConstantProvider provider) { - this(provider, MINISTAGGEROFF, ENDPLATESBOWOFF, null); + this(provider, MINISTAGGEROFF, 0, ENDPLATESBOWOFF, null); } /////////////////////////////////////////////////// public DCGeant4Factory(ConstantProvider provider, boolean ministaggerStatus, boolean endplatesStatus) { - this(provider, ministaggerStatus, endplatesStatus, null); + this(provider, ministaggerStatus, 0, endplatesStatus, null); + } + + /////////////////////////////////////////////////// + public DCGeant4Factory(ConstantProvider provider, boolean ministaggerStatus, + int feedthroughsStatus) { + this(provider, ministaggerStatus, feedthroughsStatus, false, null); } /////////////////////////////////////////////////// public DCGeant4Factory(ConstantProvider provider, boolean ministaggerStatus, boolean endplatesStatus, double[][] shifts) { + this(provider, ministaggerStatus, 1, endplatesStatus, null); + } + + /////////////////////////////////////////////////// + public DCGeant4Factory(ConstantProvider provider, boolean ministaggerStatus, + int feedthroughStatus, boolean endplatesStatus, double[][] shifts) { dbref.setMinistaggerStatus(ministaggerStatus); dbref.setEndPlatesStatus(endplatesStatus); + dbref.setFeedthroughsStatus(feedthroughStatus); motherVolume = new G4World("fc"); @@ -810,4 +876,39 @@ public void printWires(){ } } */ + + public static void main(String[] args) { + + ConstantProvider provider = GeometryFactory.getConstants(DetectorType.DC, 11, "rgd_fall2023"); + DCGeant4Factory dc0 = new DCGeant4Factory(provider, DCGeant4Factory.MINISTAGGERON, 0); + DCGeant4Factory dc1 = new DCGeant4Factory(provider, DCGeant4Factory.MINISTAGGERON, 1); + DCGeant4Factory dc2 = new DCGeant4Factory(provider, DCGeant4Factory.MINISTAGGERON, 2); + + for(int il=0; il<36; il++) { + for(int iw=0; iw<112; iw=iw+111) { + int sector = 1; + int layer = il+1; + int wire = iw+1; + int isuper = il/6; + int ilayer = il%6; + + + System.out.println(sector + " " + layer + " " + wire + " " + + dc0.getWireMidpoint(isuper, ilayer, iw) + " " + + dc0.getWireDirection(isuper, ilayer, iw) + " " + + dc0.getWireLeftend(isuper, ilayer, iw) + " " + + dc0.getWireRightend(isuper, ilayer, iw) + " "); + System.out.println(sector + " " + layer + " " + wire + " " + + dc1.getWireMidpoint(isuper, ilayer, iw) + " " + + dc1.getWireDirection(isuper, ilayer, iw) + " " + + dc1.getWireLeftend(isuper, ilayer, iw) + " " + + dc1.getWireRightend(isuper, ilayer, iw) + " "); + System.out.println(sector + " " + layer + " " + wire + " " + + dc2.getWireMidpoint(isuper, ilayer, iw) + " " + + dc2.getWireDirection(isuper, ilayer, iw) + " " + + dc2.getWireLeftend(isuper, ilayer, iw) + " " + + dc2.getWireRightend(isuper, ilayer, iw) + " "); + } + } + } } From 4ecc1d78fa68e8fda682633d51091b4741f24b20 Mon Sep 17 00:00:00 2001 From: Raffaella De Vita Date: Tue, 16 Jul 2024 21:59:37 -0400 Subject: [PATCH 07/20] removed unnecessary code --- .../detector/geant4/v2/DCGeant4Factory.java | 35 +++---------------- 1 file changed, 5 insertions(+), 30 deletions(-) diff --git a/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java b/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java index 391335d916..1abf447786 100644 --- a/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java +++ b/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java @@ -62,12 +62,12 @@ final class DCdatabase { private final String dcdbpath = "/geometry/dc/"; private static DCdatabase instance = null; - public final double[] xdistBob = {8.250, 16.970, 18.054}; +// public final double[] xdistBob = {8.250, 16.970, 18.054}; private final double[][] feedThroughExt = new double[nSectors][nSupers]; private final double[][] feedThroughLength = new double[nSectors][nSupers]; private final double[][] feedThroughRmin = new double[nSectors][nSupers]; private final double[][] feedThroughRmax = new double[nSectors][nSupers]; - private final double[][] feedThroughRcurv = new double[nSectors][nSupers];//(Math.pow(feedThroughRmax-feedThroughRmin, 2)+Math.pow(feedThroughLength, 2))/(feedThroughRmax-feedThroughRmin)/2; + private final double[][] feedThroughRcurv = new double[nSectors][nSupers]; private int feedthroughsStatus = 1; private DCdatabase() { @@ -587,33 +587,20 @@ public final class DCGeant4Factory extends Geant4Factory { /////////////////////////////////////////////////// public DCGeant4Factory(ConstantProvider provider) { - this(provider, MINISTAGGEROFF, 0, ENDPLATESBOWOFF, null); + this(provider, MINISTAGGEROFF, ENDPLATESBOWOFF, null); } /////////////////////////////////////////////////// public DCGeant4Factory(ConstantProvider provider, boolean ministaggerStatus, boolean endplatesStatus) { - this(provider, ministaggerStatus, 0, endplatesStatus, null); - } - - /////////////////////////////////////////////////// - public DCGeant4Factory(ConstantProvider provider, boolean ministaggerStatus, - int feedthroughsStatus) { - this(provider, ministaggerStatus, feedthroughsStatus, false, null); + this(provider, ministaggerStatus, endplatesStatus, null); } /////////////////////////////////////////////////// public DCGeant4Factory(ConstantProvider provider, boolean ministaggerStatus, boolean endplatesStatus, double[][] shifts) { - this(provider, ministaggerStatus, 1, endplatesStatus, null); - } - - /////////////////////////////////////////////////// - public DCGeant4Factory(ConstantProvider provider, boolean ministaggerStatus, - int feedthroughStatus, boolean endplatesStatus, double[][] shifts) { dbref.setMinistaggerStatus(ministaggerStatus); dbref.setEndPlatesStatus(endplatesStatus); - dbref.setFeedthroughsStatus(feedthroughStatus); motherVolume = new G4World("fc"); @@ -880,9 +867,7 @@ public void printWires(){ public static void main(String[] args) { ConstantProvider provider = GeometryFactory.getConstants(DetectorType.DC, 11, "rgd_fall2023"); - DCGeant4Factory dc0 = new DCGeant4Factory(provider, DCGeant4Factory.MINISTAGGERON, 0); - DCGeant4Factory dc1 = new DCGeant4Factory(provider, DCGeant4Factory.MINISTAGGERON, 1); - DCGeant4Factory dc2 = new DCGeant4Factory(provider, DCGeant4Factory.MINISTAGGERON, 2); + DCGeant4Factory dc0 = new DCGeant4Factory(provider, DCGeant4Factory.MINISTAGGERON, false); for(int il=0; il<36; il++) { for(int iw=0; iw<112; iw=iw+111) { @@ -898,16 +883,6 @@ public static void main(String[] args) { dc0.getWireDirection(isuper, ilayer, iw) + " " + dc0.getWireLeftend(isuper, ilayer, iw) + " " + dc0.getWireRightend(isuper, ilayer, iw) + " "); - System.out.println(sector + " " + layer + " " + wire + " " + - dc1.getWireMidpoint(isuper, ilayer, iw) + " " + - dc1.getWireDirection(isuper, ilayer, iw) + " " + - dc1.getWireLeftend(isuper, ilayer, iw) + " " + - dc1.getWireRightend(isuper, ilayer, iw) + " "); - System.out.println(sector + " " + layer + " " + wire + " " + - dc2.getWireMidpoint(isuper, ilayer, iw) + " " + - dc2.getWireDirection(isuper, ilayer, iw) + " " + - dc2.getWireLeftend(isuper, ilayer, iw) + " " + - dc2.getWireRightend(isuper, ilayer, iw) + " "); } } } From 60b26357213ebdb0938b57b604224d6f83296b9e Mon Sep 17 00:00:00 2001 From: Raffaella De Vita Date: Wed, 17 Jul 2024 11:50:19 -0400 Subject: [PATCH 08/20] more cleanups and comments --- .../detector/geant4/v2/DCGeant4Factory.java | 79 +++++++++++-------- 1 file changed, 46 insertions(+), 33 deletions(-) diff --git a/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java b/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java index 1abf447786..d676060132 100644 --- a/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java +++ b/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java @@ -62,13 +62,12 @@ final class DCdatabase { private final String dcdbpath = "/geometry/dc/"; private static DCdatabase instance = null; -// public final double[] xdistBob = {8.250, 16.970, 18.054}; - private final double[][] feedThroughExt = new double[nSectors][nSupers]; - private final double[][] feedThroughLength = new double[nSectors][nSupers]; - private final double[][] feedThroughRmin = new double[nSectors][nSupers]; - private final double[][] feedThroughRmax = new double[nSectors][nSupers]; - private final double[][] feedThroughRcurv = new double[nSectors][nSupers]; - private int feedthroughsStatus = 1; + private final double[][] feedThroughExt = new double[nSectors][nSupers]; // extension from the endplate, inside the chamber volume + private final double[][] feedThroughLength = new double[nSectors][nSupers]; // length of the curved, trumpet-like, part of the feedthrough + private final double[][] feedThroughRmin = new double[nSectors][nSupers]; // inner radius at the beginning of the curved part + private final double[][] feedThroughRmax = new double[nSectors][nSupers]; // inner radius at the end of the curved part, i.e. on the surface + private final double[][] feedThroughRcurv = new double[nSectors][nSupers]; // curvature radius of the trumpet-like part + private int feedthroughsStatus = 1; // 0-ignore the feedthrough, 1-sccount for the shift of the wire midpoint, 2-acccount for both shift and tilt private DCdatabase() { } @@ -359,17 +358,18 @@ private void findEnds() { double copen = Math.cos(dbref.thopen(ireg) / 2.0); double sopen = Math.sin(dbref.thopen(ireg) / 2.0); - // define vector from wire midpoint to chamber tip projectedonto the z=0 plane + // define vector from wire midpoint to chamber tip projected onto the z=0 plane Vector3d vnum = new Vector3d(0, dbref.xdist(ireg)+dbref.feedThroughExt(sector-1,isuper)/copen, 0); vnum.sub(midpoint); - // define unit vector normal to the sides of the chamber and pointing inside, projected onto the z=0 plane + // define unit vector normal to the endplates of the chamber and pointing inside, projected onto the z=0 plane Vector3d rnorm = new Vector3d(copen, sopen, 0); Vector3d lnorm = new Vector3d(-copen, sopen, 0); + // calculate the end points, exploiting the identity between the component perpendicular to the end plates + // of the vector connecting the chamber tip to the midpoint and the vector connecting the midpoint annd the endpoint double wlenl = vnum.dot(lnorm) / direction.dot(lnorm); leftend = direction.times(wlenl).add(midpoint); - double wlenr = vnum.dot(rnorm) / direction.dot(rnorm); rightend = direction.times(wlenr).add(midpoint); @@ -384,37 +384,32 @@ private void findEnds() { Vector3d lcirc = lnorm.times(-dbref.feedThroughLength(sector-1, isuper)).add(lpar.times(dbref.feedThroughRmin(sector-1, isuper)+dbref.feedThroughRcurv(sector-1, isuper))).rotateX(-dbref.thtilt(ireg)).add(leftend); // recalculate the wire direction assuming the wire is tangent to the left and right circles - Vector3d direction1 = lcirc.minus(rcirc).normalized(); + Vector3d newDirection = lcirc.minus(rcirc).normalized(); - if(dbref.feedthroughsStatus()!=1) - direction = direction1; + // update the wire direction only if the flag is >1 + if(dbref.feedthroughsStatus()>1) + direction = newDirection; - // recalculate the wire end point - Vector3d vperp = rnorm.cross(rpar).rotateX(-dbref.thtilt(ireg)); - Vector3d rperp = rnorm.clone().rotateX(-dbref.thtilt(ireg)); - Vector3d lperp = lnorm.clone().rotateX(-dbref.thtilt(ireg)); - Vector3d rtang = rpar.times(-dbref.feedThroughRcurv(sector-1, isuper)).rotateX(-dbref.thtilt(ireg)); - double rangle = direction1.angle(rperp); - double langle = direction1.negated().angle(lperp); -// System.out.println(lcirc + " " + rcirc + direction1 + " " + rangle + " " + rtang); + // recalculate the wire end point in the sector frame + Vector3d vperp = rnorm.cross(rpar).rotateX(-dbref.thtilt(ireg)); // unit vector perpendicular to the layer plane, pointing downstream + Vector3d rperp = rnorm.clone().rotateX(-dbref.thtilt(ireg)); // unit vector perpendicular to the right endplate + Vector3d lperp = lnorm.clone().rotateX(-dbref.thtilt(ireg)); // unit vector perpendicular to the left endplate + Vector3d rtang = rpar.times(-dbref.feedThroughRcurv(sector-1, isuper)).rotateX(-dbref.thtilt(ireg)); // vector connecting the circle center and the point at the beginning of the trumpet-like part + double rangle = newDirection.angle(rperp); + double langle = newDirection.negated().angle(lperp); + // rotate rtang to get to the point where the wire is tangent to the circle vperp.rotate(rtang,rangle); rtang = rtang.add(rcirc); - midpoint = rtang.plus(direction1.times(-rtang.x/direction1.x)); + // recalculate the wire midpoint + midpoint = rtang.plus(newDirection.times(-rtang.x/newDirection.x)); + // recalculate the wire endpoints + vnum = new Vector3d(0, dbref.xdist(ireg)+dbref.feedThroughExt(sector-1,isuper)/copen, 0); + vnum.sub(midpoint); wlenl = vnum.dot(lnorm) / direction.dot(lnorm); leftend = direction.times(wlenl).add(midpoint); - wlenr = vnum.dot(rnorm) / direction.dot(rnorm); rightend = direction.times(wlenr).add(midpoint); -// if(sector==1&&(wire==0||wire==112)) { -// System.out.println( this.sector + " " + (this.layer+this.isuper*6) + " " + this.wire + " " + -// Math.toDegrees(Math.acos(direction.x))*Math.signum(direction.y) + " " + -// this.midpoint.clone().rotateX(dbref.thtilt(ireg)) + " " + -// this.direction.clone().rotateX(dbref.thtilt(ireg)) + " " + -// this.leftend.clone().rotateX(dbref.thtilt(ireg)) + " " + -// this.rightend.clone().rotateX(dbref.thtilt(ireg))); -// System.out.println(); -// } } /** @@ -866,8 +861,13 @@ public void printWires(){ public static void main(String[] args) { - ConstantProvider provider = GeometryFactory.getConstants(DetectorType.DC, 11, "rgd_fall2023"); + ConstantProvider provider = GeometryFactory.getConstants(DetectorType.DC, 11, "default"); + DCdatabase.getInstance().setFeedthroughsStatus(0); DCGeant4Factory dc0 = new DCGeant4Factory(provider, DCGeant4Factory.MINISTAGGERON, false); + DCdatabase.getInstance().setFeedthroughsStatus(1); + DCGeant4Factory dc1 = new DCGeant4Factory(provider, DCGeant4Factory.MINISTAGGERON, false); + DCdatabase.getInstance().setFeedthroughsStatus(2); + DCGeant4Factory dc2 = new DCGeant4Factory(provider, DCGeant4Factory.MINISTAGGERON, false); for(int il=0; il<36; il++) { for(int iw=0; iw<112; iw=iw+111) { @@ -879,10 +879,23 @@ public static void main(String[] args) { System.out.println(sector + " " + layer + " " + wire + " " + + Math.toDegrees(Math.acos(-dc0.getWireDirection(isuper, ilayer, iw).y))*Math.signum(dc0.getWireDirection(isuper, ilayer, iw).x) + " " + dc0.getWireMidpoint(isuper, ilayer, iw) + " " + dc0.getWireDirection(isuper, ilayer, iw) + " " + dc0.getWireLeftend(isuper, ilayer, iw) + " " + dc0.getWireRightend(isuper, ilayer, iw) + " "); + System.out.println(sector + " " + layer + " " + wire + " " + + Math.toDegrees(Math.acos(-dc1.getWireDirection(isuper, ilayer, iw).y))*Math.signum(dc1.getWireDirection(isuper, ilayer, iw).x) + " " + + dc1.getWireMidpoint(isuper, ilayer, iw) + " " + + dc1.getWireDirection(isuper, ilayer, iw) + " " + + dc1.getWireLeftend(isuper, ilayer, iw) + " " + + dc1.getWireRightend(isuper, ilayer, iw) + " "); + System.out.println(sector + " " + layer + " " + wire + " " + + Math.toDegrees(Math.acos(-dc2.getWireDirection(isuper, ilayer, iw).y))*Math.signum(dc2.getWireDirection(isuper, ilayer, iw).x) + " " + + dc2.getWireMidpoint(isuper, ilayer, iw) + " " + + dc2.getWireDirection(isuper, ilayer, iw) + " " + + dc2.getWireLeftend(isuper, ilayer, iw) + " " + + dc2.getWireRightend(isuper, ilayer, iw) + " "); } } } From 2b3012056729332560523ef59245887a91839718 Mon Sep 17 00:00:00 2001 From: Raffaella De Vita Date: Tue, 23 Jul 2024 17:43:50 -0400 Subject: [PATCH 09/20] introduced yaml variables to turn on/off ministagger and feedthrough fixes gor compatibility with old alignment --- .../detector/geant4/v2/DCGeant4Factory.java | 131 ++++++++++++++---- .../jlab/detector/geom/dc/DCGeantFactory.java | 2 +- .../main/java/org/jlab/rec/dc/Constants.java | 13 +- .../java/org/jlab/service/dc/DCEngine.java | 12 ++ 4 files changed, 127 insertions(+), 31 deletions(-) diff --git a/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java b/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java index d676060132..8f16bc1c05 100644 --- a/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java +++ b/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java @@ -54,7 +54,7 @@ final class DCdatabase { private int nsensewires; private int nguardwires; - private boolean ministaggerStatus = false; + private DCGeant4Factory.MinistaggerStatus ministaggerStatus = DCGeant4Factory.MinistaggerStatus.ON; private double ministagger ; private boolean endplatesStatus = false; @@ -67,10 +67,10 @@ final class DCdatabase { private final double[][] feedThroughRmin = new double[nSectors][nSupers]; // inner radius at the beginning of the curved part private final double[][] feedThroughRmax = new double[nSectors][nSupers]; // inner radius at the end of the curved part, i.e. on the surface private final double[][] feedThroughRcurv = new double[nSectors][nSupers]; // curvature radius of the trumpet-like part - private int feedthroughsStatus = 1; // 0-ignore the feedthrough, 1-sccount for the shift of the wire midpoint, 2-acccount for both shift and tilt - - private DCdatabase() { - } + private DCGeant4Factory.FeedthroughsStatus feedthroughsStatus = DCGeant4Factory.FeedthroughsStatus.SHIFT; + + + private DCdatabase() {} public static DCdatabase getInstance() { if (instance == null) { @@ -238,11 +238,11 @@ public double ministagger() { return ministagger; } - public void setMinistaggerStatus(boolean ministaggerStatus) { + public void setMinistaggerType(DCGeant4Factory.MinistaggerStatus ministaggerStatus) { this.ministaggerStatus = ministaggerStatus; } - public boolean getMinistaggerStatus(){ + public DCGeant4Factory.MinistaggerStatus getMinistaggerStatus(){ return ministaggerStatus; } @@ -258,11 +258,11 @@ public boolean getEndPlatesStatus(){ return endplatesStatus; } - public int feedthroughsStatus() { + public DCGeant4Factory.FeedthroughsStatus feedthroughsStatus() { return feedthroughsStatus; } - public void setFeedthroughsStatus(int feedthroughsStatus) { + public void setFeedthroughsStatus(DCGeant4Factory.FeedthroughsStatus feedthroughsStatus) { this.feedthroughsStatus = feedthroughsStatus; } @@ -373,7 +373,7 @@ private void findEnds() { double wlenr = vnum.dot(rnorm) / direction.dot(rnorm); rightend = direction.times(wlenr).add(midpoint); - if(dbref.feedthroughsStatus()==0) return; + if(dbref.feedthroughsStatus()==DCGeant4Factory.FeedthroughsStatus.OFF) return; // define unit vector parallel to the sides of the chamber and pointing to the chamber tip, projected onto the z=0 plane Vector3d rpar = new Vector3d(sopen, -copen, 0); @@ -387,7 +387,7 @@ private void findEnds() { Vector3d newDirection = lcirc.minus(rcirc).normalized(); // update the wire direction only if the flag is >1 - if(dbref.feedthroughsStatus()>1) + if(dbref.feedthroughsStatus()==DCGeant4Factory.FeedthroughsStatus.SHIFTANDDIR) direction = newDirection; // recalculate the wire end point in the sector frame @@ -485,8 +485,13 @@ public Wire(int sector, int isuperl, int layer, int wire) { // hh: wire distance in the wire plane double hh = (wire-1 + ((double)(layer % 2)) / 2.0) * dw2; - if(ireg==2 && isSensitiveWire(isuper, layer, wire) && dbref.getMinistaggerStatus()) + if(ireg==2) { + if(dbref.getMinistaggerStatus()==DCGeant4Factory.MinistaggerStatus.ON) hh += ((layer%2)*2)*dbref.ministagger(); + else if(dbref.getMinistaggerStatus()==DCGeant4Factory.MinistaggerStatus.SENSEWIRES && isSensitiveWire(isuper, layer, wire)) + hh += ((layer%2)*2-1)*dbref.ministagger(); + } + // ll: layer distance double tt = dbref.cellthickness(isuper) * dbref.wpdist(isuper); @@ -573,28 +578,101 @@ public final class DCGeant4Factory extends Geant4Factory { private final Wire[][][][] wires; private final Vector3d[][][] layerMids; private final Vector3d[][] regionMids; - - public static boolean MINISTAGGERON=true; - public static boolean MINISTAGGEROFF=false; + public static enum MinistaggerStatus { + OFF ( 0, "OFF"), // no ministagger + SENSEWIRES ( 1, "SENSEWIRES"), // ministagger is applied only to sense wires + ON ( 2, "OFF"); // ministagger applied to both sense and guard wires (default) + + private final int id; + private final String name; + + private MinistaggerStatus(int id, String name) { + this.id = id; + this.name = name; + } + + public int getId() { return id; } + public String getName() { return name; } + + public static MinistaggerStatus getStatus(String name) { + name = name.trim(); + for(MinistaggerStatus status: MinistaggerStatus.values()) + if (status.getName().equalsIgnoreCase(name)) + return status; + return ON; + } + + public static MinistaggerStatus getStatus(boolean status) { + return status ? ON : OFF; + } + } + + public static enum FeedthroughsStatus { + OFF ( 0, "OFF"), // do not account for the feedthroughs + SHIFT ( 1, "SHIFT"), // account for wire midpoint shift only (default) + SHIFTANDDIR ( 2, "SHIFTANDDIR"); // account for wire shift and tilt + + private final int id; + private final String name; + + private FeedthroughsStatus(int id, String name) { + this.id = id; + this.name = name; + } + + public int getId() { return id; } + public String getName() { return name; } + + public static FeedthroughsStatus getStatus(String name) { + name = name.trim(); + for(FeedthroughsStatus status: FeedthroughsStatus.values()) + if (status.getName().equalsIgnoreCase(name)) + return status; + return SHIFT; + } + } + public static boolean ENDPLATESBOWON=true; public static boolean ENDPLATESBOWOFF=false; /////////////////////////////////////////////////// public DCGeant4Factory(ConstantProvider provider) { - this(provider, MINISTAGGEROFF, ENDPLATESBOWOFF, null); + this(provider, MinistaggerStatus.OFF, FeedthroughsStatus.SHIFT, ENDPLATESBOWOFF, null); } /////////////////////////////////////////////////// - public DCGeant4Factory(ConstantProvider provider, boolean ministaggerStatus, - boolean endplatesStatus) { - this(provider, ministaggerStatus, endplatesStatus, null); + public DCGeant4Factory(ConstantProvider provider, + boolean ministaggerStatus, + boolean endplatesStatus) { + this(provider, MinistaggerStatus.getStatus(ministaggerStatus), FeedthroughsStatus.SHIFT, endplatesStatus, null); + } + + /////////////////////////////////////////////////// + public DCGeant4Factory(ConstantProvider provider, + boolean ministaggerStatus, + boolean endplatesStatus, + double[][] shifts) { + this(provider, MinistaggerStatus.getStatus(ministaggerStatus), FeedthroughsStatus.SHIFT, endplatesStatus, shifts); + } + + /////////////////////////////////////////////////// + public DCGeant4Factory(ConstantProvider provider, + String ministaggerStatus, + String feedthroughsStatus, + boolean endplatesStatus, + double[][] shifts) { + this(provider, MinistaggerStatus.getStatus(ministaggerStatus), FeedthroughsStatus.getStatus(feedthroughsStatus), endplatesStatus, shifts); } /////////////////////////////////////////////////// - public DCGeant4Factory(ConstantProvider provider, boolean ministaggerStatus, - boolean endplatesStatus, double[][] shifts) { - dbref.setMinistaggerStatus(ministaggerStatus); + public DCGeant4Factory(ConstantProvider provider, + MinistaggerStatus ministaggerStatus, + FeedthroughsStatus feedthroughsStatus, + boolean endplatesStatus, + double[][] shifts) { + dbref.setMinistaggerType(ministaggerStatus); + dbref.setFeedthroughsStatus(feedthroughsStatus); dbref.setEndPlatesStatus(endplatesStatus); motherVolume = new G4World("fc"); @@ -862,12 +940,9 @@ public void printWires(){ public static void main(String[] args) { ConstantProvider provider = GeometryFactory.getConstants(DetectorType.DC, 11, "default"); - DCdatabase.getInstance().setFeedthroughsStatus(0); - DCGeant4Factory dc0 = new DCGeant4Factory(provider, DCGeant4Factory.MINISTAGGERON, false); - DCdatabase.getInstance().setFeedthroughsStatus(1); - DCGeant4Factory dc1 = new DCGeant4Factory(provider, DCGeant4Factory.MINISTAGGERON, false); - DCdatabase.getInstance().setFeedthroughsStatus(2); - DCGeant4Factory dc2 = new DCGeant4Factory(provider, DCGeant4Factory.MINISTAGGERON, false); + DCGeant4Factory dc0 = new DCGeant4Factory(provider, MinistaggerStatus.ON, FeedthroughsStatus.OFF, false, null); + DCGeant4Factory dc1 = new DCGeant4Factory(provider, MinistaggerStatus.ON, FeedthroughsStatus.SHIFT, false, null); + DCGeant4Factory dc2 = new DCGeant4Factory(provider, MinistaggerStatus.ON, FeedthroughsStatus.SHIFTANDDIR, false, null); for(int il=0; il<36; il++) { for(int iw=0; iw<112; iw=iw+111) { diff --git a/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geom/dc/DCGeantFactory.java b/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geom/dc/DCGeantFactory.java index 95aaaa32b4..864302acaa 100644 --- a/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geom/dc/DCGeantFactory.java +++ b/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geom/dc/DCGeantFactory.java @@ -38,7 +38,7 @@ public class DCGeantFactory implements Factory Date: Wed, 24 Jul 2024 11:14:18 -0400 Subject: [PATCH 10/20] bug fix --- .../detector/geant4/v2/DCGeant4Factory.java | 33 +++++++++---------- .../main/java/org/jlab/rec/dc/Constants.java | 32 +++++++++--------- 2 files changed, 30 insertions(+), 35 deletions(-) diff --git a/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java b/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java index 8f16bc1c05..31a2ac5842 100644 --- a/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java +++ b/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java @@ -359,7 +359,9 @@ private void findEnds() { double sopen = Math.sin(dbref.thopen(ireg) / 2.0); // define vector from wire midpoint to chamber tip projected onto the z=0 plane - Vector3d vnum = new Vector3d(0, dbref.xdist(ireg)+dbref.feedThroughExt(sector-1,isuper)/copen, 0); + Vector3d vnum = new Vector3d(0, dbref.xdist(ireg), 0); + if(dbref.feedthroughsStatus()!=DCGeant4Factory.FeedthroughsStatus.OFF) + vnum.add(0, dbref.feedThroughExt(sector-1,isuper)/copen, 0); vnum.sub(midpoint); // define unit vector normal to the endplates of the chamber and pointing inside, projected onto the z=0 plane @@ -596,10 +598,12 @@ private MinistaggerStatus(int id, String name) { public String getName() { return name; } public static MinistaggerStatus getStatus(String name) { - name = name.trim(); - for(MinistaggerStatus status: MinistaggerStatus.values()) - if (status.getName().equalsIgnoreCase(name)) - return status; + if(name!=null) { + name = name.trim(); + for(MinistaggerStatus status: MinistaggerStatus.values()) + if (status.getName().equalsIgnoreCase(name)) + return status; + } return ON; } @@ -625,10 +629,12 @@ private FeedthroughsStatus(int id, String name) { public String getName() { return name; } public static FeedthroughsStatus getStatus(String name) { - name = name.trim(); - for(FeedthroughsStatus status: FeedthroughsStatus.values()) - if (status.getName().equalsIgnoreCase(name)) - return status; + if(name!=null) { + name = name.trim(); + for(FeedthroughsStatus status: FeedthroughsStatus.values()) + if (status.getName().equalsIgnoreCase(name)) + return status; + } return SHIFT; } } @@ -656,15 +662,6 @@ public DCGeant4Factory(ConstantProvider provider, this(provider, MinistaggerStatus.getStatus(ministaggerStatus), FeedthroughsStatus.SHIFT, endplatesStatus, shifts); } - /////////////////////////////////////////////////// - public DCGeant4Factory(ConstantProvider provider, - String ministaggerStatus, - String feedthroughsStatus, - boolean endplatesStatus, - double[][] shifts) { - this(provider, MinistaggerStatus.getStatus(ministaggerStatus), FeedthroughsStatus.getStatus(feedthroughsStatus), endplatesStatus, shifts); - } - /////////////////////////////////////////////////// public DCGeant4Factory(ConstantProvider provider, MinistaggerStatus ministaggerStatus, diff --git a/reconstruction/dc/src/main/java/org/jlab/rec/dc/Constants.java b/reconstruction/dc/src/main/java/org/jlab/rec/dc/Constants.java index ea69a5d76f..d020322477 100644 --- a/reconstruction/dc/src/main/java/org/jlab/rec/dc/Constants.java +++ b/reconstruction/dc/src/main/java/org/jlab/rec/dc/Constants.java @@ -87,8 +87,8 @@ public static Constants getInstance() { // CONFIGURABLE PARAMETERS private String GEOVARIATION = "default"; - public String MINISTAGGERSTATUS = "ON"; - public String FEEDTHROUGHSSTATUS = "SHIFT"; + public DCGeant4Factory.MinistaggerStatus MINISTAGGERSTATUS = null; + public DCGeant4Factory.FeedthroughsStatus FEEDTHROUGHSSTATUS = null; private boolean ENDPLATESBOWING = false; private double WIREDIST = 0.0; public int SECTORSELECT = 0; @@ -386,20 +386,18 @@ public synchronized void initialize(String engine, printConfig(engine); } else { - GEOVARIATION = variation; - if(ministaggerStatus!=null) - MINISTAGGERSTATUS = ministaggerStatus; - if(feedthroughsStatus!=null) - FEEDTHROUGHSSTATUS = feedthroughsStatus; - ENDPLATESBOWING = wireDistortion; - USETSTART = useStartTime; - CHECKBETA = useBetaCut; - T2D = t2d; - USEDOUBLETS = useDoublets; - DCRBJITTER = dcrbJitter; - SWAPDCRBBITS = swapDCRBBits; + GEOVARIATION = variation; + MINISTAGGERSTATUS = DCGeant4Factory.MinistaggerStatus.getStatus(ministaggerStatus); + FEEDTHROUGHSSTATUS = DCGeant4Factory.FeedthroughsStatus.getStatus(feedthroughsStatus); + ENDPLATESBOWING = wireDistortion; + USETSTART = useStartTime; + CHECKBETA = useBetaCut; + T2D = t2d; + USEDOUBLETS = useDoublets; + DCRBJITTER = dcrbJitter; + SWAPDCRBBITS = swapDCRBBits; NSUPERLAYERTRACKING = nSuperLayer; - SECTORSELECT = selectedSector; + SECTORSELECT = selectedSector; LoadConstants(); @@ -428,8 +426,8 @@ public void printConfig(String engine) { LOGGER.log(Level.INFO, "["+engine+"] run with variation = " + GEOVARIATION); LOGGER.log(Level.INFO, "["+engine+"] run with sector selection = " + SECTORSELECT); LOGGER.log(Level.INFO, "["+engine+"] run with start time option = " + USETSTART); - LOGGER.log(Level.INFO, "["+engine+"] run with wire ministagger = " + MINISTAGGERSTATUS); - LOGGER.log(Level.INFO, "["+engine+"] run with wire feedthroughs = " + FEEDTHROUGHSSTATUS); + LOGGER.log(Level.INFO, "["+engine+"] run with wire ministagger = " + MINISTAGGERSTATUS.getName()); + LOGGER.log(Level.INFO, "["+engine+"] run with wire feedthroughs = " + FEEDTHROUGHSSTATUS.getName()); LOGGER.log(Level.INFO, "["+engine+"] run with wire distortions = " + ENDPLATESBOWING); LOGGER.log(Level.INFO, "["+engine+"] run with with time Beta correction (is false for doca Beta correction) = " + USETIMETBETA); LOGGER.log(Level.INFO, "["+engine+"] run with with Beta cut = " + CHECKBETA); From 4e665c2968e5e5a60ed62c6bb8ee175b2fd82a5d Mon Sep 17 00:00:00 2001 From: Raffaella De Vita Date: Wed, 24 Jul 2024 13:19:45 -0400 Subject: [PATCH 11/20] another bug fix --- .../main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java b/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java index 31a2ac5842..26672a4325 100644 --- a/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java +++ b/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java @@ -584,7 +584,7 @@ public final class DCGeant4Factory extends Geant4Factory { public static enum MinistaggerStatus { OFF ( 0, "OFF"), // no ministagger SENSEWIRES ( 1, "SENSEWIRES"), // ministagger is applied only to sense wires - ON ( 2, "OFF"); // ministagger applied to both sense and guard wires (default) + ON ( 2, "ON"); // ministagger applied to both sense and guard wires (default) private final int id; private final String name; From 21cf0cb42fce0742990d50c3171f1018a7189772 Mon Sep 17 00:00:00 2001 From: Raffaella De Vita Date: Thu, 25 Jul 2024 11:58:57 -0400 Subject: [PATCH 12/20] making R3 Geant4 volumes independent from ministagger --- .../org/jlab/detector/geant4/v2/DCGeant4Factory.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java b/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java index 26672a4325..327490772e 100644 --- a/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java +++ b/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java @@ -487,10 +487,10 @@ public Wire(int sector, int isuperl, int layer, int wire) { // hh: wire distance in the wire plane double hh = (wire-1 + ((double)(layer % 2)) / 2.0) * dw2; - if(ireg==2) { - if(dbref.getMinistaggerStatus()==DCGeant4Factory.MinistaggerStatus.ON) + if(ireg==2 && isSensitiveWire(isuper, layer, wire)) { // apply the ministagger only to sense wires because guard wires are actually used to define the geant4 volumes + if(dbref.getMinistaggerStatus()==DCGeant4Factory.MinistaggerStatus.ON) hh += ((layer%2)*2)*dbref.ministagger(); - else if(dbref.getMinistaggerStatus()==DCGeant4Factory.MinistaggerStatus.SENSEWIRES && isSensitiveWire(isuper, layer, wire)) + else if(dbref.getMinistaggerStatus()==DCGeant4Factory.MinistaggerStatus.SENSEWIRES) hh += ((layer%2)*2-1)*dbref.ministagger(); } @@ -583,8 +583,8 @@ public final class DCGeant4Factory extends Geant4Factory { public static enum MinistaggerStatus { OFF ( 0, "OFF"), // no ministagger - SENSEWIRES ( 1, "SENSEWIRES"), // ministagger is applied only to sense wires - ON ( 2, "ON"); // ministagger applied to both sense and guard wires (default) + SENSEWIRES ( 1, "SENSEWIRES"), // ministagger is applied assuming the reference wire, whose position is defined by dist2tgt and themin, has no ministagger + ON ( 2, "ON"); // ministagger is applied assuming the reference wire, whose position is defined by dist2tgt and themin, HAS ministagger (default) private final int id; private final String name; @@ -751,7 +751,7 @@ public DCGeant4Factory(ConstantProvider provider, wires[isec][isuper][ilayer][iwire].rotateX(Math.toRadians(dbref.getAlignmentThetaX(isec, isuper/2))); wires[isec][isuper][ilayer][iwire].rotateY(Math.toRadians(dbref.getAlignmentThetaY(isec, isuper/2))); wires[isec][isuper][ilayer][iwire].translate(regionMids[isec][isuper/2]); - } + } } } From d8ea972571a78cc2385842303bddcb88f74ee3e6 Mon Sep 17 00:00:00 2001 From: Raffaella De Vita Date: Thu, 25 Jul 2024 12:25:56 -0400 Subject: [PATCH 13/20] Changed ministagger status enum name to more meaningful set --- .../java/org/jlab/detector/geant4/v2/DCGeant4Factory.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java b/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java index 327490772e..3d9b67fecf 100644 --- a/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java +++ b/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java @@ -490,7 +490,7 @@ public Wire(int sector, int isuperl, int layer, int wire) { if(ireg==2 && isSensitiveWire(isuper, layer, wire)) { // apply the ministagger only to sense wires because guard wires are actually used to define the geant4 volumes if(dbref.getMinistaggerStatus()==DCGeant4Factory.MinistaggerStatus.ON) hh += ((layer%2)*2)*dbref.ministagger(); - else if(dbref.getMinistaggerStatus()==DCGeant4Factory.MinistaggerStatus.SENSEWIRES) + else if(dbref.getMinistaggerStatus()==DCGeant4Factory.MinistaggerStatus.NOTONREFWIRE) hh += ((layer%2)*2-1)*dbref.ministagger(); } @@ -582,9 +582,9 @@ public final class DCGeant4Factory extends Geant4Factory { private final Vector3d[][] regionMids; public static enum MinistaggerStatus { - OFF ( 0, "OFF"), // no ministagger - SENSEWIRES ( 1, "SENSEWIRES"), // ministagger is applied assuming the reference wire, whose position is defined by dist2tgt and themin, has no ministagger - ON ( 2, "ON"); // ministagger is applied assuming the reference wire, whose position is defined by dist2tgt and themin, HAS ministagger (default) + OFF ( 0, "OFF"), // no ministagger + NOTONREFWIRE ( 1, "NOTONREFWIRE"), // ministagger is applied assuming the reference wire position, defined by dist2tgt and thmin, has no ministagger + ON ( 2, "ON"); // ministagger is applied assuming the reference wire position, defined by dist2tgt and thmin, HAS ministagger (default) private final int id; private final String name; From ef74d1d9b9a8c1bcb4b14fe3c2e8e4229f806911 Mon Sep 17 00:00:00 2001 From: Raffaella De Vita Date: Tue, 30 Jul 2024 10:04:00 -0400 Subject: [PATCH 14/20] version bump --- common-tools/clara-io/pom.xml | 4 ++-- common-tools/clas-analysis/pom.xml | 20 ++++++++--------- common-tools/clas-detector/pom.xml | 10 ++++----- common-tools/clas-geometry/pom.xml | 4 ++-- common-tools/clas-io/pom.xml | 8 +++---- common-tools/clas-jcsg/pom.xml | 8 +++---- common-tools/clas-logging/pom.xml | 4 ++-- common-tools/clas-math/pom.xml | 4 ++-- common-tools/clas-physics/pom.xml | 4 ++-- common-tools/clas-reco/pom.xml | 16 +++++++------- common-tools/clas-tracking/pom.xml | 6 +++--- common-tools/clas-utils/pom.xml | 6 +++--- 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 | 24 ++++++++++----------- 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/alert/pom.xml | 10 ++++----- reconstruction/band/pom.xml | 4 ++-- reconstruction/cnd/pom.xml | 2 +- reconstruction/cvt/pom.xml | 6 +++--- reconstruction/dc/pom.xml | 14 ++++++------ reconstruction/eb/pom.xml | 10 ++++----- reconstruction/ec/pom.xml | 6 +++--- reconstruction/fmt/pom.xml | 6 +++--- reconstruction/ft/pom.xml | 4 ++-- reconstruction/htcc/pom.xml | 4 ++-- reconstruction/ltcc/pom.xml | 4 ++-- reconstruction/mc/pom.xml | 4 ++-- reconstruction/mltn/pom.xml | 6 +++--- reconstruction/pom.xml | 4 ++-- reconstruction/raster/pom.xml | 4 ++-- reconstruction/rich/pom.xml | 6 +++--- reconstruction/rtpc/pom.xml | 6 +++--- reconstruction/swaps/pom.xml | 8 +++---- reconstruction/tof/pom.xml | 4 ++-- reconstruction/urwell/pom.xml | 6 +++--- reconstruction/vtx/pom.xml | 6 +++--- 42 files changed, 133 insertions(+), 133 deletions(-) diff --git a/common-tools/clara-io/pom.xml b/common-tools/clara-io/pom.xml index 8a20d46945..407ab69104 100644 --- a/common-tools/clara-io/pom.xml +++ b/common-tools/clara-io/pom.xml @@ -3,14 +3,14 @@ 4.0.0 org.jlab.clas clara-io - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT jar org.jlab.clas clas12rec ../../parent/pom.xml - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT diff --git a/common-tools/clas-analysis/pom.xml b/common-tools/clas-analysis/pom.xml index ec397899a1..979b30648f 100644 --- a/common-tools/clas-analysis/pom.xml +++ b/common-tools/clas-analysis/pom.xml @@ -3,63 +3,63 @@ 4.0.0 org.jlab.clas clas-analysis - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT jar org.jlab.clas clas12rec ../../parent/pom.xml - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas clas-utils - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas clas-physics - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas clas-io - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas clas-geometry - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas clas-jcsg - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas swim-tools - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas clas-detector - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas clas-reco - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT diff --git a/common-tools/clas-detector/pom.xml b/common-tools/clas-detector/pom.xml index a248a38246..43b50b1f32 100644 --- a/common-tools/clas-detector/pom.xml +++ b/common-tools/clas-detector/pom.xml @@ -3,21 +3,21 @@ 4.0.0 org.jlab.clas clas-detector - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT jar org.jlab.clas clas12rec ../../parent/pom.xml - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas clas-utils - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT @@ -29,13 +29,13 @@ org.jlab.clas clas-io - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas clas-geometry - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT diff --git a/common-tools/clas-geometry/pom.xml b/common-tools/clas-geometry/pom.xml index 0335aabb71..7e4d233748 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 - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT jar org.jlab.clas clas12rec ../../parent/pom.xml - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT diff --git a/common-tools/clas-io/pom.xml b/common-tools/clas-io/pom.xml index 3dce75673c..8f563feb5c 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 - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT jar org.jlab.clas clas12rec ../../parent/pom.xml - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT @@ -90,13 +90,13 @@ org.jlab.clas clas-utils - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas clas-logging - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT compile diff --git a/common-tools/clas-jcsg/pom.xml b/common-tools/clas-jcsg/pom.xml index 42d34049c4..0438c13107 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 - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT jar org.jlab.clas clas12rec ../../parent/pom.xml - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT @@ -27,12 +27,12 @@ org.jlab.clas clas-geometry - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas clas-detector - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT java3d diff --git a/common-tools/clas-logging/pom.xml b/common-tools/clas-logging/pom.xml index 578c10ff85..c424349a78 100644 --- a/common-tools/clas-logging/pom.xml +++ b/common-tools/clas-logging/pom.xml @@ -3,14 +3,14 @@ 4.0.0 org.jlab.clas clas-logging - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT jar org.jlab.clas clas12rec ../../parent/pom.xml - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT diff --git a/common-tools/clas-math/pom.xml b/common-tools/clas-math/pom.xml index b19ce93efc..1e195abd5d 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 - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT jar org.jlab.clas clas12rec ../../parent/pom.xml - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT diff --git a/common-tools/clas-physics/pom.xml b/common-tools/clas-physics/pom.xml index 8f9b0fc160..eb7da158d0 100644 --- a/common-tools/clas-physics/pom.xml +++ b/common-tools/clas-physics/pom.xml @@ -4,14 +4,14 @@ org.jlab.clas clas-physics - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT jar org.jlab.clas clas12rec ../../parent/pom.xml - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT diff --git a/common-tools/clas-reco/pom.xml b/common-tools/clas-reco/pom.xml index 01fdab6906..3edaf6d3af 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 - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT jar org.jlab.clas clas12rec ../../parent/pom.xml - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT @@ -42,37 +42,37 @@ org.jlab.clas clas-math - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas clas-io - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas clas-logging - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas clas-physics - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas clas-utils - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas clas-detector - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT diff --git a/common-tools/clas-tracking/pom.xml b/common-tools/clas-tracking/pom.xml index e70be60274..108b5e625f 100644 --- a/common-tools/clas-tracking/pom.xml +++ b/common-tools/clas-tracking/pom.xml @@ -3,14 +3,14 @@ 4.0.0 org.jlab.clas clas-tracking - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT jar org.jlab.clas clas12rec ../../parent/pom.xml - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT @@ -22,7 +22,7 @@ org.jlab.clas swim-tools - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT jar diff --git a/common-tools/clas-utils/pom.xml b/common-tools/clas-utils/pom.xml index cbbd5b7aed..2a59659f12 100644 --- a/common-tools/clas-utils/pom.xml +++ b/common-tools/clas-utils/pom.xml @@ -3,21 +3,21 @@ 4.0.0 org.jlab.clas clas-utils - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT jar org.jlab.clas clas12rec ../../parent/pom.xml - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas clas-logging - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.apache.commons diff --git a/common-tools/cnuphys/magfield/pom.xml b/common-tools/cnuphys/magfield/pom.xml index 186ad3a2d5..20bb68c6e2 100644 --- a/common-tools/cnuphys/magfield/pom.xml +++ b/common-tools/cnuphys/magfield/pom.xml @@ -23,7 +23,7 @@ org.jlab.clas clas-math - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT diff --git a/common-tools/cnuphys/swimmer/pom.xml b/common-tools/cnuphys/swimmer/pom.xml index 15e04cdb17..9460529075 100644 --- a/common-tools/cnuphys/swimmer/pom.xml +++ b/common-tools/cnuphys/swimmer/pom.xml @@ -35,7 +35,7 @@ org.jlab.clas clas-math - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT diff --git a/common-tools/coat-lib/deployDistribution.sh b/common-tools/coat-lib/deployDistribution.sh index d240b87186..3555e991a0 100755 --- a/common-tools/coat-lib/deployDistribution.sh +++ b/common-tools/coat-lib/deployDistribution.sh @@ -8,7 +8,7 @@ cd `dirname $0` # Script is exporting existing Jar files to repository #------------------------------------------------------------------------------------------------- -VERSION=10.1.2 +VERSION=10.2.0 mvn org.apache.maven.plugins:maven-install-plugin:2.5.2:install-file \ -Dfile=target/coat-libs-${VERSION}-SNAPSHOT.jar \ diff --git a/common-tools/coat-lib/pom.xml b/common-tools/coat-lib/pom.xml index 144cf39b68..29c318c3f8 100644 --- a/common-tools/coat-lib/pom.xml +++ b/common-tools/coat-lib/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.jlab.clas coat-libs - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT pom @@ -94,67 +94,67 @@ org.jlab.clas clas-io - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas clara-io - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas clas-reco - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas clas-utils - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas clas-jcsg - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas clas-detector - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas clas-analysis - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas clas-geometry - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas clas-physics - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas swim-tools - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas clas-tracking - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT diff --git a/common-tools/parent/pom.xml b/common-tools/parent/pom.xml index a596f94e02..958f5bb936 100644 --- a/common-tools/parent/pom.xml +++ b/common-tools/parent/pom.xml @@ -3,7 +3,7 @@ org.jlab.clas common-tools - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT pom diff --git a/common-tools/pom.xml b/common-tools/pom.xml index 6da86be8b7..f33cba4253 100644 --- a/common-tools/pom.xml +++ b/common-tools/pom.xml @@ -2,14 +2,14 @@ 4.0.0 org.jlab.clas common-tools - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT pom org.jlab.clas clas12rec ../parent/pom.xml - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT diff --git a/common-tools/swim-tools/pom.xml b/common-tools/swim-tools/pom.xml index 029b1eae65..3d7efbb5a6 100644 --- a/common-tools/swim-tools/pom.xml +++ b/common-tools/swim-tools/pom.xml @@ -3,21 +3,21 @@ 4.0.0 org.jlab.clas swim-tools - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT jar org.jlab.clas clas12rec ../../parent/pom.xml - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas clas-reco - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT diff --git a/parent/pom.xml b/parent/pom.xml index 4a870e71cc..97075cf64e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -3,7 +3,7 @@ org.jlab.clas clas12rec - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT pom diff --git a/pom.xml b/pom.xml index cd341cc8e7..b0bf5a3b0f 100644 --- a/pom.xml +++ b/pom.xml @@ -2,14 +2,14 @@ 4.0.0 org.jlab.clas clas12 - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT pom org.jlab.clas clas12rec parent/pom.xml - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT diff --git a/reconstruction/alert/pom.xml b/reconstruction/alert/pom.xml index d0a2a6a53b..19b0a4d014 100644 --- a/reconstruction/alert/pom.xml +++ b/reconstruction/alert/pom.xml @@ -13,31 +13,31 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas clas-reco - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas clas-io - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT compile org.jlab.clas clas-tracking - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT compile org.jlab.clas clas-geometry - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT compile diff --git a/reconstruction/band/pom.xml b/reconstruction/band/pom.xml index 2da190fe43..89a575c5be 100644 --- a/reconstruction/band/pom.xml +++ b/reconstruction/band/pom.xml @@ -13,14 +13,14 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas clas-reco - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT diff --git a/reconstruction/cnd/pom.xml b/reconstruction/cnd/pom.xml index b8a5745890..f288604be1 100644 --- a/reconstruction/cnd/pom.xml +++ b/reconstruction/cnd/pom.xml @@ -13,7 +13,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT diff --git a/reconstruction/cvt/pom.xml b/reconstruction/cvt/pom.xml index 1016c6e1c2..cfb1ee30de 100644 --- a/reconstruction/cvt/pom.xml +++ b/reconstruction/cvt/pom.xml @@ -13,7 +13,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT @@ -21,7 +21,7 @@ org.jlab.clas clas-jcsg - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT @@ -47,7 +47,7 @@ org.jlab.clas clas-tracking - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT diff --git a/reconstruction/dc/pom.xml b/reconstruction/dc/pom.xml index 6eb3261dda..34719b9069 100644 --- a/reconstruction/dc/pom.xml +++ b/reconstruction/dc/pom.xml @@ -14,7 +14,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT @@ -28,25 +28,25 @@ org.jlab.clas clas-tracking - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas clas-jcsg - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas clas-reco - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas clas-analysis - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT @@ -75,13 +75,13 @@ org.jlab.clas swim-tools - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas clas-math - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT diff --git a/reconstruction/eb/pom.xml b/reconstruction/eb/pom.xml index 30c6bdca32..c9e160fb10 100644 --- a/reconstruction/eb/pom.xml +++ b/reconstruction/eb/pom.xml @@ -13,7 +13,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT @@ -21,25 +21,25 @@ org.jlab.clas clas-utils - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas clas-io - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas clas-reco - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas clas-analysis - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT diff --git a/reconstruction/ec/pom.xml b/reconstruction/ec/pom.xml index 84ee2af3bb..7dbd2e5368 100644 --- a/reconstruction/ec/pom.xml +++ b/reconstruction/ec/pom.xml @@ -13,7 +13,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT @@ -21,13 +21,13 @@ org.jlab.clas clas-detector - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas clas-analysis - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT diff --git a/reconstruction/fmt/pom.xml b/reconstruction/fmt/pom.xml index 3d9f9ae168..a5738b1f46 100644 --- a/reconstruction/fmt/pom.xml +++ b/reconstruction/fmt/pom.xml @@ -15,21 +15,21 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas clas-jcsg - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT jar org.jlab.clas swim-tools - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT diff --git a/reconstruction/ft/pom.xml b/reconstruction/ft/pom.xml index 0779e88114..c3efc4e2e7 100644 --- a/reconstruction/ft/pom.xml +++ b/reconstruction/ft/pom.xml @@ -13,7 +13,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT @@ -21,7 +21,7 @@ org.jlab.clas clas-reco - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT diff --git a/reconstruction/htcc/pom.xml b/reconstruction/htcc/pom.xml index bcedb567ae..52a25aaaa0 100644 --- a/reconstruction/htcc/pom.xml +++ b/reconstruction/htcc/pom.xml @@ -13,7 +13,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT @@ -21,7 +21,7 @@ org.jlab.clas clas-reco - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT diff --git a/reconstruction/ltcc/pom.xml b/reconstruction/ltcc/pom.xml index c3e594e714..dc68c0c5e5 100644 --- a/reconstruction/ltcc/pom.xml +++ b/reconstruction/ltcc/pom.xml @@ -13,14 +13,14 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas clas-reco - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT diff --git a/reconstruction/mc/pom.xml b/reconstruction/mc/pom.xml index ed56bd8c4d..93190d451b 100644 --- a/reconstruction/mc/pom.xml +++ b/reconstruction/mc/pom.xml @@ -13,7 +13,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT @@ -21,7 +21,7 @@ org.jlab.clas clas-reco - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT diff --git a/reconstruction/mltn/pom.xml b/reconstruction/mltn/pom.xml index 6f50ff2e04..f65ce3e5e5 100644 --- a/reconstruction/mltn/pom.xml +++ b/reconstruction/mltn/pom.xml @@ -14,7 +14,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT @@ -34,13 +34,13 @@ org.jlab.clas clas-io - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas clas-reco - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT diff --git a/reconstruction/pom.xml b/reconstruction/pom.xml index 0e2c556c91..61ce8b0b38 100644 --- a/reconstruction/pom.xml +++ b/reconstruction/pom.xml @@ -3,14 +3,14 @@ org.jlab.clas reconstruction - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT pom org.jlab.clas clas12rec ../parent/pom.xml - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT diff --git a/reconstruction/raster/pom.xml b/reconstruction/raster/pom.xml index cce67f3036..bcb15e9400 100644 --- a/reconstruction/raster/pom.xml +++ b/reconstruction/raster/pom.xml @@ -13,7 +13,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT @@ -21,7 +21,7 @@ org.jlab.clas clas-reco - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT diff --git a/reconstruction/rich/pom.xml b/reconstruction/rich/pom.xml index 34219bb0a6..f7eebe5f4e 100644 --- a/reconstruction/rich/pom.xml +++ b/reconstruction/rich/pom.xml @@ -13,7 +13,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT @@ -21,13 +21,13 @@ org.jlab.clas clas-reco - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas clas-jcsg - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT diff --git a/reconstruction/rtpc/pom.xml b/reconstruction/rtpc/pom.xml index af7e9b915b..a7beefd620 100644 --- a/reconstruction/rtpc/pom.xml +++ b/reconstruction/rtpc/pom.xml @@ -13,7 +13,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT @@ -21,12 +21,12 @@ org.jlab.clas clas-reco - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas clas-tracking - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT compile diff --git a/reconstruction/swaps/pom.xml b/reconstruction/swaps/pom.xml index ffc95ac2ef..d323009592 100644 --- a/reconstruction/swaps/pom.xml +++ b/reconstruction/swaps/pom.xml @@ -13,7 +13,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT @@ -21,19 +21,19 @@ org.jlab.clas clas-detector - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas clas-io - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas clas-reco - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT diff --git a/reconstruction/tof/pom.xml b/reconstruction/tof/pom.xml index 7ead27814d..328165be56 100644 --- a/reconstruction/tof/pom.xml +++ b/reconstruction/tof/pom.xml @@ -13,7 +13,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT @@ -21,7 +21,7 @@ org.jlab.clas clas-jcsg - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT diff --git a/reconstruction/urwell/pom.xml b/reconstruction/urwell/pom.xml index 305b17164d..9d7ed96bdc 100644 --- a/reconstruction/urwell/pom.xml +++ b/reconstruction/urwell/pom.xml @@ -13,7 +13,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT @@ -21,13 +21,13 @@ org.jlab.clas clas-detector - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT org.jlab.clas clas-analysis - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT diff --git a/reconstruction/vtx/pom.xml b/reconstruction/vtx/pom.xml index 4b48f471bd..ffc344edde 100644 --- a/reconstruction/vtx/pom.xml +++ b/reconstruction/vtx/pom.xml @@ -13,7 +13,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT @@ -33,13 +33,13 @@ org.jlab.clas swim-tools - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT jar org.jlab.clas clas-tracking - 10.1.2-SNAPSHOT + 10.2.0-SNAPSHOT jar From a417f7d2041b5d79afaeada7e8ca081a92521c00 Mon Sep 17 00:00:00 2001 From: Raffaella De Vita Date: Tue, 30 Jul 2024 15:31:41 -0400 Subject: [PATCH 15/20] added printouts and comments --- .../java/org/jlab/detector/geant4/v2/DCGeant4Factory.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java b/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java index 3d9b67fecf..083484f918 100644 --- a/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java +++ b/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java @@ -605,8 +605,9 @@ public static MinistaggerStatus getStatus(String name) { return status; } return ON; - } + } + // this method is to support the old API that was accepting booleans as inputs public static MinistaggerStatus getStatus(boolean status) { return status ? ON : OFF; } @@ -671,6 +672,10 @@ public DCGeant4Factory(ConstantProvider provider, dbref.setMinistaggerType(ministaggerStatus); dbref.setFeedthroughsStatus(feedthroughsStatus); dbref.setEndPlatesStatus(endplatesStatus); + System.out.print("DC Geometry Factory configured with:" + + "\n\t ministagger: " + dbref.getMinistaggerStatus().getName() + + "\n\t feedthroughs: " + dbref.feedthroughsStatus().getName() + + "\n\t endplates bow: " + dbref.getEndPlatesStatus()); motherVolume = new G4World("fc"); From 875869e7f0fc1f9ece2ce98b0a47f6c7ec810644 Mon Sep 17 00:00:00 2001 From: Raffaella De Vita Date: Thu, 8 Aug 2024 10:46:16 -0400 Subject: [PATCH 16/20] added comments and printouts as per review bullets 1, 2, and 3 --- .../detector/geant4/v2/DCGeant4Factory.java | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java b/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java index 083484f918..317b16d1b6 100644 --- a/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java +++ b/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java @@ -2,6 +2,8 @@ import eu.mihosoft.vrl.v3d.Vector3d; import java.util.HashMap; +import java.util.logging.Level; +import java.util.logging.Logger; import org.jlab.detector.base.DetectorType; import org.jlab.detector.base.GeometryFactory; import org.jlab.detector.units.SystemOfUnits.Length; @@ -12,6 +14,7 @@ import org.jlab.geom.prim.Line3D; import org.jlab.geom.prim.Point3D; import org.jlab.geom.prim.Trap3D; +import org.jlab.logging.DefaultLogger; /** * @@ -568,8 +571,9 @@ public Vector3d center() { /////////////////////////////////////////////////// public final class DCGeant4Factory extends Geant4Factory { - DCdatabase dbref = DCdatabase.getInstance(); - + private static final Logger LOGGER = Logger.getLogger("DCGeant4Factory"); + DCdatabase dbref = null; + private final HashMap properties = new HashMap<>(); private int nsgwires; @@ -588,6 +592,7 @@ public static enum MinistaggerStatus { private final int id; private final String name; + private final static MinistaggerStatus DEFAULT = ON; private MinistaggerStatus(int id, String name) { this.id = id; @@ -604,7 +609,8 @@ public static MinistaggerStatus getStatus(String name) { if (status.getName().equalsIgnoreCase(name)) return status; } - return ON; + LOGGER.log(Level.WARNING, "Invalid MinistaggerStatus value, setting default status " + DEFAULT.getName()); + return DEFAULT; } // this method is to support the old API that was accepting booleans as inputs @@ -620,6 +626,7 @@ public static enum FeedthroughsStatus { private final int id; private final String name; + private final static FeedthroughsStatus DEFAULT = SHIFT; private FeedthroughsStatus(int id, String name) { this.id = id; @@ -636,7 +643,8 @@ public static FeedthroughsStatus getStatus(String name) { if (status.getName().equalsIgnoreCase(name)) return status; } - return SHIFT; + LOGGER.log(Level.WARNING, "Invalid FeedthroughsStatus value, setting default status " + DEFAULT.getName()); + return DEFAULT; } } @@ -669,10 +677,12 @@ public DCGeant4Factory(ConstantProvider provider, FeedthroughsStatus feedthroughsStatus, boolean endplatesStatus, double[][] shifts) { + DefaultLogger.debug(); + dbref = DCdatabase.getInstance(); dbref.setMinistaggerType(ministaggerStatus); dbref.setFeedthroughsStatus(feedthroughsStatus); dbref.setEndPlatesStatus(endplatesStatus); - System.out.print("DC Geometry Factory configured with:" + + LOGGER.log(Level.INFO, "DC Geometry Factory configured with:" + "\n\t ministagger: " + dbref.getMinistaggerStatus().getName() + "\n\t feedthroughs: " + dbref.feedthroughsStatus().getName() + "\n\t endplates bow: " + dbref.getEndPlatesStatus()); From 4529c6d507c7bc0156414250cf5fea99f114d5b2 Mon Sep 17 00:00:00 2001 From: Raffaella De Vita Date: Thu, 8 Aug 2024 15:05:37 -0400 Subject: [PATCH 17/20] added comments addressing review points 5,6,8, and 9 --- .../detector/geant4/v2/DCGeant4Factory.java | 42 ++++++++++--------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java b/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java index 317b16d1b6..1106327408 100644 --- a/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java +++ b/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java @@ -361,16 +361,25 @@ private void findEnds() { double copen = Math.cos(dbref.thopen(ireg) / 2.0); double sopen = Math.sin(dbref.thopen(ireg) / 2.0); - // define vector from wire midpoint to chamber tip projected onto the z=0 plane + // define unit vector normal to the endplates of the chamber and pointing inside (sector frame) + Vector3d rnorm = new Vector3d(copen, sopen, 0); + Vector3d lnorm = new Vector3d(-copen, sopen, 0); + // define unit vector parallel to the sides of the chamber and pointing to the chamber tip (sector frame) + Vector3d rpar = new Vector3d(sopen, -copen, 0); + Vector3d lpar = new Vector3d(-sopen, -copen, 0); + // define unit vector perpendicular to the layer plane, pointing downstream (sector frame) + Vector3d vperp = rnorm.cross(rpar).rotateX(-dbref.thtilt(ireg)); + // define unit vectors perpendicular to the end plates in the tilted sector frame + Vector3d rperp = rnorm.clone().rotateX(-dbref.thtilt(ireg)); + Vector3d lperp = lnorm.clone().rotateX(-dbref.thtilt(ireg)); + + // define vector from wire midpoint to chamber tip in the sector frame + // note that the z coordinate should not be zero but it is set to zero for simplicity since it doesn't affect the following calculations Vector3d vnum = new Vector3d(0, dbref.xdist(ireg), 0); if(dbref.feedthroughsStatus()!=DCGeant4Factory.FeedthroughsStatus.OFF) vnum.add(0, dbref.feedThroughExt(sector-1,isuper)/copen, 0); vnum.sub(midpoint); - // define unit vector normal to the endplates of the chamber and pointing inside, projected onto the z=0 plane - Vector3d rnorm = new Vector3d(copen, sopen, 0); - Vector3d lnorm = new Vector3d(-copen, sopen, 0); - // calculate the end points, exploiting the identity between the component perpendicular to the end plates // of the vector connecting the chamber tip to the midpoint and the vector connecting the midpoint annd the endpoint double wlenl = vnum.dot(lnorm) / direction.dot(lnorm); @@ -380,15 +389,11 @@ private void findEnds() { if(dbref.feedthroughsStatus()==DCGeant4Factory.FeedthroughsStatus.OFF) return; - // define unit vector parallel to the sides of the chamber and pointing to the chamber tip, projected onto the z=0 plane - Vector3d rpar = new Vector3d(sopen, -copen, 0); - Vector3d lpar = new Vector3d(-sopen, -copen, 0); - - // define the center of the circles that describe the trumpet-like part of the feedthrough + // define the center of the circles that describe the trumpet-like part of the feedthrough in the sector frame Vector3d rcirc = rnorm.times(-dbref.feedThroughLength(sector-1, isuper)).add(rpar.times(dbref.feedThroughRmin(sector-1, isuper)+dbref.feedThroughRcurv(sector-1, isuper))).rotateX(-dbref.thtilt(ireg)).add(rightend); Vector3d lcirc = lnorm.times(-dbref.feedThroughLength(sector-1, isuper)).add(lpar.times(dbref.feedThroughRmin(sector-1, isuper)+dbref.feedThroughRcurv(sector-1, isuper))).rotateX(-dbref.thtilt(ireg)).add(leftend); - // recalculate the wire direction assuming the wire is tangent to the left and right circles + // recalculate the wire direction assuming the wire is tangent to the left and right circles in the sector frame Vector3d newDirection = lcirc.minus(rcirc).normalized(); // update the wire direction only if the flag is >1 @@ -396,16 +401,15 @@ private void findEnds() { direction = newDirection; // recalculate the wire end point in the sector frame - Vector3d vperp = rnorm.cross(rpar).rotateX(-dbref.thtilt(ireg)); // unit vector perpendicular to the layer plane, pointing downstream - Vector3d rperp = rnorm.clone().rotateX(-dbref.thtilt(ireg)); // unit vector perpendicular to the right endplate - Vector3d lperp = lnorm.clone().rotateX(-dbref.thtilt(ireg)); // unit vector perpendicular to the left endplate - Vector3d rtang = rpar.times(-dbref.feedThroughRcurv(sector-1, isuper)).rotateX(-dbref.thtilt(ireg)); // vector connecting the circle center and the point at the beginning of the trumpet-like part - double rangle = newDirection.angle(rperp); - double langle = newDirection.negated().angle(lperp); - // rotate rtang to get to the point where the wire is tangent to the circle + // first define a vector parallel to the one connecting the circle center and the point at the beginning of the trumpet-like part + Vector3d rtang = rpar.times(-dbref.feedThroughRcurv(sector-1, isuper)).rotateX(-dbref.thtilt(ireg)); + // rotate rtang to be parallel to the vector connecting the circle center to the point where the wire is tangent to the circle + double rangle = newDirection.angle(rperp); + double langle = newDirection.negated().angle(lperp); //not used but kept for reference vperp.rotate(rtang,rangle); + // shift the origin to coincide with the circle center so that the end point is where the wire is tangent to the circle rtang = rtang.add(rcirc); - // recalculate the wire midpoint + // recalculate the wire midpoint as the point on the wire line defined by rtang and newDirection with x=0 midpoint = rtang.plus(newDirection.times(-rtang.x/newDirection.x)); // recalculate the wire endpoints From 5652a4e7e43e8a9ddb1c8859de714db01b26704f Mon Sep 17 00:00:00 2001 From: Raffaella De Vita Date: Thu, 8 Aug 2024 17:29:55 -0400 Subject: [PATCH 18/20] few more comments improvement --- .../detector/geant4/v2/DCGeant4Factory.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java b/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java index 1106327408..947ba6479d 100644 --- a/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java +++ b/common-tools/clas-jcsg/src/main/java/org/jlab/detector/geant4/v2/DCGeant4Factory.java @@ -361,27 +361,26 @@ private void findEnds() { double copen = Math.cos(dbref.thopen(ireg) / 2.0); double sopen = Math.sin(dbref.thopen(ireg) / 2.0); - // define unit vector normal to the endplates of the chamber and pointing inside (sector frame) + // define unit vector normal to the endplates of the chamber and pointing inside, projected onto the z=0 plane in the sector frame Vector3d rnorm = new Vector3d(copen, sopen, 0); Vector3d lnorm = new Vector3d(-copen, sopen, 0); - // define unit vector parallel to the sides of the chamber and pointing to the chamber tip (sector frame) + // define unit vector parallel to the sides of the chamber and pointing to the chamber tip, projected onto the z=0 plane in the sector frame Vector3d rpar = new Vector3d(sopen, -copen, 0); Vector3d lpar = new Vector3d(-sopen, -copen, 0); - // define unit vector perpendicular to the layer plane, pointing downstream (sector frame) - Vector3d vperp = rnorm.cross(rpar).rotateX(-dbref.thtilt(ireg)); - // define unit vectors perpendicular to the end plates in the tilted sector frame + // define unit vector perpendicular to the layer plane, pointing upstream in the sector frame + Vector3d vperp = rnorm.cross(rpar).rotateX(-dbref.thtilt(ireg)); + // define unit vectors perpendicular to the end plates in the sector frame Vector3d rperp = rnorm.clone().rotateX(-dbref.thtilt(ireg)); Vector3d lperp = lnorm.clone().rotateX(-dbref.thtilt(ireg)); - - // define vector from wire midpoint to chamber tip in the sector frame - // note that the z coordinate should not be zero but it is set to zero for simplicity since it doesn't affect the following calculations + + // define vector from wire midpoint to chamber tip in the sector frame, projected onto the z=0 plane Vector3d vnum = new Vector3d(0, dbref.xdist(ireg), 0); if(dbref.feedthroughsStatus()!=DCGeant4Factory.FeedthroughsStatus.OFF) vnum.add(0, dbref.feedThroughExt(sector-1,isuper)/copen, 0); vnum.sub(midpoint); - // calculate the end points, exploiting the identity between the component perpendicular to the end plates - // of the vector connecting the chamber tip to the midpoint and the vector connecting the midpoint annd the endpoint + // calculate the end points, exploiting the identity between the component perpendicular to the end plates, projected onto the z=0 plane, + // of the vector connecting the chamber tip to the midpoint and the vector connecting the midpoint and the endpoint double wlenl = vnum.dot(lnorm) / direction.dot(lnorm); leftend = direction.times(wlenl).add(midpoint); double wlenr = vnum.dot(rnorm) / direction.dot(rnorm); From 89b74dc5038776802302107694658e68f7784e2f Mon Sep 17 00:00:00 2001 From: Raffaella De Vita Date: Fri, 9 Aug 2024 09:59:09 -0400 Subject: [PATCH 19/20] added examples of usage of new dc geometry variables to yaml files --- etc/services/data-ai.yaml | 5 ++++- etc/services/data-aicv.yaml | 5 ++++- etc/services/data-cv.yaml | 7 +++++-- etc/services/denoise.yaml | 5 ++++- etc/services/mc-ai.yaml | 6 ++++-- etc/services/mc-aicv.yaml | 4 ++++ etc/services/mc-cv.yaml | 4 +++- 7 files changed, 28 insertions(+), 8 deletions(-) diff --git a/etc/services/data-ai.yaml b/etc/services/data-ai.yaml index 8e76ac900e..b15891fcce 100644 --- a/etc/services/data-ai.yaml +++ b/etc/services/data-ai.yaml @@ -62,7 +62,10 @@ services: configuration: global: variation: rgb_spring2019 -# timestamp: 12/31/2020-00:00:00 +# timestamp: 12/31/2020-00:00:00 +## uncomment the following two lines for compatibility with alignments before the DC fixes +# dcMinistagger: "NOTONREFWIRE" +# dcFeedthroughs: "OFF" # io-services: # writer: # schema_dir: "absolute-path-to-schema-folder" diff --git a/etc/services/data-aicv.yaml b/etc/services/data-aicv.yaml index 8728bd6d84..45e18a65a3 100644 --- a/etc/services/data-aicv.yaml +++ b/etc/services/data-aicv.yaml @@ -73,7 +73,10 @@ services: configuration: global: variation: rgb_spring2019 -# timestamp: 12/31/2020-00:00:00 +# timestamp: 12/31/2020-00:00:00 +## uncomment the following two lines for compatibility with alignments before the DC fixes +# dcMinistagger: "NOTONREFWIRE" +# dcFeedthroughs: "OFF" # io-services: # writer: # schema_dir: "absolute-path-to-schema-folder" diff --git a/etc/services/data-cv.yaml b/etc/services/data-cv.yaml index 2f56001ec4..510742ae0d 100644 --- a/etc/services/data-cv.yaml +++ b/etc/services/data-cv.yaml @@ -60,8 +60,11 @@ services: configuration: global: variation: rgb_spring2019 -# timestamp: 12/31/2020-00:00:00 -# triggerMask: "0x1" +# timestamp: 12/31/2020-00:00:00 +# triggerMask: "0x1" +## uncomment the following two lines for compatibility with alignments before the DC fixes +# dcMinistagger: "NOTONREFWIRE" +# dcFeedthroughs: "OFF" # io-services: # writer: # schema_dir: "absolute-path-to-schema-folder" diff --git a/etc/services/denoise.yaml b/etc/services/denoise.yaml index 6d0c5b0465..97d1c8d89d 100644 --- a/etc/services/denoise.yaml +++ b/etc/services/denoise.yaml @@ -77,7 +77,10 @@ services: configuration: global: variation: rgb_spring2019 -# timestamp: 12/31/2020-00:00:00 +# timestamp: 12/31/2020-00:00:00 +## uncomment the following two lines for compatibility with alignments before the DC fixes +# dcMinistagger: "NOTONREFWIRE" +# dcFeedthroughs: "OFF" # io-services: # writer: # schema_dir: "absolute-path-to-schema-folder" diff --git a/etc/services/mc-ai.yaml b/etc/services/mc-ai.yaml index 02e90cf2b4..ec8018add6 100644 --- a/etc/services/mc-ai.yaml +++ b/etc/services/mc-ai.yaml @@ -61,8 +61,10 @@ services: name: RTPC configuration: # global: -# variation: rgb_spring2019 -# timestamp: 12/31/2020-00:00:00 +# variation: rga_fall2018_mc +# timestamp: 12/31/2020-00:00:00 +# dcMinistagger: "NOTONREFWIRE" +# dcFeedthroughs: "OFF" # io-services: # writer: # schema_dir: "absolute-path-to-schema-folder" diff --git a/etc/services/mc-aicv.yaml b/etc/services/mc-aicv.yaml index f5215c4514..3481142e31 100644 --- a/etc/services/mc-aicv.yaml +++ b/etc/services/mc-aicv.yaml @@ -71,6 +71,10 @@ services: - class: org.jlab.service.rtpc.RTPCEngine name: RTPC configuration: +# global: +# variation: rga_fall2018_mc +# dcMinistagger: "NOTONREFWIRE" +# dcFeedthroughs: "OFF" # io-services: # writer: # schema_dir: "absolute-path-to-schema-folder" diff --git a/etc/services/mc-cv.yaml b/etc/services/mc-cv.yaml index 8abeb544d9..01126121fd 100644 --- a/etc/services/mc-cv.yaml +++ b/etc/services/mc-cv.yaml @@ -59,7 +59,9 @@ services: name: RTPC configuration: # global: -# variation: rga_fall2018_bg +# variation: rga_fall2018_mc +# dcMinistagger: "NOTONREFWIRE" +# dcFeedthroughs: "OFF" # io-services: # writer: # schema_dir: "absolute-path-to-schema-folder" From bae05a5f2d6eef177a7cc5a6999e52dc0d2660c3 Mon Sep 17 00:00:00 2001 From: Raffaella De Vita Date: Fri, 9 Aug 2024 12:43:56 -0400 Subject: [PATCH 20/20] version bump --- common-tools/clara-io/pom.xml | 4 ++-- common-tools/clas-analysis/pom.xml | 20 ++++++++--------- common-tools/clas-detector/pom.xml | 10 ++++----- common-tools/clas-geometry/pom.xml | 4 ++-- common-tools/clas-io/pom.xml | 8 +++---- common-tools/clas-jcsg/pom.xml | 8 +++---- common-tools/clas-logging/pom.xml | 4 ++-- common-tools/clas-math/pom.xml | 4 ++-- common-tools/clas-physics/pom.xml | 4 ++-- common-tools/clas-reco/pom.xml | 16 +++++++------- common-tools/clas-tracking/pom.xml | 6 +++--- common-tools/clas-utils/pom.xml | 6 +++--- 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 | 24 ++++++++++----------- 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/alert/pom.xml | 10 ++++----- reconstruction/band/pom.xml | 4 ++-- reconstruction/cnd/pom.xml | 2 +- reconstruction/cvt/pom.xml | 6 +++--- reconstruction/dc/pom.xml | 14 ++++++------ reconstruction/eb/pom.xml | 10 ++++----- reconstruction/ec/pom.xml | 6 +++--- reconstruction/fmt/pom.xml | 6 +++--- reconstruction/ft/pom.xml | 4 ++-- reconstruction/htcc/pom.xml | 4 ++-- reconstruction/ltcc/pom.xml | 4 ++-- reconstruction/mc/pom.xml | 4 ++-- reconstruction/mltn/pom.xml | 6 +++--- reconstruction/pom.xml | 4 ++-- reconstruction/raster/pom.xml | 4 ++-- reconstruction/rich/pom.xml | 6 +++--- reconstruction/rtpc/pom.xml | 6 +++--- reconstruction/swaps/pom.xml | 8 +++---- reconstruction/tof/pom.xml | 4 ++-- reconstruction/urwell/pom.xml | 6 +++--- reconstruction/vtx/pom.xml | 6 +++--- 42 files changed, 133 insertions(+), 133 deletions(-) diff --git a/common-tools/clara-io/pom.xml b/common-tools/clara-io/pom.xml index 407ab69104..b52690dae7 100644 --- a/common-tools/clara-io/pom.xml +++ b/common-tools/clara-io/pom.xml @@ -3,14 +3,14 @@ 4.0.0 org.jlab.clas clara-io - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT jar org.jlab.clas clas12rec ../../parent/pom.xml - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT diff --git a/common-tools/clas-analysis/pom.xml b/common-tools/clas-analysis/pom.xml index 979b30648f..a8a4a241c6 100644 --- a/common-tools/clas-analysis/pom.xml +++ b/common-tools/clas-analysis/pom.xml @@ -3,63 +3,63 @@ 4.0.0 org.jlab.clas clas-analysis - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT jar org.jlab.clas clas12rec ../../parent/pom.xml - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas clas-utils - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas clas-physics - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas clas-io - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas clas-geometry - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas clas-jcsg - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas swim-tools - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas clas-detector - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas clas-reco - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT diff --git a/common-tools/clas-detector/pom.xml b/common-tools/clas-detector/pom.xml index 43b50b1f32..b42c054626 100644 --- a/common-tools/clas-detector/pom.xml +++ b/common-tools/clas-detector/pom.xml @@ -3,21 +3,21 @@ 4.0.0 org.jlab.clas clas-detector - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT jar org.jlab.clas clas12rec ../../parent/pom.xml - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas clas-utils - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT @@ -29,13 +29,13 @@ org.jlab.clas clas-io - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas clas-geometry - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT diff --git a/common-tools/clas-geometry/pom.xml b/common-tools/clas-geometry/pom.xml index 7e4d233748..f55d17013e 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 - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT jar org.jlab.clas clas12rec ../../parent/pom.xml - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT diff --git a/common-tools/clas-io/pom.xml b/common-tools/clas-io/pom.xml index 8f563feb5c..3fdff270ef 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 - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT jar org.jlab.clas clas12rec ../../parent/pom.xml - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT @@ -90,13 +90,13 @@ org.jlab.clas clas-utils - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas clas-logging - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT compile diff --git a/common-tools/clas-jcsg/pom.xml b/common-tools/clas-jcsg/pom.xml index 0438c13107..652f031ac5 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 - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT jar org.jlab.clas clas12rec ../../parent/pom.xml - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT @@ -27,12 +27,12 @@ org.jlab.clas clas-geometry - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas clas-detector - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT java3d diff --git a/common-tools/clas-logging/pom.xml b/common-tools/clas-logging/pom.xml index c424349a78..eccfc52940 100644 --- a/common-tools/clas-logging/pom.xml +++ b/common-tools/clas-logging/pom.xml @@ -3,14 +3,14 @@ 4.0.0 org.jlab.clas clas-logging - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT jar org.jlab.clas clas12rec ../../parent/pom.xml - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT diff --git a/common-tools/clas-math/pom.xml b/common-tools/clas-math/pom.xml index 1e195abd5d..bc38a112fc 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 - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT jar org.jlab.clas clas12rec ../../parent/pom.xml - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT diff --git a/common-tools/clas-physics/pom.xml b/common-tools/clas-physics/pom.xml index eb7da158d0..23187d747f 100644 --- a/common-tools/clas-physics/pom.xml +++ b/common-tools/clas-physics/pom.xml @@ -4,14 +4,14 @@ org.jlab.clas clas-physics - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT jar org.jlab.clas clas12rec ../../parent/pom.xml - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT diff --git a/common-tools/clas-reco/pom.xml b/common-tools/clas-reco/pom.xml index 3edaf6d3af..5fb4f694d6 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 - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT jar org.jlab.clas clas12rec ../../parent/pom.xml - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT @@ -42,37 +42,37 @@ org.jlab.clas clas-math - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas clas-io - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas clas-logging - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas clas-physics - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas clas-utils - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas clas-detector - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT diff --git a/common-tools/clas-tracking/pom.xml b/common-tools/clas-tracking/pom.xml index 108b5e625f..cc8b89ed86 100644 --- a/common-tools/clas-tracking/pom.xml +++ b/common-tools/clas-tracking/pom.xml @@ -3,14 +3,14 @@ 4.0.0 org.jlab.clas clas-tracking - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT jar org.jlab.clas clas12rec ../../parent/pom.xml - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT @@ -22,7 +22,7 @@ org.jlab.clas swim-tools - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT jar diff --git a/common-tools/clas-utils/pom.xml b/common-tools/clas-utils/pom.xml index 2a59659f12..be6fc88597 100644 --- a/common-tools/clas-utils/pom.xml +++ b/common-tools/clas-utils/pom.xml @@ -3,21 +3,21 @@ 4.0.0 org.jlab.clas clas-utils - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT jar org.jlab.clas clas12rec ../../parent/pom.xml - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas clas-logging - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.apache.commons diff --git a/common-tools/cnuphys/magfield/pom.xml b/common-tools/cnuphys/magfield/pom.xml index 20bb68c6e2..6e0557f22a 100644 --- a/common-tools/cnuphys/magfield/pom.xml +++ b/common-tools/cnuphys/magfield/pom.xml @@ -23,7 +23,7 @@ org.jlab.clas clas-math - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT diff --git a/common-tools/cnuphys/swimmer/pom.xml b/common-tools/cnuphys/swimmer/pom.xml index 9460529075..5623cf55fc 100644 --- a/common-tools/cnuphys/swimmer/pom.xml +++ b/common-tools/cnuphys/swimmer/pom.xml @@ -35,7 +35,7 @@ org.jlab.clas clas-math - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT diff --git a/common-tools/coat-lib/deployDistribution.sh b/common-tools/coat-lib/deployDistribution.sh index 3555e991a0..6d686d1384 100755 --- a/common-tools/coat-lib/deployDistribution.sh +++ b/common-tools/coat-lib/deployDistribution.sh @@ -8,7 +8,7 @@ cd `dirname $0` # Script is exporting existing Jar files to repository #------------------------------------------------------------------------------------------------- -VERSION=10.2.0 +VERSION=11.0.0 mvn org.apache.maven.plugins:maven-install-plugin:2.5.2:install-file \ -Dfile=target/coat-libs-${VERSION}-SNAPSHOT.jar \ diff --git a/common-tools/coat-lib/pom.xml b/common-tools/coat-lib/pom.xml index 29c318c3f8..c955dd8758 100644 --- a/common-tools/coat-lib/pom.xml +++ b/common-tools/coat-lib/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.jlab.clas coat-libs - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT pom @@ -94,67 +94,67 @@ org.jlab.clas clas-io - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas clara-io - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas clas-reco - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas clas-utils - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas clas-jcsg - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas clas-detector - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas clas-analysis - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas clas-geometry - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas clas-physics - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas swim-tools - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas clas-tracking - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT diff --git a/common-tools/parent/pom.xml b/common-tools/parent/pom.xml index 958f5bb936..edb910611c 100644 --- a/common-tools/parent/pom.xml +++ b/common-tools/parent/pom.xml @@ -3,7 +3,7 @@ org.jlab.clas common-tools - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT pom diff --git a/common-tools/pom.xml b/common-tools/pom.xml index f33cba4253..17ac306a9d 100644 --- a/common-tools/pom.xml +++ b/common-tools/pom.xml @@ -2,14 +2,14 @@ 4.0.0 org.jlab.clas common-tools - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT pom org.jlab.clas clas12rec ../parent/pom.xml - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT diff --git a/common-tools/swim-tools/pom.xml b/common-tools/swim-tools/pom.xml index 3d7efbb5a6..fa24dfd504 100644 --- a/common-tools/swim-tools/pom.xml +++ b/common-tools/swim-tools/pom.xml @@ -3,21 +3,21 @@ 4.0.0 org.jlab.clas swim-tools - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT jar org.jlab.clas clas12rec ../../parent/pom.xml - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas clas-reco - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT diff --git a/parent/pom.xml b/parent/pom.xml index 97075cf64e..f2fd955324 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -3,7 +3,7 @@ org.jlab.clas clas12rec - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT pom diff --git a/pom.xml b/pom.xml index b0bf5a3b0f..9093d95506 100644 --- a/pom.xml +++ b/pom.xml @@ -2,14 +2,14 @@ 4.0.0 org.jlab.clas clas12 - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT pom org.jlab.clas clas12rec parent/pom.xml - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT diff --git a/reconstruction/alert/pom.xml b/reconstruction/alert/pom.xml index 19b0a4d014..8b96340a1b 100644 --- a/reconstruction/alert/pom.xml +++ b/reconstruction/alert/pom.xml @@ -13,31 +13,31 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas clas-reco - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas clas-io - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT compile org.jlab.clas clas-tracking - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT compile org.jlab.clas clas-geometry - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT compile diff --git a/reconstruction/band/pom.xml b/reconstruction/band/pom.xml index 89a575c5be..39d28d395e 100644 --- a/reconstruction/band/pom.xml +++ b/reconstruction/band/pom.xml @@ -13,14 +13,14 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas clas-reco - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT diff --git a/reconstruction/cnd/pom.xml b/reconstruction/cnd/pom.xml index f288604be1..8a0bab6cfb 100644 --- a/reconstruction/cnd/pom.xml +++ b/reconstruction/cnd/pom.xml @@ -13,7 +13,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT diff --git a/reconstruction/cvt/pom.xml b/reconstruction/cvt/pom.xml index cfb1ee30de..0d2d8c7b1e 100644 --- a/reconstruction/cvt/pom.xml +++ b/reconstruction/cvt/pom.xml @@ -13,7 +13,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT @@ -21,7 +21,7 @@ org.jlab.clas clas-jcsg - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT @@ -47,7 +47,7 @@ org.jlab.clas clas-tracking - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT diff --git a/reconstruction/dc/pom.xml b/reconstruction/dc/pom.xml index 34719b9069..64d5a57f45 100644 --- a/reconstruction/dc/pom.xml +++ b/reconstruction/dc/pom.xml @@ -14,7 +14,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT @@ -28,25 +28,25 @@ org.jlab.clas clas-tracking - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas clas-jcsg - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas clas-reco - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas clas-analysis - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT @@ -75,13 +75,13 @@ org.jlab.clas swim-tools - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas clas-math - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT diff --git a/reconstruction/eb/pom.xml b/reconstruction/eb/pom.xml index c9e160fb10..19920fadf8 100644 --- a/reconstruction/eb/pom.xml +++ b/reconstruction/eb/pom.xml @@ -13,7 +13,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT @@ -21,25 +21,25 @@ org.jlab.clas clas-utils - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas clas-io - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas clas-reco - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas clas-analysis - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT diff --git a/reconstruction/ec/pom.xml b/reconstruction/ec/pom.xml index 7dbd2e5368..1389e761d9 100644 --- a/reconstruction/ec/pom.xml +++ b/reconstruction/ec/pom.xml @@ -13,7 +13,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT @@ -21,13 +21,13 @@ org.jlab.clas clas-detector - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas clas-analysis - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT diff --git a/reconstruction/fmt/pom.xml b/reconstruction/fmt/pom.xml index a5738b1f46..84bbed2fb3 100644 --- a/reconstruction/fmt/pom.xml +++ b/reconstruction/fmt/pom.xml @@ -15,21 +15,21 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas clas-jcsg - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT jar org.jlab.clas swim-tools - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT diff --git a/reconstruction/ft/pom.xml b/reconstruction/ft/pom.xml index c3efc4e2e7..2947fcbc41 100644 --- a/reconstruction/ft/pom.xml +++ b/reconstruction/ft/pom.xml @@ -13,7 +13,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT @@ -21,7 +21,7 @@ org.jlab.clas clas-reco - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT diff --git a/reconstruction/htcc/pom.xml b/reconstruction/htcc/pom.xml index 52a25aaaa0..9bfca69af5 100644 --- a/reconstruction/htcc/pom.xml +++ b/reconstruction/htcc/pom.xml @@ -13,7 +13,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT @@ -21,7 +21,7 @@ org.jlab.clas clas-reco - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT diff --git a/reconstruction/ltcc/pom.xml b/reconstruction/ltcc/pom.xml index dc68c0c5e5..b7673788b9 100644 --- a/reconstruction/ltcc/pom.xml +++ b/reconstruction/ltcc/pom.xml @@ -13,14 +13,14 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas clas-reco - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT diff --git a/reconstruction/mc/pom.xml b/reconstruction/mc/pom.xml index 93190d451b..1d96e73e35 100644 --- a/reconstruction/mc/pom.xml +++ b/reconstruction/mc/pom.xml @@ -13,7 +13,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT @@ -21,7 +21,7 @@ org.jlab.clas clas-reco - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT diff --git a/reconstruction/mltn/pom.xml b/reconstruction/mltn/pom.xml index f65ce3e5e5..5642944d72 100644 --- a/reconstruction/mltn/pom.xml +++ b/reconstruction/mltn/pom.xml @@ -14,7 +14,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT @@ -34,13 +34,13 @@ org.jlab.clas clas-io - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas clas-reco - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT diff --git a/reconstruction/pom.xml b/reconstruction/pom.xml index 61ce8b0b38..f34336a7be 100644 --- a/reconstruction/pom.xml +++ b/reconstruction/pom.xml @@ -3,14 +3,14 @@ org.jlab.clas reconstruction - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT pom org.jlab.clas clas12rec ../parent/pom.xml - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT diff --git a/reconstruction/raster/pom.xml b/reconstruction/raster/pom.xml index bcb15e9400..e2dad6dd91 100644 --- a/reconstruction/raster/pom.xml +++ b/reconstruction/raster/pom.xml @@ -13,7 +13,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT @@ -21,7 +21,7 @@ org.jlab.clas clas-reco - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT diff --git a/reconstruction/rich/pom.xml b/reconstruction/rich/pom.xml index f7eebe5f4e..3b1695702c 100644 --- a/reconstruction/rich/pom.xml +++ b/reconstruction/rich/pom.xml @@ -13,7 +13,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT @@ -21,13 +21,13 @@ org.jlab.clas clas-reco - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas clas-jcsg - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT diff --git a/reconstruction/rtpc/pom.xml b/reconstruction/rtpc/pom.xml index a7beefd620..416590d494 100644 --- a/reconstruction/rtpc/pom.xml +++ b/reconstruction/rtpc/pom.xml @@ -13,7 +13,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT @@ -21,12 +21,12 @@ org.jlab.clas clas-reco - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas clas-tracking - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT compile diff --git a/reconstruction/swaps/pom.xml b/reconstruction/swaps/pom.xml index d323009592..8b194d0a8e 100644 --- a/reconstruction/swaps/pom.xml +++ b/reconstruction/swaps/pom.xml @@ -13,7 +13,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT @@ -21,19 +21,19 @@ org.jlab.clas clas-detector - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas clas-io - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas clas-reco - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT diff --git a/reconstruction/tof/pom.xml b/reconstruction/tof/pom.xml index 328165be56..64f7bb6f15 100644 --- a/reconstruction/tof/pom.xml +++ b/reconstruction/tof/pom.xml @@ -13,7 +13,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT @@ -21,7 +21,7 @@ org.jlab.clas clas-jcsg - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT diff --git a/reconstruction/urwell/pom.xml b/reconstruction/urwell/pom.xml index 9d7ed96bdc..76643fa1b1 100644 --- a/reconstruction/urwell/pom.xml +++ b/reconstruction/urwell/pom.xml @@ -13,7 +13,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT @@ -21,13 +21,13 @@ org.jlab.clas clas-detector - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT org.jlab.clas clas-analysis - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT diff --git a/reconstruction/vtx/pom.xml b/reconstruction/vtx/pom.xml index ffc344edde..9f0eea5c43 100644 --- a/reconstruction/vtx/pom.xml +++ b/reconstruction/vtx/pom.xml @@ -13,7 +13,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT @@ -33,13 +33,13 @@ org.jlab.clas swim-tools - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT jar org.jlab.clas clas-tracking - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT jar