Skip to content

Commit f55b97b

Browse files
authored
Merge branch 'development' into rgl-yaml
2 parents a2ce227 + 1ccf10a commit f55b97b

20 files changed

Lines changed: 1445 additions & 1306 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ jobs:
9393
run: |
9494
tar czvf coatjava.tar.gz coatjava
9595
tar czvf clara.tar.gz clara
96-
- uses: actions/upload-artifact@v6
96+
- uses: actions/upload-artifact@v7
9797
with:
9898
name: build_${{ matrix.runner }}
9999
retention-days: 1
@@ -138,7 +138,7 @@ jobs:
138138
run: validation/jacoco-aggregate.sh
139139
- name: publish jacoco report
140140
if: ${{ matrix.JAVA_VERSION == env.JAVA_VERSION }}
141-
uses: actions/upload-artifact@v6
141+
uses: actions/upload-artifact@v7
142142
with:
143143
name: jacoco_report
144144
path: publish/

common-tools/clas-detector/src/main/java/org/jlab/detector/decode/CLASDecoder.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -745,10 +745,12 @@ public void initEvent(DataEvent event){
745745

746746
int runNumberCoda = codaDecoder.getRunNumber();
747747
this.setRunNumber(runNumberCoda);
748-
749-
detectorDecoder.translate(dataList);
750-
detectorDecoder.fitPulses(dataList);
751-
detectorDecoder.filterTDCs(dataList);
748+
749+
if (runNumberCoda > 0) {
750+
detectorDecoder.translate(dataList);
751+
detectorDecoder.fitPulses(dataList);
752+
detectorDecoder.filterTDCs(dataList);
753+
}
752754

753755
if(this.decoderDebugMode>0){
754756
System.out.println("\n>>>>>>>>> TRANSLATED data");

common-tools/clas-detector/src/main/java/org/jlab/detector/decode/CodaDecoders.java

Lines changed: 922 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)