Author: [log in to unmask]
Date: Tue Sep 15 12:09:48 2015
New Revision: 3604
Log:
Fix my XOR screwup...now "GBLTracks" and "SeedTracks" histograms really are what they say they are.
Modified:
java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/DataQualityMonitor.java
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/DataQualityMonitor.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/DataQualityMonitor.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/DataQualityMonitor.java Tue Sep 15 12:09:48 2015
@@ -37,7 +37,7 @@
protected String outputPlotDir = "DQMOutputPlots/";
String triggerType = "all";//allowed types are "" (blank) or "all", singles0, singles1, pairs0,pairs1
- boolean isGBL = false;
+ public boolean isGBL = false;
public void setTriggerType(String type) {
this.triggerType = type;
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:09:48 2015
@@ -170,7 +170,7 @@
if (debug) {
System.out.println("PDGID = " + fsPart.getParticleIDUsed() + "; charge = " + fsPart.getCharge() + "; pz = " + fsPart.getMomentum().x());
}
- if(isGBL^fsPart.getType()<32)//XOR!!!!
+ if (!(isGBL ^ fsPart.getType() < 32))//XOR!!!!
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:09:48 2015
@@ -197,7 +197,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 ^ uncV0.getType() < 32))//XOR!!!!
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:09:48 2015
@@ -229,7 +229,7 @@
List<ReconstructedParticle> unonstrainedV0List = event.get(ReconstructedParticle.class, unconstrainedV0CandidatesColName);
for (ReconstructedParticle uncV0 : unonstrainedV0List) {
- if (isGBL ^ uncV0.getType() < 32)//XOR!!!!
+ if (!(isGBL ^ uncV0.getType() < 32))//XOR!!!!
continue;
Vertex uncVert = uncV0.getStartVertex();
unconVx.fill(uncVert.getPosition().x());
|