Skip to content

Beamline - Allow detector volumes which are not cone segments for tracking #221

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
merged 2 commits into from
Nov 12, 2025
Merged

Beamline - Allow detector volumes which are not cone segments for tracking #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e34bca8
add fallback for non cone segments
simonge Nov 11, 2025
79ea6eb
Add debugging method
simonge Nov 11, 2025
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: 1 addition & 1 deletion benchmarks/beamline/acceptanceAnalysis.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
using RVecS = ROOT::VecOps::RVec<string>;
using RNode = ROOT::RDF::RNode;

int acceptanceAnalysis( TString inFile = "/scratch/EIC/G4out/beamline/acceptanceTest.edm4hep.root",
int acceptanceAnalysis( TString inFile = "/home/simong/EIC/detector_benchmarks_anl/sim_output/beamline/acceptanceTestXS2.edm4hep.root",
TString outFile = "output.root",
std::string compactName = "/home/simong/EIC/epic/install/share/epic/epic_ip6_extended.xml",
TString beampipeCanvasName = "acceptance_in_beampipe.png",
Expand Down
27 changes: 20 additions & 7 deletions benchmarks/beamline/beamlineAnalysis.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
using RVecS = ROOT::VecOps::RVec<string>;
using RNode = ROOT::RDF::RNode;

int beamlineAnalysis( TString inFile = "/scratch/EIC/G4out/beamline/beamlineTest.edm4hep.root",
int beamlineAnalysis( TString inFile = "/home/simong/EIC/detector_benchmarks_anl/sim_output/beamline/acceptanceTestXS3.edm4hep.root",
TString outFile = "output.root",
std::string compactName = "/home/simong/EIC/epic/install/share/epic/epic_ip6_extended.xml",
TString beamspotCanvasName = "beamspot_canvas.png",
Expand Down Expand Up @@ -79,6 +79,13 @@ int beamlineAnalysis( TString inFile = "/scratch/EIC/G4out/beamline/b
}
return radii;
}, {"pipeParameters"})
.Define("isConeSegment",[](const ROOT::VecOps::RVec<volParams>& params) {
ROOT::VecOps::RVec<bool> cones;
for (const auto& param : params) {
cones.push_back(param.isConeSegment);
}
return cones;
}, {"pipeParameters"})
.Define("xdet",[](const ROOT::VecOps::RVec<volParams>& params) {
ROOT::VecOps::RVec<double> xPos;
for (const auto& param : params) {
Expand Down Expand Up @@ -170,6 +177,7 @@ int beamlineAnalysis( TString inFile = "/scratch/EIC/G4out/beamline/b
std::map<TString,double> pipeXPos;
std::map<TString,double> pipeZPos;
std::map<TString,double> pipeRotation;
std::map<TString,bool> pipeIsConeSegment;

// Queue up all actions
auto xmin_ptr = d1.Min("xpos");
Expand Down Expand Up @@ -201,6 +209,7 @@ int beamlineAnalysis( TString inFile = "/scratch/EIC/G4out/beamline/b
.Define("xmomf","xmom[pipeID=="+std::to_string(i)+"]")
.Define("ymomf","ymom[pipeID=="+std::to_string(i)+"]")
.Define("pipeRadiusf","pipeRadius[pipeID=="+std::to_string(i)+"]")
.Define("isConeSegmentf","isConeSegment[pipeID=="+std::to_string(i)+"]")
.Define("xdetf","xdet[pipeID=="+std::to_string(i)+"]")
.Define("zdetf","zdet[pipeID=="+std::to_string(i)+"]")
.Define("rotationf","rotation[pipeID=="+std::to_string(i)+"]");
Expand Down Expand Up @@ -273,6 +282,7 @@ int beamlineAnalysis( TString inFile = "/scratch/EIC/G4out/beamline/b
pipeXPos[name] = filterDF.Max("xdetf").GetValue();
pipeZPos[name] = filterDF.Max("zdetf").GetValue();
pipeRotation[name] = filterDF.Max("rotationf").GetValue();
pipeIsConeSegment[name] = filterDF.Max("isConeSegmentf").GetValue();

//Fit gaussian to the x, y, px and py distributions
auto xhist = hHistsxy[name]->ProjectionX();
Expand Down Expand Up @@ -325,12 +335,15 @@ int beamlineAnalysis( TString inFile = "/scratch/EIC/G4out/beamline/b
cXY->cd(i++);

h->Draw("col");
//Draw cicle
TEllipse *circle = new TEllipse(0,0,pipeRadius);
circle->SetLineColor(kRed);
circle->SetLineWidth(2);
circle->SetFillStyle(0);
circle->Draw("same");

// Only draw circle overlay if the shape is a cone segment
if (pipeIsConeSegment[name] && pipeRadius > 0) {
TEllipse *circle = new TEllipse(0,0,pipeRadius);
circle->SetLineColor(kRed);
circle->SetLineWidth(2);
circle->SetFillStyle(0);
circle->Draw("same");
}

// Add zoomed version in the top-right corner
TPad *pad = new TPad("zoomPad", "Zoomed View", 0.65, 0.65, 1.0, 1.0);
Expand Down
25 changes: 22 additions & 3 deletions benchmarks/beamline/shared_functions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@
#include "edm4hep/SimTrackerHitCollection.h"
#include "edm4hep/SimCalorimeterHitCollection.h"
#include "DD4hep/VolumeManager.h"
#include "DD4hep/DetElement.h"
#include "TFile.h"

using RVecHits = ROOT::VecOps::RVec<edm4hep::SimTrackerHitData>;
using namespace dd4hep;

//-----------------------------------------------------------------------------------------
// Grab Component functor
Expand Down Expand Up @@ -108,6 +110,7 @@ struct volParams{
double yPos;
double zPos;
double rotation;
bool isConeSegment;
};

// Functor to get the volume element parameters from the CellID
Expand All @@ -127,13 +130,20 @@ struct getVolumeParametersFromCellID {
const Double_t* rotationMatrix = transform.GetRotationMatrix(); // Compute rotation angle around the Y-axis
double rotationAngleY = std::atan2(rotationMatrix[2], rotationMatrix[8]); // atan2(r13, r33)
auto volume = detelement.volume();
dd4hep::ConeSegment cone = volume.solid();
dd4hep::Solid solid = volume.solid();
bool isCone = solid.isValid() && std::string(solid->IsA()->GetName()) == "TGeoConeSeg";
double radius = 0.0;
if (isCone) {
dd4hep::ConeSegment cone = solid;
radius = cone.rMax1();
}
volParams params{
cone.rMax1(),
radius,
translation[0],
translation[1],
translation[2],
rotationAngleY
rotationAngleY,
isCone
};
result.push_back(params);
}
Expand Down Expand Up @@ -175,4 +185,13 @@ TH1F* CreateFittedHistogram(const std::string& histName,
hist->SetMarkerColor(kRed);

return hist;
}

void printHierarchy(const DetElement& de, int level = 0) {
std::string indent(level * 2, ' ');
std::cout << indent << "- " << de.name() << " (ID: " << de.id() << ")\n";

for (const auto& [childName, child] : de.children()) {
printHierarchy(child, level + 1);
}
}