Skip to content

Commit 78837d1

Browse files
raffaelladevitaraffaelladevita
committed
merged Development
2 parents 0891d99 + 8f521f0 commit 78837d1

File tree

91 files changed

+4739
-2454
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+4739
-2454
lines changed

‎.github/workflows/maven.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ on:
77
branches: [ '**' ]
88
pull_request:
99
branches: [ '**' ]
10+
schedule:
11+
# NOTE: From what I read, the email notification for cron can only go
12+
# to the last committer of this file!!!!!
13+
- cron: '0 22 * * *'
1014

1115
jobs:
1216
build:

‎build-coatjava.sh‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,6 @@ cp external-dependencies/jclara-4.3-SNAPSHOT.jar coatjava/lib/utils
9898
mkdir -p coatjava/lib/services
9999

100100
### clean up any cache copies ###
101-
rm -rf ~/.m2/repository/org/hep/hipo
102-
rm -rf ~/.m2/repository/org/jlab
103101
cd common-tools/coat-lib; $mvn clean; cd -
104102

105103
unset CLAS12DIR

‎common-tools/clara-io/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>org.jlab.clas</groupId>
55
<artifactId>clara-io</artifactId>
6-
<version>7.0.0-SNAPSHOT</version>
6+
<version>7.0.1-SNAPSHOT</version>
77
<packaging>jar</packaging>
88

99
<parent>
1010
<groupId>org.jlab.clas</groupId>
1111
<artifactId>clas12rec</artifactId>
1212
<relativePath>../../parent/pom.xml</relativePath>
13-
<version>7.0.0-SNAPSHOT</version>
13+
<version>7.0.1-SNAPSHOT</version>
1414
</parent>
1515

1616
<build>

‎common-tools/clas-analysis/pom.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>org.jlab.clas</groupId>
55
<artifactId>clas-analysis</artifactId>
6-
<version>7.0.0-SNAPSHOT</version>
6+
<version>7.0.1-SNAPSHOT</version>
77
<packaging>jar</packaging>
88

99
<parent>
1010
<groupId>org.jlab.clas</groupId>
1111
<artifactId>clas12rec</artifactId>
1212
<relativePath>../../parent/pom.xml</relativePath>
13-
<version>7.0.0-SNAPSHOT</version>
13+
<version>7.0.1-SNAPSHOT</version>
1414
</parent>
1515

1616
<build>
@@ -30,37 +30,37 @@
3030
<dependency>
3131
<groupId>org.jlab.clas</groupId>
3232
<artifactId>clas-utils</artifactId>
33-
<version>7.0.0-SNAPSHOT</version>
33+
<version>7.0.1-SNAPSHOT</version>
3434
</dependency>
3535

3636
<dependency>
3737
<groupId>org.jlab.clas</groupId>
3838
<artifactId>clas-physics</artifactId>
39-
<version>7.0.0-SNAPSHOT</version>
39+
<version>7.0.1-SNAPSHOT</version>
4040
</dependency>
4141

4242
<dependency>
4343
<groupId>org.jlab.clas</groupId>
4444
<artifactId>clas-io</artifactId>
45-
<version>7.0.0-SNAPSHOT</version>
45+
<version>7.0.1-SNAPSHOT</version>
4646
</dependency>
4747

4848
<dependency>
4949
<groupId>org.jlab.clas</groupId>
5050
<artifactId>clas-geometry</artifactId>
51-
<version>7.0.0-SNAPSHOT</version>
51+
<version>7.0.1-SNAPSHOT</version>
5252
</dependency>
5353

5454
<dependency>
5555
<groupId>org.jlab.clas</groupId>
5656
<artifactId>clas-detector</artifactId>
57-
<version>7.0.0-SNAPSHOT</version>
57+
<version>7.0.1-SNAPSHOT</version>
5858
</dependency>
5959

6060
<dependency>
6161
<groupId>org.jlab.clas</groupId>
6262
<artifactId>clas-reco</artifactId>
63-
<version>7.0.0-SNAPSHOT</version>
63+
<version>7.0.1-SNAPSHOT</version>
6464
</dependency>
6565

6666
<dependency>

‎common-tools/clas-detector/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>org.jlab.clas</groupId>
55
<artifactId>clas-detector</artifactId>
6-
<version>7.0.0-SNAPSHOT</version>
6+
<version>7.0.1-SNAPSHOT</version>
77
<packaging>jar</packaging>
88

99
<parent>
1010
<groupId>org.jlab.clas</groupId>
1111
<artifactId>clas12rec</artifactId>
1212
<relativePath>../../parent/pom.xml</relativePath>
13-
<version>7.0.0-SNAPSHOT</version>
13+
<version>7.0.1-SNAPSHOT</version>
1414
</parent>
1515

1616
<build>
@@ -30,7 +30,7 @@
3030
<dependency>
3131
<groupId>org.jlab.clas</groupId>
3232
<artifactId>clas-utils</artifactId>
33-
<version>7.0.0-SNAPSHOT</version>
33+
<version>7.0.1-SNAPSHOT</version>
3434
</dependency>
3535

3636
<dependency>
@@ -42,13 +42,13 @@
4242
<dependency>
4343
<groupId>org.jlab.clas</groupId>
4444
<artifactId>clas-io</artifactId>
45-
<version>7.0.0-SNAPSHOT</version>
45+
<version>7.0.1-SNAPSHOT</version>
4646
</dependency>
4747

4848
<dependency>
4949
<groupId>org.jlab.clas</groupId>
5050
<artifactId>clas-geometry</artifactId>
51-
<version>7.0.0-SNAPSHOT</version>
51+
<version>7.0.1-SNAPSHOT</version>
5252
</dependency>
5353

5454
<dependency>

‎common-tools/clas-detector/src/main/java/org/jlab/detector/base/DetectorLayer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ public class DetectorLayer {
1414
public static final byte EC_INNER_U=4;
1515
public static final byte EC_INNER_V=5;
1616
public static final byte EC_INNER_W=6;
17-
public static final byte EC_INNER_Z=0; // layer number used to define the longitudinal coordinate of the cluster
17+
public static final byte EC_INNER_Z=9; // layer number used to define the longitudinal coordinate of the cluster
1818

1919
public static final byte EC_OUTER_U=7;
2020
public static final byte EC_OUTER_V=8;
2121
public static final byte EC_OUTER_W=9;
22-
public static final byte EC_OUTER_Z=0; // layer number used to define the longitudinal coordinate of the cluster
22+
public static final byte EC_OUTER_Z=9; // layer number used to define the longitudinal coordinate of the cluster
2323

2424
public static final byte PCAL=PCAL_U;
2525
public static final byte EC_INNER=EC_INNER_U;

‎common-tools/clas-detector/src/main/java/org/jlab/detector/base/GeometryFactory.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import org.jlab.geom.detector.cnd.CNDFactory;
1212
import org.jlab.geom.detector.dc.DCFactory;
1313
import org.jlab.geom.detector.ec.ECFactory;
14+
import org.jlab.geom.detector.fmt.FMTFactory;
1415
import org.jlab.geom.detector.ftof.FTOFFactory;
1516

1617
/**
@@ -108,6 +109,12 @@ public static ConstantProvider getConstants(DetectorType type, int run, String v
108109
if(type==DetectorType.TARGET){
109110
provider.loadTable("/geometry/target");
110111
}
112+
113+
if(type==DetectorType.FMT){
114+
provider.loadTable("/geometry/fmt/fmt_global");
115+
provider.loadTable("/geometry/fmt/fmt_layer_noshim");
116+
provider.loadTable("/geometry/fmt/alignment");
117+
}
111118

112119
provider.disconnect();
113120
return provider;
@@ -162,6 +169,12 @@ public static Detector getDetector(DetectorType type, int run, String variation)
162169
return ftof;
163170
}
164171

172+
if(type==DetectorType.FMT){
173+
FMTFactory factory = new FMTFactory();
174+
Detector fmt = factory.createDetectorCLAS(provider);
175+
return fmt;
176+
}
177+
165178
System.out.println("[GeometryFactory] ---> detector construction for "
166179
+ type.getName() + " is not implemented");
167180
return null;

‎common-tools/clas-geometry/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>org.jlab.clas</groupId>
55
<artifactId>clas-geometry</artifactId>
6-
<version>7.0.0-SNAPSHOT</version>
6+
<version>7.0.1-SNAPSHOT</version>
77
<packaging>jar</packaging>
88

99
<parent>
1010
<groupId>org.jlab.clas</groupId>
1111
<artifactId>clas12rec</artifactId>
1212
<relativePath>../../parent/pom.xml</relativePath>
13-
<version>7.0.0-SNAPSHOT</version>
13+
<version>7.0.1-SNAPSHOT</version>
1414
</parent>
1515

1616
<build>

‎common-tools/clas-geometry/src/main/java/org/jlab/geom/DetectorId.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ public enum DetectorId implements Showable {
1717
BST ( 1, "BST"),
1818
CND ( 3, "CND"),
1919
RICH ( 6, "RICH"),
20+
FMT ( 8, "FMT"),
2021
FTCAL ( 9, "FTCAL"),
2122
CTOF (11, "CTOF"),
2223
FTOF (10, "FTOF"),

‎common-tools/clas-geometry/src/main/java/org/jlab/geom/component/TrackerStrip.java‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
package org.jlab.geom.component;
2+
3+
import org.jlab.geom.prim.Point3D;
4+
5+
/**
6+
* A tracker strip.
7+
* <p>
8+
* This class is an alias of
9+
* {@link org.jlab.geom.component.RectangularComponent}.
10+
*
11+
* @author devita
12+
*/
13+
public class TrackerStrip extends RectangularComponent {
14+
15+
private double width;
16+
private double thickness;
17+
18+
/**
19+
* Constructs a new {@code TrackerStrip} from the given points.
20+
* <p>
21+
* The line will be from the middle of the bottom face to the middle of the
22+
* top face. The midpoint will be at the midpoint of the line. The direction
23+
* vector will parallel the line.
24+
* @param componentId the id of the component
25+
* @param origin
26+
* @param end
27+
* @param width
28+
* @param thickness
29+
*/
30+
public TrackerStrip(int componentId,
31+
Point3D origin, Point3D end, double width, double thickness) {
32+
this(componentId,
33+
new Point3D(origin.x(), origin.y()-width/2, origin.z()+thickness/2),
34+
new Point3D(origin.x(), origin.y()+width/2, origin.z()+thickness/2),
35+
new Point3D(origin.x(), origin.y()+width/2, origin.z()-thickness/2),
36+
new Point3D(origin.x(), origin.y()-width/2, origin.z()-thickness/2),
37+
new Point3D(end.x(), end.y()-width/2, end.z()+thickness/2),
38+
new Point3D(end.x(), end.y()+width/2, end.z()+thickness/2),
39+
new Point3D(end.x(), end.y()+width/2, end.z()-thickness/2),
40+
new Point3D(end.x(), end.y()-width/2, end.z()-thickness/2));
41+
this.width = width;
42+
this.thickness = thickness;
43+
}
44+
45+
/**
46+
* Constructs a new {@code TrackerStrip} from the given points.
47+
* <p>
48+
* The line will be from the middle of the bottom face to the middle of the
49+
* top face. The midpoint will be at the midpoint of the line. The direction
50+
* vector will parallel the line.
51+
* @param p0 1st point of the bottom face
52+
* @param p1 2nd point of the bottom face
53+
* @param p2 3rd point of the bottom face
54+
* @param p3 4th point of the bottom face
55+
* @param p4 1st point of the top face
56+
* @param p5 2nd point of the top face
57+
* @param p6 3rd point of the top face
58+
* @param p7 4th point of the top face
59+
*/
60+
private TrackerStrip(int componentId, Point3D p0, Point3D p1, Point3D p2, Point3D p3, Point3D p4, Point3D p5, Point3D p6, Point3D p7) {
61+
super(componentId, p0, p1, p2, p3, p4, p5, p6, p7);
62+
}
63+
64+
65+
/**
66+
* Returns "Tracker Strip".
67+
* @return "Tracker Strip"
68+
*/
69+
@Override
70+
public String getType() {
71+
return "Tracker Strip";
72+
}
73+
74+
/**
75+
* Returns width of the strip
76+
* @return width
77+
*/
78+
public double getWidth() {
79+
return this.width;
80+
}
81+
82+
/**
83+
* Returns thickness of the strip
84+
* @return thickness
85+
*/
86+
public double getThickness() {
87+
return this.thickness;
88+
}
89+
}

0 commit comments

Comments
 (0)