From ca499e612e2b61ef373035b1e443c6d28d62b4bb Mon Sep 17 00:00:00 2001 From: Matthew Gignac Date: Thu, 3 Apr 2025 15:14:18 -0700 Subject: [PATCH 1/5] also remove collections for skimmed output --- .../steering/recon/PhysicsRun2021_pass2_recon_skimmed.lcsim | 1 + .../recon/PhysicsRun2021_pass2_recon_skimmed_dataqual.lcsim | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) 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 From f42222b52ba566b8cbf3e629c1416ad17513ac68 Mon Sep 17 00:00:00 2001 From: Matthew Gignac Date: Tue, 22 Apr 2025 13:04:49 -0700 Subject: [PATCH 2/5] track chi2 cut divide by nDOF --- recon/src/main/java/org/hps/recon/skims/V0Skimmer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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..afd1e36aa 100644 --- a/recon/src/main/java/org/hps/recon/skims/V0Skimmer.java +++ b/recon/src/main/java/org/hps/recon/skims/V0Skimmer.java @@ -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().getNDF(0).ndf()) > _trackChi2Cut + || (positron.getTracks().get(0).getChi2()/positron.getTracks().get(0).getNDF()) > _trackChi2Cut) { if(_debug)System.out.println(this.getClass().getName()+":: failed track chi2"); continue; } From 953d965c1f498b82fbf29be9bd5ea35b9dda60f6 Mon Sep 17 00:00:00 2001 From: Matthew Gignac Date: Tue, 22 Apr 2025 13:06:26 -0700 Subject: [PATCH 3/5] update track chi2/nDOF cut to 30 --- recon/src/main/java/org/hps/recon/skims/V0Skimmer.java | 2 +- .../resources/org/hps/recon/skims/v0skim_parameters_ver0.txt | 2 +- .../resources/org/hps/recon/skims/v0skim_parameters_ver1.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 afd1e36aa..a317014a1 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 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 From 3646c62d9f10ab1fd13773008670b0d4f7007e15 Mon Sep 17 00:00:00 2001 From: Matthew Gignac Date: Tue, 22 Apr 2025 13:08:42 -0700 Subject: [PATCH 4/5] fix typo --- recon/src/main/java/org/hps/recon/skims/V0Skimmer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a317014a1..92b492438 100644 --- a/recon/src/main/java/org/hps/recon/skims/V0Skimmer.java +++ b/recon/src/main/java/org/hps/recon/skims/V0Skimmer.java @@ -73,7 +73,7 @@ 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()/electron.getTracks().getNDF(0).ndf()) > _trackChi2Cut + if ((electron.getTracks().get(0).getChi2()/electron.getTracks().getNDF(0)) > _trackChi2Cut || (positron.getTracks().get(0).getChi2()/positron.getTracks().get(0).getNDF()) > _trackChi2Cut) { if(_debug)System.out.println(this.getClass().getName()+":: failed track chi2"); continue; From e7d0b0e4e13642b161f9c7ae9cbfd1e7a09f6bef Mon Sep 17 00:00:00 2001 From: Matthew Gignac Date: Tue, 22 Apr 2025 13:09:21 -0700 Subject: [PATCH 5/5] fix typo again --- recon/src/main/java/org/hps/recon/skims/V0Skimmer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 92b492438..b44441a8d 100644 --- a/recon/src/main/java/org/hps/recon/skims/V0Skimmer.java +++ b/recon/src/main/java/org/hps/recon/skims/V0Skimmer.java @@ -73,7 +73,7 @@ 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()/electron.getTracks().getNDF(0)) > _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;