Skip to content
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

Pdu surface normal #1068

Merged
merged 15 commits into from
Oct 31, 2023
Merged

Pdu surface normal #1068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
47b0cdf
Modified to extract sensor normalZ
chchatte92 Oct 10, 2023
a2be1ba
Fix: Removed Sensor Looping, Cleanup
chchatte92 Oct 11, 2023
a73bc36
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 11, 2023
bdd0d88
TrackPropagation_factory: HcalBarrel_ID -> HCalBarrel_ID (#1070)
veprbl Oct 11, 2023
97f2916
feat: fill Acts::GeometryIdentfier extra field with DD4hep detector I…
wdconinc Oct 14, 2023
70d8caf
fix: support fmt v10 and C++20 (#1073)
wdconinc Oct 17, 2023
ce84899
Update src/services/geometry/richgeo/IrtGeoDRICH.h
chchatte92 Oct 23, 2023
77edde9
Fix: removed reused variables
chchatte92 Oct 23, 2023
66e5038
exception thrown when sensor not found
chchatte92 Oct 25, 2023
8e76cf7
Merge branch 'main' into pdu-surface-normal
chchatte92 Oct 25, 2023
9f58363
fix: IrtGeoDRICH with iwyu_fixes.patch
chchatte92 Oct 31, 2023
4d345b3
Merge branch 'main' into pdu-surface-normal
chchatte92 Oct 31, 2023
813b5da
fix: remove commented line
wdconinc Oct 31, 2023
8894f5b
fix: reorder print before throw
wdconinc Oct 31, 2023
9f1e2b4
Merge branch 'main' into pdu-surface-normal
wdconinc Oct 31, 2023
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
26 changes: 19 additions & 7 deletions src/services/geometry/richgeo/IrtGeoDRICH.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include <IRT/G4Object.h>
#include <Math/GenVector/DisplacementVector3D.h>
#include <TRef.h>
#include <TVector3.h>
#include <fmt/core.h>
#include <stdint.h>
#include <exception>
Expand All @@ -23,9 +22,6 @@
#include <type_traits>
#include <unordered_map>
#include <utility>

#include "services/geometry/richgeo/RichGeo.h"

void richgeo::IrtGeoDRICH::DD4hep_to_IRT() {

// begin envelope
Expand Down Expand Up @@ -110,7 +106,6 @@ void richgeo::IrtGeoDRICH::DD4hep_to_IRT() {
// sector loop
for (int isec = 0; isec < nSectors; isec++) {
std::string secName = "sec" + std::to_string(isec);

// mirrors
auto mirrorRadius = m_det->constant<double>("DRICH_mirror_radius") / dd4hep::mm;
dd4hep::Position mirrorCenter(
Expand Down Expand Up @@ -167,7 +162,6 @@ void richgeo::IrtGeoDRICH::DD4hep_to_IRT() {
sensor_info.surface_centroid = posSensor;
sensor_info.surface_offset = surfaceOffset;
m_sensor_info.insert({ sensorID, sensor_info });

// create the optical surface
m_sensorFlatSurface = new FlatSurface(
TVector3(posSensor.x(), posSensor.y(), posSensor.z()),
Expand Down Expand Up @@ -209,7 +203,25 @@ void richgeo::IrtGeoDRICH::DD4hep_to_IRT() {
// define the `cell ID -> pixel position` converter
SetReadoutIDToPositionLambda();
}

TVector3 richgeo::IrtGeoDRICH::GetSensorSurfaceNorm(CellIDType id){
TVector3 sensorNorm;
auto cellMask = uint64_t(std::stoull(m_det->constant<std::string>("DRICH_cell_mask")));
auto sensor_info = this->m_sensor_info;
auto sID = id & cellMask;
auto sensor_info_it = sensor_info.find(sID);
if(sensor_info_it!=sensor_info.end()){
chchatte92 marked this conversation as resolved.
Show resolved Hide resolved
auto sensor_obj = sensor_info_it->second;
auto normZdir = sensor_obj.surface_offset.Unit();
sensorNorm.SetX(static_cast<double>(normZdir.x()));
sensorNorm.SetY(static_cast<double>(normZdir.y()));
sensorNorm.SetZ(static_cast<double>(normZdir.z()));
}
else{
m_log->error("Cannot find sensor {} in IrtGeoDRICH::GetSensorSurface", id);
wdconinc marked this conversation as resolved.
Show resolved Hide resolved
throw std::runtime_error("sensor not found in IrtGeoDRIC::GetSensorSurfaceNormal");
}
return sensorNorm;
}
// destructor
richgeo::IrtGeoDRICH::~IrtGeoDRICH() {
delete m_surfEntrance;
Expand Down
4 changes: 3 additions & 1 deletion src/services/geometry/richgeo/IrtGeoDRICH.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,14 @@
#include <IRT/CherenkovPhotonDetector.h>
#include <IRT/OpticalBoundary.h>
#include <IRT/ParametricSurface.h>
#include <TVector3.h>
#include <spdlog/logger.h>
#include <gsl/pointers>
#include <memory>
#include <string>

#include "IrtGeo.h"
#include "services/geometry/richgeo/RichGeo.h"

namespace richgeo {
class IrtGeoDRICH : public IrtGeo {
Expand All @@ -23,7 +25,7 @@ namespace richgeo {
IrtGeoDRICH(gsl::not_null<const dd4hep::Detector*> det_, gsl::not_null<const dd4hep::rec::CellIDPositionConverter*> conv_, std::shared_ptr<spdlog::logger> log_) :
IrtGeo("DRICH",det_,conv_,log_) { DD4hep_to_IRT(); }
~IrtGeoDRICH();

TVector3 GetSensorSurfaceNorm(CellIDType);
wdconinc marked this conversation as resolved.
Show resolved Hide resolved
protected:
void DD4hep_to_IRT() override;

Expand Down
Loading