diff --git a/steering-files/src/main/resources/org/hps/steering/recon/PhysicsRun2019_pass2_recon.lcsim b/steering-files/src/main/resources/org/hps/steering/recon/PhysicsRun2019_pass2_recon.lcsim new file mode 100644 index 000000000..1d2a73185 --- /dev/null +++ b/steering-files/src/main/resources/org/hps/steering/recon/PhysicsRun2019_pass2_recon.lcsim @@ -0,0 +1,261 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1000 + + + svt_readout_overlap_good + + + + + + + + CONFIG + + + + + + + + + WARNING + EcalClusters + + + EcalClusters + EcalClustersCorr + + + + SVTRawTrackerHits + + + .5 + 1 + Pileup + Migrad + false + true + false + false + true + true + false + true + module_L5b + false + + + 24.0 + 3.0 + false + 400 + 4.0 + 1.0 + 3.0 + 3.0 + true + true + false + + + true + true + 00AB0B0 + 00BB0S0 + 00BS0B0 + 00AB0B0 + 0A0B0B0 + 00BA0B0 + 00SB0B0 + 00SB0AA + 00SB0SA + 0SB00B0 + 000S0BB + 000B0BS + 0BBS000 + 0SBB000 + 000B0BA + ABSS000 + SBB0000 + SABS000 + 7 + 0 + 8.881915381218574 + 39.249197341740356 + 8.37847994612359 + 11.546843987796496 + 6 + 6 + 6 + 6 + 2 + 0 + 39.7900414452215 + 4.9769217912110575 + 57.03015190053787 + 12.320066328390354 + 9.206482863412027 + 50.79545123329545 + 5.862027198856136 + 5.508828061070076 + 5 + true + 219 + 0.3473319986601534 + + 0.0 + 0.02 + 0.0 + 0.05 + 0.0 + 1.0 + 7.197594353612735 + false + + + EcalClustersCorr + KalmanFullTracks + KalmanFullTracks + TrackClusterMatcherMinDistance + UnconstrainedV0Candidates_KF + UnconstrainedV0Vertices_KF + BeamspotConstrainedV0Candidates_KF + BeamspotConstrainedV0Vertices_KF + TargetConstrainedV0Candidates_KF + TargetConstrainedV0Vertices_KF + FinalStateParticles_KF + true + false + false + 0.200 + 0.100 + 0.02 + 0.01 + -7.5 + 7.0 + 7.0 + 0.0 + 40.0 + 40 + 40 + false + true + true + false + true + UnconstrainedMollerCandidates_KF + UnconstrainedMollerVertices_KF + BeamspotConstrainedMollerCandidates_KF + BeamspotConstrainedMollerVertices_KF + TargetConstrainedMollerCandidates_KF + TargetConstrainedMollerVertices_KF + + + true + v0skim_parameters_2019_ver0.txt + ${outputFile}_v0skim.slcio + true + mollerskim_parameters_2019_ver0.txt + ${outputFile}_mollerskim.slcio + false + false + + + + + all + EcalClustersCorr + false + + + all + + + all + KalmanFullTracks + + + FinalStateParticles_KF + all + true + + + FinalStateParticles_KF + UnconstrainedV0Candidates_KF + BeamspotConstrainedV0Candidates_KF + TargetConstrainedV0Candidates_KF + all + true + + + FinalStateParticles_KF + UnconstrainedV0Candidates_KF + BeamspotConstrainedV0Candidates_KF + TargetConstrainedV0Candidates_KF + all + true + + + ${outputFile}_data_quality_plots.root + + + + + ${outputFile}.slcio + + + + diff --git a/steering-files/src/main/resources/org/hps/steering/recon/PhysicsRun2019_pass2_recon_skimmed.lcsim b/steering-files/src/main/resources/org/hps/steering/recon/PhysicsRun2019_pass2_recon_skimmed.lcsim new file mode 100644 index 000000000..8fa07eb01 --- /dev/null +++ b/steering-files/src/main/resources/org/hps/steering/recon/PhysicsRun2019_pass2_recon_skimmed.lcsim @@ -0,0 +1,259 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1000 + + + svt_readout_overlap_good + + + + + + + + CONFIG + + + + + + + + + WARNING + EcalClusters + + + EcalClusters + EcalClustersCorr + + + + SVTRawTrackerHits + + + .5 + 1 + Pileup + Migrad + false + true + false + false + true + true + false + true + module_L5b + false + + + 24.0 + 3.0 + false + 400 + 4.0 + 1.0 + 3.0 + 3.0 + true + true + false + + + true + true + 00AB0B0 + 00BB0S0 + 00BS0B0 + 00AB0B0 + 0A0B0B0 + 00BA0B0 + 00SB0B0 + 00SB0AA + 00SB0SA + 0SB00B0 + 000S0BB + 000B0BS + 0BBS000 + 0SBB000 + 000B0BA + ABSS000 + SBB0000 + SABS000 + 7 + 0 + 8.881915381218574 + 39.249197341740356 + 8.37847994612359 + 11.546843987796496 + 6 + 6 + 6 + 6 + 2 + 0 + 39.7900414452215 + 4.9769217912110575 + 57.03015190053787 + 12.320066328390354 + 9.206482863412027 + 50.79545123329545 + 5.862027198856136 + 5.508828061070076 + 5 + true + 219 + 0.3473319986601534 + + 0.0 + 0.02 + 0.0 + 0.05 + 0.0 + 1.0 + 7.197594353612735 + false + + + EcalClustersCorr + KalmanFullTracks + KalmanFullTracks + TrackClusterMatcherMinDistance + UnconstrainedV0Candidates_KF + UnconstrainedV0Vertices_KF + BeamspotConstrainedV0Candidates_KF + BeamspotConstrainedV0Vertices_KF + TargetConstrainedV0Candidates_KF + TargetConstrainedV0Vertices_KF + FinalStateParticles_KF + true + false + false + 0.200 + 0.100 + 0.02 + 0.01 + -7.5 + 7.0 + 7.0 + 0.0 + 40.0 + 40 + 40 + false + true + true + false + true + UnconstrainedMollerCandidates_KF + UnconstrainedMollerVertices_KF + BeamspotConstrainedMollerCandidates_KF + BeamspotConstrainedMollerVertices_KF + TargetConstrainedMollerCandidates_KF + TargetConstrainedMollerVertices_KF + + + true + v0skim_parameters_2019_ver0.txt + ${outputFile}_v0skim.slcio + false + false + false + + + + + all + EcalClustersCorr + false + + + all + + + all + KalmanFullTracks + + + FinalStateParticles_KF + all + true + + + FinalStateParticles_KF + UnconstrainedV0Candidates_KF + BeamspotConstrainedV0Candidates_KF + TargetConstrainedV0Candidates_KF + all + true + + + FinalStateParticles_KF + UnconstrainedV0Candidates_KF + BeamspotConstrainedV0Candidates_KF + TargetConstrainedV0Candidates_KF + all + true + + + ${outputFile}_data_quality_plots.root + + + + + ${outputFile}.slcio + + + + diff --git a/tracking/src/main/java/org/hps/recon/tracking/RawTrackerHitFitterDriver.java b/tracking/src/main/java/org/hps/recon/tracking/RawTrackerHitFitterDriver.java index b7f389aea..49a7d18c8 100644 --- a/tracking/src/main/java/org/hps/recon/tracking/RawTrackerHitFitterDriver.java +++ b/tracking/src/main/java/org/hps/recon/tracking/RawTrackerHitFitterDriver.java @@ -1,6 +1,7 @@ package org.hps.recon.tracking; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.HashMap; import java.util.Map; @@ -26,6 +27,8 @@ import org.lcsim.lcio.LCIOConstants; import org.lcsim.recon.cat.util.Const; import org.lcsim.util.Driver; +import org.lcsim.detector.tracker.silicon.SiSensor; + @@ -67,6 +70,8 @@ public class RawTrackerHitFitterDriver extends Driver { private boolean isFirstEvent=true; + private List sensorNames_ = new ArrayList(); + private TrackerHitUtils tkHitUtils=new TrackerHitUtils(); /** @@ -74,6 +79,11 @@ public class RawTrackerHitFitterDriver extends Driver { * * @param useTruthTime */ + + public void setSkipSensors(String[] sensorNames) { + this.sensorNames_ = new ArrayList(Arrays.asList(sensorNames)); + } + public void setChiSqrThresh(double chiSqrThresh){ this.chiSqrThresh = chiSqrThresh; } @@ -323,13 +333,29 @@ public void process(EventHeader event) { } if (debug) System.out.println(fit); - + + Boolean skipHit = false; + //SiSensor sensor = (SiSensor) hit.getDetectorElement(); + String name = sensor.getName(); + + if (sensorNames_.size() > 0) { + + for (String sensorName : sensorNames_) { + if (name.contains(sensorName)) { + skipHit = true; + break; + } + } + } fits.add(fit); FittedRawTrackerHit hth = new FittedRawTrackerHit(hit, fit); hits.add(hth); - if (strip == HPSSVTConstants.TOTAL_STRIPS_PER_SENSOR) // drop unbonded channel - continue; - hit.getDetectorElement().getReadout().addHit(hth); + + if (!skipHit) { + if (strip == HPSSVTConstants.TOTAL_STRIPS_PER_SENSOR) // drop unbonded channel + continue; + hit.getDetectorElement().getReadout().addHit(hth); + } } } event.put(fitCollectionName, fits, ShapeFitParameters.class, genericObjectFlags);