Author: [log in to unmask]
Date: Wed Jul 6 15:48:40 2016
New Revision: 4416
Log:
fix tuple steering files
Modified:
java/trunk/analysis/src/main/java/org/hps/analysis/tuple/MollerTupleDriver.java
java/trunk/analysis/src/main/java/org/hps/analysis/tuple/TridentTupleDriver.java
java/trunk/analysis/src/main/java/org/hps/analysis/tuple/TupleDriver.java
java/trunk/steering-files/src/main/resources/org/hps/steering/analysis/MakeTuples.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/analysis/MakeTuplesMC.lcsim
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/tuple/MollerTupleDriver.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/tuple/MollerTupleDriver.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/tuple/MollerTupleDriver.java Wed Jul 6 15:48:40 2016
@@ -80,8 +80,8 @@
billiorTracks.add(new BilliorTrack(botTSTweaked, botTrack.getChi2(), botTrack.getNDF()));
double minPositiveIso = Math.min(tupleMap.get("topMinPositiveIso/D"), tupleMap.get("botMinPositiveIso/D"));
- double minNegativeIso = Math.max(Math.min(tupleMap.get("topMinNegativeIso/D"), 9999), Math.min(tupleMap.get("botMinNegativeIso/D"), 9999));
- double minIso = Math.min(Math.abs(minPositiveIso), Math.abs(minNegativeIso));
+ double minNegativeIso = Math.min(Math.abs(tupleMap.get("topMinNegativeIso/D")), Math.abs(tupleMap.get("botMinNegativeIso/D")));
+ double minIso = Math.min(minPositiveIso, minNegativeIso);
fillVertexVariables(event, billiorTracks, top, bot);
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/tuple/TridentTupleDriver.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/tuple/TridentTupleDriver.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/tuple/TridentTupleDriver.java Wed Jul 6 15:48:40 2016
@@ -76,8 +76,8 @@
billiorTracks.add(new BilliorTrack(posTSTweaked, posTrack.getChi2(), posTrack.getNDF()));
double minPositiveIso = Math.min(tupleMap.get("eleMinPositiveIso/D"), tupleMap.get("posMinPositiveIso/D"));
- double minNegativeIso = Math.max(Math.min(tupleMap.get("eleMinNegativeIso/D"), 9999), Math.min(tupleMap.get("posMinNegativeIso/D"), 9999));
- double minIso = Math.min(Math.abs(minPositiveIso), Math.abs(minNegativeIso));
+ double minNegativeIso = Math.min(Math.abs(tupleMap.get("eleMinNegativeIso/D")), Math.abs(tupleMap.get("posMinNegativeIso/D")));
+ double minIso = Math.min(minPositiveIso, minNegativeIso);
fillVertexVariables(event, billiorTracks, electron, positron);
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/tuple/TupleDriver.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/tuple/TupleDriver.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/tuple/TupleDriver.java Wed Jul 6 15:48:40 2016
@@ -246,7 +246,7 @@
"PhiKink1/D", "PhiKink2/D", "PhiKink3/D",
"IsoStereo/D", "IsoAxial/D",
"MinPositiveIso/D", "MinNegativeIso/D",
- "MatchChisq/D", "ClT/D", "ClE/D", "ClX/D", "ClY/D", "ClZ/D", "ClHits/I"};
+ "MatchChisq/D", "ClT/D", "ClE/D", "ClSeedE/D", "ClX/D", "ClY/D", "ClZ/D", "ClHits/I"};
for (int i = 0; i < newVars.length; i++) {
newVars[i] = prefix + newVars[i];
}
@@ -364,6 +364,7 @@
Cluster cluster = particle.getClusters().get(0);
tupleMap.put(prefix + "ClT/D", ClusterUtilities.getSeedHitTime(cluster));
tupleMap.put(prefix + "ClE/D", cluster.getEnergy());
+ tupleMap.put(prefix + "ClSeedE/D", ClusterUtilities.findSeedHit(cluster).getCorrectedEnergy());
tupleMap.put(prefix + "ClX/D", cluster.getPosition()[0]);
tupleMap.put(prefix + "ClY/D", cluster.getPosition()[1]);
tupleMap.put(prefix + "ClZ/D", cluster.getPosition()[2]);
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/analysis/MakeTuples.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/analysis/MakeTuples.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/analysis/MakeTuples.lcsim Wed Jul 6 15:48:40 2016
@@ -3,6 +3,7 @@
<execute>
<driver name="EventMarkerDriver"/>
<driver name="CleanupDriver"/>
+ <driver name="EventFlagFilter"/>
<driver name="RawTrackerHitSensorSetup"/>
<driver name="TridentTuple"/>
@@ -14,6 +15,8 @@
<eventInterval>1000</eventInterval>
</driver>
<driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver"/>
+ <driver name="EventFlagFilter" type="org.hps.recon.filtering.EventFlagFilter">
+ </driver>
<driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup">
<readoutCollections>SVTRawTrackerHits</readoutCollections>
</driver>
@@ -23,20 +26,46 @@
<isGBL>true</isGBL>
<tupleFile>${outputFile}_tri.txt</tupleFile>
<cutTuple>true</cutTuple>
+ <beamPosZ>-5.0</beamPosZ>
+ <topDOmega>-1.04e-6</topDOmega>
+ <botDOmega>0.83e-6</botDOmega>
+ <topDLambda>-5e-4</topDLambda>
+ <botDLambda>13e-4</botDLambda>
+ <topDPhi>1.5e-3</topDPhi>
+ <botDPhi>-0.3e-3</botDPhi>
+ <topDZ0>0.14</topDZ0>
+ <botDZ0>-0.16</botDZ0>
</driver>
<driver name="MollerTuple" type="org.hps.analysis.tuple.MollerTupleDriver">
<triggerType>all</triggerType>
<isGBL>true</isGBL>
<tupleFile>${outputFile}_moller.txt</tupleFile>
<cutTuple>true</cutTuple>
+ <beamPosZ>-5.0</beamPosZ>
+ <topDOmega>-1.04e-6</topDOmega>
+ <botDOmega>0.83e-6</botDOmega>
+ <topDLambda>-5e-4</topDLambda>
+ <botDLambda>13e-4</botDLambda>
+ <topDPhi>1.5e-3</topDPhi>
+ <botDPhi>-0.3e-3</botDPhi>
+ <topDZ0>0.14</topDZ0>
+ <botDZ0>-0.16</botDZ0>
</driver>
<driver name="FEETuple" type="org.hps.analysis.tuple.FEETupleDriver">
<triggerType>all</triggerType>
<isGBL>true</isGBL>
<tupleFile>${outputFile}_fee.txt</tupleFile>
<cutTuple>true</cutTuple>
+ <beamPosZ>-5.0</beamPosZ>
+ <topDOmega>-1.04e-6</topDOmega>
+ <botDOmega>0.83e-6</botDOmega>
+ <topDLambda>-5e-4</topDLambda>
+ <botDLambda>13e-4</botDLambda>
+ <topDPhi>1.5e-3</topDPhi>
+ <botDPhi>-0.3e-3</botDPhi>
+ <topDZ0>0.14</topDZ0>
+ <botDZ0>-0.16</botDZ0>
</driver>
-
</drivers>
</lcsim>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/analysis/MakeTuplesMC.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/analysis/MakeTuplesMC.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/analysis/MakeTuplesMC.lcsim Wed Jul 6 15:48:40 2016
@@ -3,7 +3,6 @@
<execute>
<driver name="EventMarkerDriver"/>
<driver name="CleanupDriver"/>
- <driver name="EventFlagFilter"/>
<driver name="RawTrackerHitSensorSetup"/>
<driver name="TridentTuple"/>
@@ -15,9 +14,6 @@
<eventInterval>1000</eventInterval>
</driver>
<driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver"/>
- <driver name="EventFlagFilter"
- type="org.hps.recon.filtering.EventFlagFilter">
- </driver>
<driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup">
<readoutCollections>SVTRawTrackerHits</readoutCollections>
</driver>
@@ -27,44 +23,19 @@
<isGBL>true</isGBL>
<tupleFile>${outputFile}_tri.txt</tupleFile>
<cutTuple>true</cutTuple>
- <topDOmega>-1.04e-6</topDOmega>
- <botDOmega>0.83e-6</botDOmega>
- <topDLambda>-5e-4</topDLambda>
- <botDLambda>13e-4</botDLambda>
- <topDPhi>1.5e-3</topDPhi>
- <botDPhi>-0.3e-3</botDPhi>
- <topDZ0>0.14</topDZ0>
- <botDZ0>-0.16</botDZ0>
</driver>
<driver name="MollerTuple" type="org.hps.analysis.tuple.MollerTupleDriver">
<triggerType>all</triggerType>
<isGBL>true</isGBL>
<tupleFile>${outputFile}_moller.txt</tupleFile>
<cutTuple>true</cutTuple>
- <topDOmega>-1.04e-6</topDOmega>
- <botDOmega>0.83e-6</botDOmega>
- <topDLambda>-5e-4</topDLambda>
- <botDLambda>13e-4</botDLambda>
- <topDPhi>1.5e-3</topDPhi>
- <botDPhi>-0.3e-3</botDPhi>
- <topDZ0>0.14</topDZ0>
- <botDZ0>-0.16</botDZ0>
</driver>
<driver name="FEETuple" type="org.hps.analysis.tuple.FEETupleDriver">
<triggerType>all</triggerType>
<isGBL>true</isGBL>
<tupleFile>${outputFile}_fee.txt</tupleFile>
<cutTuple>true</cutTuple>
- <topDOmega>-1.04e-6</topDOmega>
- <botDOmega>0.83e-6</botDOmega>
- <topDLambda>-5e-4</topDLambda>
- <botDLambda>13e-4</botDLambda>
- <topDPhi>1.5e-3</topDPhi>
- <botDPhi>-0.3e-3</botDPhi>
- <topDZ0>0.14</topDZ0>
- <botDZ0>-0.16</botDZ0>
</driver>
-
</drivers>
</lcsim>
