Skip to content
This repository has been archived by the owner on May 18, 2023. It is now read-only.

Commit

Permalink
Merge pull request #629 from JeffersonLab/development
Browse files Browse the repository at this point in the history 
Merge to master for production release
  • Loading branch information
@baltzell
baltzell authored Nov 11, 2020
2 parents 0b35a02 + 28336fb commit bc98762
Show file tree
Hide file tree
Showing 39 changed files with 219 additions and 170 deletions.
14 changes: 7 additions & 7 deletions common-tools/clas-analysis/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-analysis</artifactId>
<version>6.5.12-SNAPSHOT</version>
<version>6.5.13-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>6.5.12-SNAPSHOT</version>
<version>6.5.13-SNAPSHOT</version>
</parent>

<build>
Expand All @@ -30,31 +30,31 @@
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-utils</artifactId>
<version>6.5.12-SNAPSHOT</version>
<version>6.5.13-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-physics</artifactId>
<version>6.5.12-SNAPSHOT</version>
<version>6.5.13-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-io</artifactId>
<version>6.5.12-SNAPSHOT</version>
<version>6.5.13-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-geometry</artifactId>
<version>6.5.12-SNAPSHOT</version>
<version>6.5.13-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-detector</artifactId>
<version>6.5.12-SNAPSHOT</version>
<version>6.5.13-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down
10 changes: 5 additions & 5 deletions common-tools/clas-detector/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-detector</artifactId>
<version>6.5.12-SNAPSHOT</version>
<version>6.5.13-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>6.5.12-SNAPSHOT</version>
<version>6.5.13-SNAPSHOT</version>
</parent>

<build>
Expand All @@ -30,7 +30,7 @@
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-utils</artifactId>
<version>6.5.12-SNAPSHOT</version>
<version>6.5.13-SNAPSHOT</version>
</dependency>

<dependency>
Expand All @@ -42,13 +42,13 @@
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-io</artifactId>
<version>6.5.12-SNAPSHOT</version>
<version>6.5.13-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-geometry</artifactId>
<version>6.5.12-SNAPSHOT</version>
<version>6.5.13-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down
6 changes: 4 additions & 2 deletions common-tools/clas-detector/src/main/java/org/jlab/detector/helicity/HelicityState.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,15 +110,17 @@ public static HelicityState createFromFadcBank(Bank adcBank) {
break;
}
}

state.hwStatus=0;
if (state.helicityRaw==HelicityBit.UDF) state.hwStatus |= Mask.HELICITY;
if (state.pairSync==HelicityBit.UDF) state.hwStatus |= Mask.SYNC;
if (state.patternSync==HelicityBit.UDF) state.hwStatus |= Mask.PATTERN;

state.fixMissingReadouts();

// Fix the overall sign-convention error in the offline helicity:
state.invert();

state.fixMissingReadouts();

return state;
}

Expand Down
4 changes: 2 additions & 2 deletions common-tools/clas-geometry/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-geometry</artifactId>
<version>6.5.12-SNAPSHOT</version>
<version>6.5.13-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>6.5.12-SNAPSHOT</version>
<version>6.5.13-SNAPSHOT</version>
</parent>

<build>
Expand Down
6 changes: 3 additions & 3 deletions common-tools/clas-io/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-io</artifactId>
<version>6.5.12-SNAPSHOT</version>
<version>6.5.13-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>6.5.12-SNAPSHOT</version>
<version>6.5.13-SNAPSHOT</version>
</parent>

<build>
Expand Down Expand Up @@ -75,7 +75,7 @@
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-utils</artifactId>
<version>6.5.12-SNAPSHOT</version>
<version>6.5.13-SNAPSHOT</version>
</dependency>
</dependencies>

Expand Down
8 changes: 4 additions & 4 deletions common-tools/clas-jcsg/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-jcsg</artifactId>
<version>6.5.12-SNAPSHOT</version>
<version>6.5.13-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>6.5.12-SNAPSHOT</version>
<version>6.5.13-SNAPSHOT</version>
</parent>

<build>
Expand Down Expand Up @@ -40,12 +40,12 @@
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-geometry</artifactId>
<version>6.5.12-SNAPSHOT</version>
<version>6.5.13-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-detector</artifactId>
<version>6.5.12-SNAPSHOT</version>
<version>6.5.13-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>java3d</groupId>
Expand Down
4 changes: 2 additions & 2 deletions common-tools/clas-math/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-math</artifactId>
<version>6.5.12-SNAPSHOT</version>
<version>6.5.13-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>6.5.12-SNAPSHOT</version>
<version>6.5.13-SNAPSHOT</version>
</parent>

<build>
Expand Down
4 changes: 2 additions & 2 deletions common-tools/clas-physics/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>org.jlab.clas</groupId>
<artifactId>clas-physics</artifactId>
<version>6.5.12-SNAPSHOT</version>
<version>6.5.13-SNAPSHOT</version>
<packaging>jar</packaging>
<build>
<plugins>
Expand All @@ -23,7 +23,7 @@
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>6.5.12-SNAPSHOT</version>
<version>6.5.13-SNAPSHOT</version>
</parent>

</project>
14 changes: 7 additions & 7 deletions common-tools/clas-reco/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-reco</artifactId>
<version>6.5.12-SNAPSHOT</version>
<version>6.5.13-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>6.5.12-SNAPSHOT</version>
<version>6.5.13-SNAPSHOT</version>
</parent>

<build>
Expand Down Expand Up @@ -67,7 +67,7 @@
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-math</artifactId>
<version>6.5.12-SNAPSHOT</version>
<version>6.5.13-SNAPSHOT</version>
</dependency>
<!--
<dependency>
Expand All @@ -80,25 +80,25 @@
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-io</artifactId>
<version>6.5.12-SNAPSHOT</version>
<version>6.5.13-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-physics</artifactId>
<version>6.5.12-SNAPSHOT</version>
<version>6.5.13-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-utils</artifactId>
<version>6.5.12-SNAPSHOT</version>
<version>6.5.13-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-detector</artifactId>
<version>6.5.12-SNAPSHOT</version>
<version>6.5.13-SNAPSHOT</version>
</dependency>

<!--
Expand Down
Loading

0 comments on commit bc98762

Please sign in to comment.