diff --git a/recon/src/main/java/org/hps/recon/skims/V0Skimmer.java b/recon/src/main/java/org/hps/recon/skims/V0Skimmer.java index e5e02d321..b44441a8d 100644 --- a/recon/src/main/java/org/hps/recon/skims/V0Skimmer.java +++ b/recon/src/main/java/org/hps/recon/skims/V0Skimmer.java @@ -28,7 +28,7 @@ public class V0Skimmer extends Skimmer { //private double _clusterTimingCut = 20.0; // only used if _tight is true private double _posClusterEnergy = 0.2; //GeV private double _v0Chi2Cut = 100.0; - private double _trackChi2Cut = 80.0; + private double _trackChi2Cut = 30.0; private double _trackDtCut = 20.0; // the 2-track time difference private double _trackPMax = 4.5; //GeV private double _elePMax = 9999; //GeV @@ -73,8 +73,8 @@ public boolean passSelection(EventHeader event){ if(_debug)System.out.println(this.getClass().getName()+":: failed nHitsMin "+electron.getTracks().get(0).getTrackerHits().size()+" "+positron.getTracks().get(0).getTrackerHits().size()+" nHitsMin = "+_nHitsMin); continue; } - if (electron.getTracks().get(0).getChi2() > _trackChi2Cut - || positron.getTracks().get(0).getChi2() > _trackChi2Cut) { + if ((electron.getTracks().get(0).getChi2()/electron.getTracks().get(0).getNDF()) > _trackChi2Cut + || (positron.getTracks().get(0).getChi2()/positron.getTracks().get(0).getNDF()) > _trackChi2Cut) { if(_debug)System.out.println(this.getClass().getName()+":: failed track chi2"); continue; } diff --git a/recon/src/main/resources/org/hps/recon/skims/v0skim_parameters_ver0.txt b/recon/src/main/resources/org/hps/recon/skims/v0skim_parameters_ver0.txt index c04cf1245..77be0cae2 100644 --- a/recon/src/main/resources/org/hps/recon/skims/v0skim_parameters_ver0.txt +++ b/recon/src/main/resources/org/hps/recon/skims/v0skim_parameters_ver0.txt @@ -1,5 +1,5 @@ V0CandidateCollectionName UnconstrainedV0Candidates_KF -trackChi2Cut 80.0 +trackChi2Cut 30.0 nHitsMin 9 v0Chi2Cut 30.0 trackDtCut 20.0 diff --git a/recon/src/main/resources/org/hps/recon/skims/v0skim_parameters_ver1.txt b/recon/src/main/resources/org/hps/recon/skims/v0skim_parameters_ver1.txt index 4d4d89f08..1b0741299 100644 --- a/recon/src/main/resources/org/hps/recon/skims/v0skim_parameters_ver1.txt +++ b/recon/src/main/resources/org/hps/recon/skims/v0skim_parameters_ver1.txt @@ -1,5 +1,5 @@ V0CandidateCollectionName UnconstrainedV0Candidates_KF -trackChi2Cut 80.0 +trackChi2Cut 30.0 nHitsMin 9 v0Chi2Cut 30.0 trackDtCut 20.0 diff --git a/steering-files/src/main/resources/org/hps/steering/recon/PhysicsRun2021_pass2_recon_skimmed.lcsim b/steering-files/src/main/resources/org/hps/steering/recon/PhysicsRun2021_pass2_recon_skimmed.lcsim index 49849d4da..a747c16ed 100644 --- a/steering-files/src/main/resources/org/hps/steering/recon/PhysicsRun2021_pass2_recon_skimmed.lcsim +++ b/steering-files/src/main/resources/org/hps/steering/recon/PhysicsRun2021_pass2_recon_skimmed.lcsim @@ -176,6 +176,7 @@ false v0skim_parameters_ver1.txt ${outputFile}_v0skim.slcio + FPGAData HelicalTrackHitRelations HelicalTrackHits HelicalTrackMCRelations KFGBLStripClusterData KFGBLStripClusterDataRelations ReadoutTimestamps RotatedHelicalTrackHitRelations RotatedHelicalTrackHits RotatedHelicalTrackMCRelations SVTFittedRawTrackerHits SVTShapeFitParameters SVTTrueHitRelations StripClusterer_SiTrackerHitStrip1D SVTRawTrackerHits FADCGenericHits HodoReadoutHits HodoCalHits EcalReadoutHits EcalUncalHits HodoGenericClusters VTPBank EcalClusters diff --git a/steering-files/src/main/resources/org/hps/steering/recon/PhysicsRun2021_pass2_recon_skimmed_dataqual.lcsim b/steering-files/src/main/resources/org/hps/steering/recon/PhysicsRun2021_pass2_recon_skimmed_dataqual.lcsim index cb74bcad4..139db176d 100644 --- a/steering-files/src/main/resources/org/hps/steering/recon/PhysicsRun2021_pass2_recon_skimmed_dataqual.lcsim +++ b/steering-files/src/main/resources/org/hps/steering/recon/PhysicsRun2021_pass2_recon_skimmed_dataqual.lcsim @@ -186,9 +186,8 @@ false v0skim_parameters_ver1.txt ${outputFile}_v0skim.slcio + FPGAData HelicalTrackHitRelations HelicalTrackHits HelicalTrackMCRelations KFGBLStripClusterData KFGBLStripClusterDataRelations ReadoutTimestamps RotatedHelicalTrackHitRelations RotatedHelicalTrackHits RotatedHelicalTrackMCRelations SVTFittedRawTrackerHits SVTShapeFitParameters SVTTrueHitRelations StripClusterer_SiTrackerHitStrip1D SVTRawTrackerHits FADCGenericHits HodoReadoutHits HodoCalHits EcalReadoutHits EcalUncalHits HodoGenericClusters VTPBank EcalClusters - - all EcalClustersCorr