Author: [log in to unmask]
Date: Tue Feb 24 08:13:46 2015
New Revision: 2180
Log:
add new quality variable
Modified:
java/trunk/tracking/src/main/java/org/hps/recon/tracking/EventQuality.java
java/trunk/tracking/src/main/java/org/hps/recon/tracking/TrackUtils.java
Modified: java/trunk/tracking/src/main/java/org/hps/recon/tracking/EventQuality.java
=============================================================================
--- java/trunk/tracking/src/main/java/org/hps/recon/tracking/EventQuality.java (original)
+++ java/trunk/tracking/src/main/java/org/hps/recon/tracking/EventQuality.java Tue Feb 24 08:13:46 2015
@@ -17,7 +17,7 @@
private static EventQuality _instance = null;
public static enum Quality {
- LOOSE, MEDIUM, TIGHT
+ LOOSE, MEDIUM, TIGHT, NONE
}
public static enum Cut {
Modified: java/trunk/tracking/src/main/java/org/hps/recon/tracking/TrackUtils.java
=============================================================================
--- java/trunk/tracking/src/main/java/org/hps/recon/tracking/TrackUtils.java (original)
+++ java/trunk/tracking/src/main/java/org/hps/recon/tracking/TrackUtils.java Tue Feb 24 08:13:46 2015
@@ -12,6 +12,7 @@
import java.util.List;
import java.util.Map;
+import org.hps.recon.tracking.EventQuality.Quality;
import org.hps.recon.tracking.gbl.HelicalTrackStripGbl;
import org.lcsim.detector.ITransform3D;
import org.lcsim.detector.solids.Box;
@@ -631,16 +632,18 @@
public static int passTrackSelections(Track track, List<Track> tracklist, EventQuality.Quality trk_quality) {
int cuts[] = { 0 };
- if (track.getTrackStates().get(0).getMomentum()[0] < EventQuality.instance().getCutValue(EventQuality.Cut.PZ, trk_quality))
- cut(cuts, EventQuality.Cut.PZ);
- if (track.getChi2() >= EventQuality.instance().getCutValue(EventQuality.Cut.CHI2, trk_quality))
- cut(cuts, EventQuality.Cut.CHI2);
- if (numberOfSharedHits(track, tracklist) > ((int) Math.round(EventQuality.instance().getCutValue(EventQuality.Cut.SHAREDHIT, trk_quality))))
- cut(cuts, EventQuality.Cut.SHAREDHIT);
- if (hasTopBotHit(track))
- cut(cuts, EventQuality.Cut.TOPBOTHIT);
- if (track.getTrackerHits().size() < ((int) Math.round(EventQuality.instance().getCutValue(EventQuality.Cut.NHITS, trk_quality))))
- cut(cuts, EventQuality.Cut.NHITS);
+ if(trk_quality.compareTo(Quality.NONE) != 0) {
+ if (track.getTrackStates().get(0).getMomentum()[0] < EventQuality.instance().getCutValue(EventQuality.Cut.PZ, trk_quality))
+ cut(cuts, EventQuality.Cut.PZ);
+ if (track.getChi2() >= EventQuality.instance().getCutValue(EventQuality.Cut.CHI2, trk_quality))
+ cut(cuts, EventQuality.Cut.CHI2);
+ if (numberOfSharedHits(track, tracklist) > ((int) Math.round(EventQuality.instance().getCutValue(EventQuality.Cut.SHAREDHIT, trk_quality))))
+ cut(cuts, EventQuality.Cut.SHAREDHIT);
+ if (hasTopBotHit(track))
+ cut(cuts, EventQuality.Cut.TOPBOTHIT);
+ if (track.getTrackerHits().size() < ((int) Math.round(EventQuality.instance().getCutValue(EventQuality.Cut.NHITS, trk_quality))))
+ cut(cuts, EventQuality.Cut.NHITS);
+ }
return cuts[0];
}
|