a few minor changes before pulling in master again

JeffersonLab · Jan 11, 2024 · b63a405 · b63a405
1 parent 8a311cd
commit b63a405
Show file tree

Hide file tree

Showing 4 changed files with 245 additions and 272 deletions.
diff --git a/...n/resources/org/hps/steering/recon/PhysicsRun2016FullReconMC_KF_TrackClusterMatcher.lcsim b/...n/resources/org/hps/steering/recon/PhysicsRun2016FullReconMC_KF_TrackClusterMatcher.lcsim
@@ -35,12 +35,22 @@
     </execute>    
     <drivers>   
       <driver name="KFTrackingReconPlots" type="org.hps.monitoring.drivers.trackrecon.KFTrackingReconPlots"/>
-    <driver name="PreCleanupDriver" type="org.hps.analysis.dataquality.ReadoutCleanupDriver">
-          <!-- Clean all -->
-           <collectionNames>EcalCalHits EcalClusters EcalClustersCorr FinalStateParticles UnconstrainedMollerCandidates UnconstrainedMollerVertices UnconstrainedV0Candidates UnconstrainedV0Vertices TargetConstrainedMollerCandidates TargetConstrainedMollerVertices TargetConstrainedV0Candidates TargetConstrainedV0Vertices BeamspotConstrainedMollerCandidates BeamspotConstrainedMollerVertices BeamspotConstrainedV0Candidates BeamspotConstrainedV0Vertices GBLKinkData GBLKinkDataRelations MatchedToGBLTrackRelations HelicalTrackHits HelicalTrackHitRelations MatchedTracks GBLTracks MatchedToGBLTrackRelations RotatedHelicalTrackHits RotatedHelicalTrackHitRelations SVTFittedRawTrackerHits  SVTShapeFitParameters StripClusterer_SiTrackerHitStrip1D TrackData TrackDataRelations </collectionNames>
-          <!-- Clean tracking and Final state particles -->
-          <!-- <collectionNames>FinalStateParticles GBLKinkData GBLKinkDataRelations MatchedToGBLTrackRelations HelicalTrackHits HelicalTrackHitRelations MatchedTracks GBLTracks MatchedToGBLTrackRelations RotatedHelicalTrackHits RotatedHelicalTrackHitRelations TrackData  </collectionNames> -->
-      </driver>
+      <driver name="PreCleanupDriver" type="org.hps.analysis.dataquality.ReadoutCleanupDriver">          
+        <collectionNames>EcalCalHits EcalClusters EcalClustersCorr FinalStateParticles 
+        UnconstrainedMollerCandidates UnconstrainedMollerVertices UnconstrainedV0Candidates 
+        UnconstrainedV0Vertices TargetConstrainedMollerCandidates TargetConstrainedMollerVertices 
+        TargetConstrainedV0Candidates TargetConstrainedV0Vertices BeamspotConstrainedMollerCandidates 
+        BeamspotConstrainedMollerVertices BeamspotConstrainedV0Candidates BeamspotConstrainedV0Vertices 
+        GBLKinkData GBLKinkDataRelations MatchedToGBLTrackRelations HelicalTrackHits 
+        HelicalTrackHitRelations MatchedTracks GBLTracks MatchedToGBLTrackRelations  
+        RotatedHelicalTrackHits RotatedHelicalTrackHitRelations SVTFittedRawTrackerHits  
+        SVTShapeFitParameters StripClusterer_SiTrackerHitStrip1D TrackData TrackDataRelations 
+        TrackResiduals TrackResidualsRelations OtherElectrons UnconstrainedVcCandidates UnconstrainedVcVertices
+	KFTrackData KFTrackDataRelations KFGBLStripClusterData  KFGBLStripClusterDataRelations SVTShapeFitParameters UnconstrainedVcCandidates_KF UnconstrainedVcVertices_KF
+        KalmanFullTracks UnconstrainedV0Candidates_KF TargetConstrainedV0Candidates_KF BeamspotConstrainedV0Candidates_KF UnconstrainedV0Vertices_KF TargetConstrainedV0Vertices_KF BeamspotConstrainedV0Vertices_KF
+        </collectionNames>
+        </driver>
+
 
         <driver name="RfFitter" type="org.hps.evio.RfFitterDriver"/>       
 

diff --git a/.../hps/steering/recon/PhysicsRun2016FullReconMC_KF_TrackClusterMatcher_StripHitKiller.lcsim b/.../hps/steering/recon/PhysicsRun2016FullReconMC_KF_TrackClusterMatcher_StripHitKiller.lcsim
@@ -21,7 +21,7 @@
         <driver name="RawTrackerHitSensorSetup"/>
         <driver name="RawTrackerHitFitterDriver" />
         <driver name="TrackerHitDriver"/>
-        <driver name="StripHitKiller"/>
+        <driver name="StripHitKiller"/> 
         <!-- KF tracking  -->
 
         <driver name="KalmanPatRecDriver"/>
@@ -42,19 +42,19 @@
 
       <driver name="RfFitter" type="org.hps.evio.RfFitterDriver"/>       
         <driver name="PreCleanupDriver" type="org.hps.analysis.dataquality.ReadoutCleanupDriver">          
-
-            <collectionNames>EcalCalHits EcalClusters EcalClustersCorr FinalStateParticles 
-            UnconstrainedMollerCandidates UnconstrainedMollerVertices UnconstrainedV0Candidates 
-            UnconstrainedV0Vertices TargetConstrainedMollerCandidates TargetConstrainedMollerVertices 
-            TargetConstrainedV0Candidates TargetConstrainedV0Vertices BeamspotConstrainedMollerCandidates 
-            BeamspotConstrainedMollerVertices BeamspotConstrainedV0Candidates BeamspotConstrainedV0Vertices 
-            GBLKinkData GBLKinkDataRelations MatchedToGBLTrackRelations HelicalTrackHits 
-            HelicalTrackHitRelations MatchedTracks GBLTracks MatchedToGBLTrackRelations  
-            RotatedHelicalTrackHits RotatedHelicalTrackHitRelations SVTFittedRawTrackerHits  
-            SVTShapeFitParameters StripClusterer_SiTrackerHitStrip1D TrackData TrackDataRelations 
-            TrackResiduals TrackResidualsRelations OtherElectrons UnconstrainedVcCandidates UnconstrainedVcVertices
-            KalmanFullTracks UnconstrainedV0Candidates_KF TargetConstrainedV0Candidates_KF BeamspotConstrainedV0Candidates_KF UnconstrainedV0Vertices_KF TargetConstrainedV0Vertices_KF BeamspotConstrainedV0Vertices_KF
-            </collectionNames>
+          <collectionNames>EcalCalHits EcalClusters EcalClustersCorr FinalStateParticles 
+          UnconstrainedMollerCandidates UnconstrainedMollerVertices UnconstrainedV0Candidates 
+          UnconstrainedV0Vertices TargetConstrainedMollerCandidates TargetConstrainedMollerVertices 
+          TargetConstrainedV0Candidates TargetConstrainedV0Vertices BeamspotConstrainedMollerCandidates 
+          BeamspotConstrainedMollerVertices BeamspotConstrainedV0Candidates BeamspotConstrainedV0Vertices 
+          GBLKinkData GBLKinkDataRelations MatchedToGBLTrackRelations HelicalTrackHits 
+          HelicalTrackHitRelations MatchedTracks GBLTracks MatchedToGBLTrackRelations  
+          RotatedHelicalTrackHits RotatedHelicalTrackHitRelations SVTFittedRawTrackerHits  
+          SVTShapeFitParameters StripClusterer_SiTrackerHitStrip1D TrackData TrackDataRelations 
+          TrackResiduals TrackResidualsRelations OtherElectrons UnconstrainedVcCandidates UnconstrainedVcVertices
+	  KFTrackData KFTrackDataRelations KFGBLStripClusterData  KFGBLStripClusterDataRelations SVTShapeFitParameters UnconstrainedVcCandidates_KF UnconstrainedVcVertices_KF
+          KalmanFullTracks UnconstrainedV0Candidates_KF TargetConstrainedV0Candidates_KF BeamspotConstrainedV0Candidates_KF UnconstrainedV0Vertices_KF TargetConstrainedV0Vertices_KF BeamspotConstrainedV0Vertices_KF
+          </collectionNames>
         </driver>
 
         <!-- Ecal reconstruction drivers -->
@@ -120,7 +120,7 @@
             <!--<doDebugPlots>true</doDebugPlots>-->
             <!-- <siHitsLimit>50</siHitsLimit> -->
             <!-- <seedCompThr>0.05</seedCompThr> -->
-            <!-- <addResiduals>true</addResiduals> -->
+            <addResiduals>true</addResiduals>
             <numEvtPlots>40</numEvtPlots>
             <targetPosition>-4.3</targetPosition>
             <addTrackStateAtTarget>true</addTrackStateAtTarget> 

diff --git a/tracking/src/main/java/org/hps/recon/tracking/StripHitKiller.java b/tracking/src/main/java/org/hps/recon/tracking/StripHitKiller.java
@@ -163,6 +163,8 @@ public void detectorChanged(Detector detector) {
     @Override
     public void process(EventHeader event) {
         //    System.out.println("In process of SVTHitKiller");
+
+        int nhitsremoved = 0;
         _siClustersAcceptMap.clear();
         if (event.hasItem(stripHitInputCollectionName))
             siClusters = (List<TrackerHit>) event.get(stripHitInputCollectionName);
@@ -203,7 +205,7 @@ public void process(EventHeader event) {
                                                    + " isTop? " + sensorToKill.getIsTop() + "; isStereo? " + sensorToKill.getIsStereo()
                                                    + " isSlot? " + sensorToKill.getIsSlot() +" scaleKillFactor= "+ sensorToKill.getScaleKillFactor()
                                                    + " channel = " + chan + "  kill ratio = " + ratio+"  random = "+random);
-
+                            nhitsremoved++; 
                         }
                     }
                     if (chan == checkHitsChannel) {
@@ -220,7 +222,8 @@ public void process(EventHeader event) {
 //        if (_debug)
         List<TrackerHit> tmpClusterList = getFinalHits(_siClustersAcceptMap);
         //        if (_debug)
-         if (_debug)System.out.println("New Cluster List Has " + tmpClusterList.size() + "; old List had " + oldClusterListSize);
+        if (_debug)System.out.println("New Cluster List Has " + tmpClusterList.size() + "; old List had " + oldClusterListSize);
+        System.out.println("number of hits removed for this event = "+nhitsremoved);
         int flag = LCIOUtil.bitSet(0, 31, true); // Turn on 64-bit cell ID.        
         event.remove(this.stripHitInputCollectionName);
         event.put(this.stripHitInputCollectionName, tmpClusterList, SiTrackerHitStrip1D.class, 0, toString());