Skip to content

Commit 1fdbc5f

Browse files
fixes for null pointers exceptions
1 parent 5aec4a5 commit 1fdbc5f

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

build-coatjava.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ 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
101+
#rm -rf ~/.m2/repository/org/hep/hipo
102+
#rm -rf ~/.m2/repository/org/jlab
103103
cd common-tools/coat-lib; $mvn clean; cd -
104104

105105
unset CLAS12DIR

reconstruction/dc/src/main/java/org/jlab/rec/dc/track/TrackCandListFinder.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -749,7 +749,7 @@ private Track FindBestTrack(List<Track> trkList) {
749749
public void matchHits(List<StateVec> stateVecAtPlanesList, Track trk,
750750
DCGeant4Factory DcDetector, Swim dcSwim) {
751751

752-
if (stateVecAtPlanesList == null) {
752+
if (stateVecAtPlanesList == null || trk.get_Vtx0()==null) {
753753
return;
754754
}
755755

@@ -819,9 +819,6 @@ public void setHitDoubletsInfo(Segment seg) {
819819
h.set_AssociatedHBTrackID(-1);
820820
}
821821
}
822-
else {
823-
System.out.println("setHitDoubletsInfo : this method should be used only for segments on track");
824-
}
825822
}
826823

827824
private double calcCurvSign(Track cand) {

reconstruction/dc/src/main/java/org/jlab/service/dc/DCTBEngine.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,9 +219,11 @@ public boolean processDataEvent(DataEvent event) {
219219
return true; // HB tracks not saved correctly
220220
}
221221
for(Segment seg : segments) {
222-
TrackArray[seg.get(0).get_AssociatedHBTrackID()-1].get_ListOfHBSegments().add(seg);
223-
if(seg.get_Status()==1)
224-
TrackArray[seg.get(0).get_AssociatedHBTrackID()-1].set_Status(1);
222+
if(seg.get(0).get_AssociatedHBTrackID()>0) {
223+
TrackArray[seg.get(0).get_AssociatedHBTrackID()-1].get_ListOfHBSegments().add(seg);
224+
if(seg.get_Status()==1)
225+
TrackArray[seg.get(0).get_AssociatedHBTrackID()-1].set_Status(1);
226+
}
225227
}
226228

227229
//6) find the list of track candidates

0 commit comments

Comments
 (0)