Author: [log in to unmask]
Date: Fri Apr 24 17:12:15 2015
New Revision: 2816
Log:
split out MC DQM into its own steering file
Added:
java/trunk/steering-files/src/main/resources/org/hps/steering/production/DataQualityReconMC.lcsim
- copied, changed from r2806, java/trunk/steering-files/src/main/resources/org/hps/steering/production/DataQualityRecon.lcsim
Modified:
java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/SvtMonitoring.java
java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/TrackingMonitoring.java
java/trunk/steering-files/src/main/resources/org/hps/steering/production/DataQualityRecon.lcsim
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/SvtMonitoring.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/SvtMonitoring.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/SvtMonitoring.java Fri Apr 24 17:12:15 2015
@@ -8,14 +8,11 @@
import hep.aida.IHistogram2D;
import hep.aida.IPlotter;
import hep.aida.IPlotterStyle;
-import hep.physics.vec.BasicHep3Vector;
-import hep.physics.vec.Hep3Vector;
import java.io.IOException;
import java.sql.SQLException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.hps.recon.tracking.FittedRawTrackerHit;
@@ -26,7 +23,6 @@
import org.lcsim.event.LCRelation;
import org.lcsim.event.RawTrackerHit;
import org.lcsim.event.RelationalTable;
-import org.lcsim.event.SimTrackerHit;
import org.lcsim.event.TrackerHit;
import org.lcsim.event.base.BaseRelationalTable;
import org.lcsim.geometry.Detector;
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/TrackingMonitoring.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/TrackingMonitoring.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/TrackingMonitoring.java Fri Apr 24 17:12:15 2015
@@ -91,6 +91,9 @@
aida.tree().cd("/");
+ if (!event.hasCollection(LCRelation.class, helicalTrackHitRelationsCollectionName)|| !event.hasCollection(LCRelation.class, rotatedHelicalTrackHitRelationsCollectionName)) {
+ return;
+ }
RelationalTable hittostrip = new BaseRelationalTable(RelationalTable.Mode.MANY_TO_MANY, RelationalTable.Weighting.UNWEIGHTED);
List<LCRelation> hitrelations = event.get(LCRelation.class, helicalTrackHitRelationsCollectionName);
for (LCRelation relation : hitrelations) {
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/production/DataQualityRecon.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/production/DataQualityRecon.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/production/DataQualityRecon.lcsim Fri Apr 24 17:12:15 2015
@@ -9,10 +9,8 @@
<!-- <driver name="DQMDatabaseDriver"/> -->
<driver name="RawTrackerHitSensorSetup"/>
<driver name="SVTMonitoring"/>
- <driver name="SVTHitMCEfficiency"/>
<driver name="TrackingMonitoring"/>
<driver name="TrackingResiduals"/>
- <driver name="TrackMCEfficiency"/>
<driver name="FinalStateMonitoring"/>
<driver name="V0Monitoring"/>
<driver name="TridentMonitoring"/>
@@ -22,7 +20,7 @@
<drivers>
<!-- <driver name="DQMDatabaseDriver" type="org.hps.analysis.dataquality.DQMDatabaseDriver"/> -->
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
- <eventInterval>1</eventInterval>
+ <eventInterval>100</eventInterval>
</driver>
<driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup">
<readoutCollections>SVTRawTrackerHits</readoutCollections>
@@ -42,12 +40,6 @@
<driver name="FinalStateMonitoring" type="org.hps.analysis.dataquality.FinalStateMonitoring">
<overwriteDB>false</overwriteDB>
</driver>
- <driver name="TrackMCEfficiency" type="org.hps.analysis.dataquality.TrackMCEfficiency">
- <overwriteDB>false</overwriteDB>
- </driver>
- <driver name="SVTHitMCEfficiency" type="org.hps.analysis.dataquality.SVTHitMCEfficiency">
- <overwriteDB>false</overwriteDB>
- </driver>
<driver name="V0Monitoring" type="org.hps.analysis.dataquality.V0Monitoring">
<overwriteDB>false</overwriteDB>
</driver>
Copied: java/trunk/steering-files/src/main/resources/org/hps/steering/production/DataQualityReconMC.lcsim (from r2806, java/trunk/steering-files/src/main/resources/org/hps/steering/production/DataQualityRecon.lcsim)
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/production/DataQualityRecon.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/production/DataQualityReconMC.lcsim Fri Apr 24 17:12:15 2015
@@ -22,7 +22,7 @@
<drivers>
<!-- <driver name="DQMDatabaseDriver" type="org.hps.analysis.dataquality.DQMDatabaseDriver"/> -->
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
- <eventInterval>1</eventInterval>
+ <eventInterval>100</eventInterval>
</driver>
<driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup">
<readoutCollections>SVTRawTrackerHits</readoutCollections>
