Merge branch 'master' into sqlite_link_fix

JeffersonLab · Apr 8, 2018 · 60b0b54 · 60b0b54
2 parents 1f03674 + 8428014
commit 60b0b54
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/src/libraries/TRACKING/DTrackCandidate_factory.cc b/src/libraries/TRACKING/DTrackCandidate_factory.cc
@@ -1432,14 +1432,7 @@ bool DTrackCandidate_factory::MatchMethod1(const DTrackCandidate *fdccan,
        num_cdc++;
      }
 
-     if (num_match>=3 && double(num_match)/double(num_cdc)>0.33){
-       // Put the fdc candidate in the combined list
-       DTrackCandidate *can = new DTrackCandidate;
-       can->setPID((q > 0.0) ? PiPlus : PiMinus);
-
-       // copy the list of cdc indices over from the cdc candidate
-       can->used_cdc_indexes=cdccan->used_cdc_indexes;
-
+     if (num_match>=3 && double(num_match)/double(num_cdc)>0.33){              
        // Get the segment data
        vector<const DFDCSegment *>segments;
        fdccan->GetT(segments);
@@ -1460,6 +1453,13 @@ bool DTrackCandidate_factory::MatchMethod1(const DTrackCandidate *fdccan,
 	 continue; 
        }
 
+       // Put the fdc candidate in the combined list
+       DTrackCandidate *can = new DTrackCandidate;
+       can->setPID((q > 0.0) ? PiPlus : PiMinus);
+
+       // copy the list of cdc indices over from the cdc candidate
+       can->used_cdc_indexes=cdccan->used_cdc_indexes;
+
        // Add the fdc hits to track candidate as associated objects 
        unsigned int num_fdc_hits=0;
        for (unsigned int m=0;m<segments.size();m++){