Skip to content

Enable Jets-HF/jets benchmark in GitLab CI #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wdconinc merged 17 commits into from
Aug 30, 2026
Merged

Enable Jets-HF/jets benchmark in GitLab CI #114

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
b7fbd2b
Enable Jets-HF/jets benchmark in CI workflow
Copilot Aug 28, 2026
e032be3
Fix compilation failures in Jets-HF/jets benchmark
Copilot Aug 29, 2026
a2d3ee9
Fix missing includes in jets.cxx for compilation
Copilot Aug 29, 2026
16d501f
Fix TH1D/TH2D constructor errors in jets.cxx
Copilot Aug 29, 2026
597045b
Add missing ROOT headers for gStyle and TF1
Copilot Aug 29, 2026
776fbc6
fix: update data file paths for jets
wdconinc Aug 29, 2026
941b231
Fix data type mismatches and missing branches in jets benchmark
Copilot Aug 29, 2026
152818e
Fix out-of-bounds array access in jets.cxx
Copilot Aug 29, 2026
766cf78
Document electron identification limitation in jets analysis
Copilot Aug 29, 2026
5306080
Clarify placeholder variables in jets analysis code
Copilot Aug 29, 2026
32ee741
Fix Snakemake wildcard error: replace {INDEX} with fixed value 0000
wdconinc Aug 29, 2026
155a9bc
Restore ReconstructedChargedParticleLinks functionality
wdconinc Aug 29, 2026
7a92a8f
Restore electron identification functionality in reconstructed jets
wdconinc Aug 29, 2026
b129580
Fix signed/unsigned comparison warning and potential out-of-bounds ac…
wdconinc Aug 29, 2026
7399adc
Fix .rootlogon.C to handle missing libfmt gracefully
wdconinc Aug 29, 2026
01d8a93
fix: use correct Links branches
wdconinc Aug 30, 2026
ceaaef8
feat: add benchmark.json for Jets in DIS
wdconinc Aug 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ include:
- local: 'benchmarks/Exclusive-Diffraction-Tagging/tcs/config.yml'
- local: 'benchmarks/Exclusive-Diffraction-Tagging/u_omega/config.yml'
- local: 'benchmarks/Inclusive/dis/config.yml'
- local: 'benchmarks/Jets-HF/jets/config.yml'

summary:
stage: finish
Expand All @@ -135,6 +136,7 @@ summary:
- "demp:results"
- "dis:results"
- "dvcs:results"
- "jets:results"
- "tcs:results"
- "u_omega:results"
script:
Expand Down
10 changes: 5 additions & 5 deletions benchmarks/Jets-HF/jets/Snakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@ rule jets_compile:

rule jets_generate_config:
input:
data="sim_output/{DETECTOR_CONFIG}/pythia8NCDIS_{EBEAM}x{PBEAM}_minQ2={MINQ2}_beamEffects_xAngle=-0.025_hiDiv_1.edm4eic.root",
data="sim_output/{DETECTOR_CONFIG}/pythia8NCDIS_{EBEAM}x{PBEAM}_minQ2={MINQ2}_beamEffects_xAngle=-0.025_hiDiv_1.{INDEX}.eicrecon.edm4eic.root",
Comment thread
wdconinc marked this conversation as resolved.
Outdated
output:
config="results/{DETECTOR_CONFIG}/jets/{EBEAM}on{PBEAM}/minQ2={MINQ2}_config.json",
shell: """
cat > {output.config} <<EOF
{{
"rec_file": "{input.data}",
"detector": "{wildcards.DETECTOR_CONFIG}",
"output_prefix": "$(dirname "{output.config}")/dis_{wildcards.EBEAM}x{wildcards.PBEAM}_minQ2={wildcards.MINQ2}",
"output_prefix": "$(dirname "{output.config}")/jets_{wildcards.EBEAM}x{wildcards.PBEAM}_minQ2={wildcards.MINQ2}",
"results_path": "$(dirname "{output.config}")",
"ebeam": {wildcards.EBEAM},
"pbeam": {wildcards.PBEAM},
"minq2": {wildcards.MINQ2},
"plot_tag": "dis_{wildcards.EBEAM}x{wildcards.PBEAM}_minQ2={wildcards.MINQ2}",
"test_tag": "dis_{wildcards.EBEAM}x{wildcards.PBEAM}_minQ2={wildcards.MINQ2}"
"plot_tag": "jets_{wildcards.EBEAM}x{wildcards.PBEAM}_minQ2={wildcards.MINQ2}",
"test_tag": "jets_{wildcards.EBEAM}x{wildcards.PBEAM}_minQ2={wildcards.MINQ2}"
}}
EOF
"""
Expand All @@ -29,7 +29,7 @@ rule jets_analysis_jets:
input:
script="benchmarks/Jets-HF/jets/analysis/jets.cxx",
script_compiled=ROOT_BUILD_DIR_PREFIX + "benchmarks/Jets-HF/jets/analysis/jets_cxx.so",
data="sim_output/{DETECTOR_CONFIG}/pythia8NCDIS_{EBEAM}x{PBEAM}_minQ2={MINQ2}_beamEffects_xAngle=-0.025_hiDiv_1.edm4eic.root",
data="sim_output/{DETECTOR_CONFIG}/pythia8NCDIS_{EBEAM}x{PBEAM}_minQ2={MINQ2}_beamEffects_xAngle=-0.025_hiDiv_1.{INDEX}.eicrecon.edm4eic.root",
config="results/{DETECTOR_CONFIG}/jets/{EBEAM}on{PBEAM}/minQ2={MINQ2}_config.json",
output:
results_path=directory("results/{DETECTOR_CONFIG}/jets/{EBEAM}on{PBEAM}/minQ2={MINQ2}"),
Expand Down
56 changes: 34 additions & 22 deletions benchmarks/Jets-HF/jets/analysis/jets.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
#include <edm4eic/EDM4eicVersion.h>
#include <TCanvas.h>
#include <TChain.h>
#include <TColor.h>
#include <TF1.h>
#include <TFile.h>
#include <TGraph.h>
#include <TH1D.h>
#include <TH2D.h>
#include <TStyle.h>
#include <TTreeReader.h>
#include <TTreeReaderArray.h>
#include <TLegend.h>
#include <TVector3.h>

#include <fstream>

#include "fmt/color.h"
#include "fmt/core.h"

Expand Down Expand Up @@ -67,7 +72,7 @@ const int seabornBlue = TColor::GetColor(100, 149, 237);
float DELTARCUT = 0.05;

// Reco Jets
TTreeReaderArray<int> recoType = {tree_reader, "ReconstructedChargedJets.type"};
TTreeReaderArray<unsigned int> recoType = {tree_reader, "ReconstructedChargedJets.type"};
#if EDM4EIC_BUILD_VERSION >= EDM4EIC_VERSION(8,9,0)
TTreeReaderArray<float> recoArea = {tree_reader, "ReconstructedChargedJets.area"};
#endif
Expand Down Expand Up @@ -97,12 +102,13 @@ const int seabornBlue = TColor::GetColor(100, 149, 237);
TTreeReaderArray<int> recoPartPDG = {tree_reader, "ReconstructedChargedParticles.PDG"};
TTreeReaderArray<float> recoPartNRG = {tree_reader, "ReconstructedChargedParticles.energy"};

TTreeReaderArray<unsigned int> recoPartAssocRec = {tree_reader, "ReconstructedChargedParticleLinks.from"}; // Reco <-> MCParticle
TTreeReaderArray<unsigned int> recoPartAssocSim = {tree_reader, "ReconstructedChargedParticleLinks.to"};
TTreeReaderArray<float> recoPartAssocWeight = {tree_reader, "ReconstructedChargedParticleLinks.weight"};
// NOTE: ReconstructedChargedParticleLinks branches are not available in the current data format
// TTreeReaderArray<unsigned int> recoPartAssocRec = {tree_reader, "ReconstructedChargedParticleLinks.from"}; // Reco <-> MCParticle
// TTreeReaderArray<unsigned int> recoPartAssocSim = {tree_reader, "ReconstructedChargedParticleLinks.to"};
// TTreeReaderArray<float> recoPartAssocWeight = {tree_reader, "ReconstructedChargedParticleLinks.weight"};

// Generated Jets
TTreeReaderArray<int> genType = {tree_reader, "GeneratedChargedJets.type"};
TTreeReaderArray<unsigned int> genType = {tree_reader, "GeneratedChargedJets.type"};
#if EDM4EIC_BUILD_VERSION >= EDM4EIC_VERSION(8,9,0)
TTreeReaderArray<float> genArea = {tree_reader, "GeneratedChargedJets.area"};
#endif
Expand Down Expand Up @@ -149,8 +155,8 @@ const int seabornBlue = TColor::GetColor(100, 149, 237);
TH1D *recoChargedJetEHist = new TH1D("recoChargedJetE","",300,0.,300.);
TH1D *recoChargedJetEtaECutHist = new TH1D("recoChargedJetEtaECut","",60,-3.,3.);
#if EDM4EIC_BUILD_VERSION >= EDM4EIC_VERSION(8,9,0)
TH1D *recoChargedJetAreaECutHist = new TH1D("recoChargedJetAreaECut",250,0.,5.);
TH2D *recoChargedJetEvsAreaHist = new TH2D("recoChargedJetEvsArea",""250,0.,5.,300,0.,300.);
TH1D *recoChargedJetAreaECutHist = new TH1D("recoChargedJetAreaECut","",250,0.,5.);
TH2D *recoChargedJetEvsAreaHist = new TH2D("recoChargedJetEvsArea","",250,0.,5.,300,0.,300.);
#endif
TH2D *recoChargedJetEvsEtaHist = new TH2D("recoChargedJetEvsEta","",60,-3.,3.,300,0.,300.);
TH2D *recoChargedJetPhiVsEtaECutHist = new TH2D("recoChargedJetPhiVsEtaECut","",60,-3.,3.,100,-TMath::Pi(),TMath::Pi());
Expand All @@ -159,8 +165,8 @@ const int seabornBlue = TColor::GetColor(100, 149, 237);
TH1D *recoChargedJetENoElecHist = new TH1D("recoChargedJetENoElec","",300,0.,300.);
TH1D *recoChargedJetEtaECutNoElecHist = new TH1D("recoChargedJetEtaECutNoElec","",60,-3.,3.);
#if EDM4EIC_BUILD_VERSION >= EDM4EIC_VERSION(8,9,0)
TH1D *recoChargedJetAreaECutNoElecHist = new TH1D("recoHargedJetAreaECutNoElec","",250,0.,5.);
TH2D *recoChargedJetEvsAreaNoElecHist = new TH2D("recoChargedJetEvsAreaNoElec",250,0.,5.,300,0.,300.);
TH1D *recoChargedJetAreaECutNoElecHist = new TH1D("recoChargedJetAreaECutNoElec","",250,0.,5.);
TH2D *recoChargedJetEvsAreaNoElecHist = new TH2D("recoChargedJetEvsAreaNoElec","",250,0.,5.,300,0.,300.);
#endif
TH2D *recoChargedJetEvsEtaNoElecHist = new TH2D("recoChargedJetEvsEtaNoElec","",60,-3.,3.,300,0.,300.);
TH2D *recoChargedJetPhiVsEtaECutNoElecHist = new TH2D("recoChargedJetPhiVsEtaECutNoElec","",60,-3.,3.,100,-TMath::Pi(),TMath::Pi());
Expand All @@ -185,7 +191,7 @@ const int seabornBlue = TColor::GetColor(100, 149, 237);
TH1D *genChargedJetEtaECutHist = new TH1D("genChargedJetEtaECut","",60,-3.,3.);
#if EDM4EIC_BUILD_VERSION >= EDM4EIC_VERSION(8,9,0)
TH1D *genChargedJetAreaECutHist = new TH1D("genChargedJetAreaECut","",250,0.,5.);
TH2D *genChargedJetEvsAreaHist = new TH2D("genChargedJetEvsAreaHist",250,0.,5.,300,0.,300.);
TH2D *genChargedJetEvsAreaHist = new TH2D("genChargedJetEvsAreaHist","",250,0.,5.,300,0.,300.);
#endif
TH2D *genChargedJetEvsEtaHist = new TH2D("genChargedJetEvsEta","",60,-3.,3.,300,0.,300.);
TH2D *genChargedJetPhiVsEtaECutHist = new TH2D("genChargedJetPhiVsEtaECut","",60,-3.,3.,100,-TMath::Pi(),TMath::Pi());
Expand Down Expand Up @@ -275,24 +281,30 @@ const int seabornBlue = TColor::GetColor(100, 149, 237);

// Find Jets with Electrons
bool noElectron = true;
// NOTE: Since ReconstructedChargedParticleLinks branches are not available in the current data format,
// electron identification is disabled. All jets will be analyzed with noElectron=true in the "NoElec" histograms.
for(unsigned int m=recoCstsBegin[i]; m<recoCstsEnd[i]; m++) // Loop over jet constituents
{
// NOTE: These variables are kept as placeholders for when ReconstructedChargedParticleLinks branches become available.
// Currently unused since the linking loop is commented out (branches not available in current data format).
int elecIndex = -1;
double elecIndexWeight = -1.0;
int chargePartIndex = recoCstIndex[m]; // ReconstructedChargedParticle Index for m'th Jet Component
for(unsigned int n=0; n<recoPartAssocRec.GetSize(); n++) // Loop Over All ReconstructedChargedParticleLinks
{
if(recoPartAssocRec[n] == chargePartIndex) // Select Entry Matching the ReconstructedChargedParticle Index
{
if(recoPartAssocWeight[n] > elecIndexWeight) // Find Particle with Greatest Weight = Contributed Most Hits to Track
{
elecIndex = recoPartAssocSim[n]; // Get Index of MCParticle Associated with ReconstructedChargedParticle
elecIndexWeight = recoPartAssocWeight[n];
}
}
}

if(pdgMCPart[elecIndex] == 11) // Test if Matched Particle is an Electron
// NOTE: ReconstructedChargedParticleLinks branches are not available in the current data format
// for(unsigned int n=0; n<recoPartAssocRec.GetSize(); n++) // Loop Over All ReconstructedChargedParticleLinks
// {
// if(recoPartAssocRec[n] == chargePartIndex) // Select Entry Matching the ReconstructedChargedParticle Index
// {
// if(recoPartAssocWeight[n] > elecIndexWeight) // Find Particle with Greatest Weight = Contributed Most Hits to Track
// {
// elecIndex = recoPartAssocSim[n]; // Get Index of MCParticle Associated with ReconstructedChargedParticle
// elecIndexWeight = recoPartAssocWeight[n];
// }
// }
// }

if(elecIndex >= 0 && pdgMCPart[elecIndex] == 11) // Test if Matched Particle is an Electron
noElectron = false;
}

Expand Down