Skip to content

Commit 6515670

Browse files
baltzellbaltzell
authored
Merge pull request JeffersonLab#629 from JeffersonLab/development
Merge to master for production release
2 parents c28490c + 319cdfc commit 6515670

39 files changed

Lines changed: 219 additions & 170 deletions

File tree

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

Lines changed: 7 additions & 7 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>6.5.12-SNAPSHOT</version>
6+
<version>6.5.13-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>6.5.12-SNAPSHOT</version>
13+
<version>6.5.13-SNAPSHOT</version>
1414
</parent>
1515

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

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

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

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

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

6060
<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>6.5.12-SNAPSHOT</version>
6+
<version>6.5.13-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>6.5.12-SNAPSHOT</version>
13+
<version>6.5.13-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>6.5.12-SNAPSHOT</version>
33+
<version>6.5.13-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>6.5.12-SNAPSHOT</version>
45+
<version>6.5.13-SNAPSHOT</version>
4646
</dependency>
4747

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

5454
<dependency>

‎common-tools/clas-detector/src/main/java/org/jlab/detector/helicity/HelicityState.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,15 +110,17 @@ public static HelicityState createFromFadcBank(Bank adcBank) {
110110
break;
111111
}
112112
}
113+
113114
state.hwStatus=0;
114115
if (state.helicityRaw==HelicityBit.UDF) state.hwStatus |= Mask.HELICITY;
115116
if (state.pairSync==HelicityBit.UDF) state.hwStatus |= Mask.SYNC;
116117
if (state.patternSync==HelicityBit.UDF) state.hwStatus |= Mask.PATTERN;
117118

119+
state.fixMissingReadouts();
120+
118121
// Fix the overall sign-convention error in the offline helicity:
119122
state.invert();
120-
121-
state.fixMissingReadouts();
123+
122124
return state;
123125
}
124126

‎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>6.5.12-SNAPSHOT</version>
6+
<version>6.5.13-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>6.5.12-SNAPSHOT</version>
13+
<version>6.5.13-SNAPSHOT</version>
1414
</parent>
1515

1616
<build>

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

Lines changed: 3 additions & 3 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-io</artifactId>
6-
<version>6.5.12-SNAPSHOT</version>
6+
<version>6.5.13-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>6.5.12-SNAPSHOT</version>
13+
<version>6.5.13-SNAPSHOT</version>
1414
</parent>
1515

1616
<build>
@@ -75,7 +75,7 @@
7575
<dependency>
7676
<groupId>org.jlab.clas</groupId>
7777
<artifactId>clas-utils</artifactId>
78-
<version>6.5.12-SNAPSHOT</version>
78+
<version>6.5.13-SNAPSHOT</version>
7979
</dependency>
8080
</dependencies>
8181

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

Lines changed: 4 additions & 4 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-jcsg</artifactId>
6-
<version>6.5.12-SNAPSHOT</version>
6+
<version>6.5.13-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>6.5.12-SNAPSHOT</version>
13+
<version>6.5.13-SNAPSHOT</version>
1414
</parent>
1515

1616
<build>
@@ -40,12 +40,12 @@
4040
<dependency>
4141
<groupId>org.jlab.clas</groupId>
4242
<artifactId>clas-geometry</artifactId>
43-
<version>6.5.12-SNAPSHOT</version>
43+
<version>6.5.13-SNAPSHOT</version>
4444
</dependency>
4545
<dependency>
4646
<groupId>org.jlab.clas</groupId>
4747
<artifactId>clas-detector</artifactId>
48-
<version>6.5.12-SNAPSHOT</version>
48+
<version>6.5.13-SNAPSHOT</version>
4949
</dependency>
5050
<dependency>
5151
<groupId>java3d</groupId>

‎common-tools/clas-math/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-math</artifactId>
6-
<version>6.5.12-SNAPSHOT</version>
6+
<version>6.5.13-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>6.5.12-SNAPSHOT</version>
13+
<version>6.5.13-SNAPSHOT</version>
1414
</parent>
1515

1616
<build>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>org.jlab.clas</groupId>
66
<artifactId>clas-physics</artifactId>
7-
<version>6.5.12-SNAPSHOT</version>
7+
<version>6.5.13-SNAPSHOT</version>
88
<packaging>jar</packaging>
99
<build>
1010
<plugins>
@@ -23,7 +23,7 @@
2323
<groupId>org.jlab.clas</groupId>
2424
<artifactId>clas12rec</artifactId>
2525
<relativePath>../../parent/pom.xml</relativePath>
26-
<version>6.5.12-SNAPSHOT</version>
26+
<version>6.5.13-SNAPSHOT</version>
2727
</parent>
2828

2929
</project>

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

Lines changed: 7 additions & 7 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-reco</artifactId>
6-
<version>6.5.12-SNAPSHOT</version>
6+
<version>6.5.13-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>6.5.12-SNAPSHOT</version>
13+
<version>6.5.13-SNAPSHOT</version>
1414
</parent>
1515

1616
<build>
@@ -67,7 +67,7 @@
6767
<dependency>
6868
<groupId>org.jlab.clas</groupId>
6969
<artifactId>clas-math</artifactId>
70-
<version>6.5.12-SNAPSHOT</version>
70+
<version>6.5.13-SNAPSHOT</version>
7171
</dependency>
7272
<!--
7373
<dependency>
@@ -80,25 +80,25 @@
8080
<dependency>
8181
<groupId>org.jlab.clas</groupId>
8282
<artifactId>clas-io</artifactId>
83-
<version>6.5.12-SNAPSHOT</version>
83+
<version>6.5.13-SNAPSHOT</version>
8484
</dependency>
8585

8686
<dependency>
8787
<groupId>org.jlab.clas</groupId>
8888
<artifactId>clas-physics</artifactId>
89-
<version>6.5.12-SNAPSHOT</version>
89+
<version>6.5.13-SNAPSHOT</version>
9090
</dependency>
9191

9292
<dependency>
9393
<groupId>org.jlab.clas</groupId>
9494
<artifactId>clas-utils</artifactId>
95-
<version>6.5.12-SNAPSHOT</version>
95+
<version>6.5.13-SNAPSHOT</version>
9696
</dependency>
9797

9898
<dependency>
9999
<groupId>org.jlab.clas</groupId>
100100
<artifactId>clas-detector</artifactId>
101-
<version>6.5.12-SNAPSHOT</version>
101+
<version>6.5.13-SNAPSHOT</version>
102102
</dependency>
103103

104104
<!--

0 commit comments

Comments
 (0)