Author: [log in to unmask]
Date: Tue Sep 15 12:35:20 2015
New Revision: 3605
Log:
there's a utility method for this
Modified:
java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/FinalStateMonitoring.java
java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/TridentMonitoring.java
java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/V0Monitoring.java
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/FinalStateMonitoring.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/FinalStateMonitoring.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/FinalStateMonitoring.java Tue Sep 15 12:35:20 2015
@@ -16,6 +16,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
import org.hps.recon.ecal.cluster.ClusterUtilities;
+import org.hps.recon.tracking.TrackType;
import org.hps.recon.tracking.TrackUtils;
import org.lcsim.event.Cluster;
import org.lcsim.event.EventHeader;
@@ -170,7 +171,7 @@
if (debug) {
System.out.println("PDGID = " + fsPart.getParticleIDUsed() + "; charge = " + fsPart.getCharge() + "; pz = " + fsPart.getMomentum().x());
}
- if (!(isGBL ^ fsPart.getType() < 32))//XOR!!!!
+ if (isGBL != TrackType.isGBL(fsPart.getType()))
continue;
// Extrapolate the track to the Ecal cluster position
boolean isPhoton = false;
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/TridentMonitoring.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/TridentMonitoring.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/TridentMonitoring.java Tue Sep 15 12:35:20 2015
@@ -11,6 +11,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map.Entry;
+import org.hps.recon.tracking.TrackType;
import org.hps.recon.tracking.TrackUtils;
import org.lcsim.event.EventHeader;
import org.lcsim.event.ReconstructedParticle;
@@ -197,7 +198,7 @@
ReconstructedParticle bestCandidate = new BaseReconstructedParticle();
List<ReconstructedParticle> unConstrainedV0List = event.get(ReconstructedParticle.class, unconstrainedV0CandidatesColName);
for (ReconstructedParticle uncV0 : unConstrainedV0List) {
- if (!(isGBL ^ uncV0.getType() < 32))//XOR!!!!
+ if (isGBL != TrackType.isGBL(uncV0.getType()))
continue;
Vertex uncVert = uncV0.getStartVertex();
// v0 & vertex-quality cuts
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/V0Monitoring.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/V0Monitoring.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/V0Monitoring.java Tue Sep 15 12:35:20 2015
@@ -17,6 +17,7 @@
import java.util.Map.Entry;
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.hps.recon.tracking.TrackType;
import org.hps.recon.tracking.TrackUtils;
import org.hps.recon.vertexing.BilliorTrack;
import org.hps.recon.vertexing.BilliorVertex;
@@ -229,7 +230,7 @@
List<ReconstructedParticle> unonstrainedV0List = event.get(ReconstructedParticle.class, unconstrainedV0CandidatesColName);
for (ReconstructedParticle uncV0 : unonstrainedV0List) {
- if (!(isGBL ^ uncV0.getType() < 32))//XOR!!!!
+ if (isGBL != TrackType.isGBL(uncV0.getType()))
continue;
Vertex uncVert = uncV0.getStartVertex();
unconVx.fill(uncVert.getPosition().x());
|