From 90c743b89776e8a261ade1ae97a96dde0a5607ca Mon Sep 17 00:00:00 2001 From: myliu <201916234@mail.sdu.edu.cn> Date: Sun, 27 Sep 2020 09:09:00 +0800 Subject: [PATCH] Add segmentation and get cellIDD --- Detector/DetDriftChamber/CMakeLists.txt | 3 +- Detector/DetDriftChamber/compact/det.xml | 4 +- .../src/driftchamber/DriftChamber.cpp | 2 + .../DetSegmentation/.GridDriftChamber.h.swp | Bin 0 -> 16384 bytes Detector/DetSegmentation/CMakeLists.txt | 33 +++++++ .../DetSegmentation/GridDriftChamber.h | 90 ++++++++++++++++++ .../DetSegmentation/src/GridDriftChamber.cpp | 55 +++++++++++ .../src/plugins/SegmentationFactories.cpp | 22 +++++ 8 files changed, 206 insertions(+), 3 deletions(-) create mode 100644 Detector/DetSegmentation/.GridDriftChamber.h.swp create mode 100644 Detector/DetSegmentation/CMakeLists.txt create mode 100644 Detector/DetSegmentation/DetSegmentation/GridDriftChamber.h create mode 100644 Detector/DetSegmentation/src/GridDriftChamber.cpp create mode 100644 Detector/DetSegmentation/src/plugins/SegmentationFactories.cpp diff --git a/Detector/DetDriftChamber/CMakeLists.txt b/Detector/DetDriftChamber/CMakeLists.txt index 4a95aeec..b6802769 100644 --- a/Detector/DetDriftChamber/CMakeLists.txt +++ b/Detector/DetDriftChamber/CMakeLists.txt @@ -4,7 +4,8 @@ ################################################################################ gaudi_subdir(DetDriftChamber v0r0) -gaudi_depends_on_subdirs(GaudiKernel) +gaudi_depends_on_subdirs(Detector/DetSegmentation) +#gaudi_depends_on_subdirs(GaudiKernel) find_package(DD4hep COMPONENTS DDRec DDG4 DDParsers REQUIRED) diff --git a/Detector/DetDriftChamber/compact/det.xml b/Detector/DetDriftChamber/compact/det.xml index 3920c12a..84a1ec7b 100644 --- a/Detector/DetDriftChamber/compact/det.xml +++ b/Detector/DetDriftChamber/compact/det.xml @@ -57,9 +57,9 @@ <readouts> <readout name="DriftChamberHitsCollection"> - <segmentation type="NoSegmentation"/> + <segmentation type="GridDriftChamber" delta_phi="8*deg" identifier_phi="phi"/> - <id>system:8,chamber:1,layer:8</id> + <id>system:8,chamber:1,layer:8,phi:16</id> </readout> </readouts> diff --git a/Detector/DetDriftChamber/src/driftchamber/DriftChamber.cpp b/Detector/DetDriftChamber/src/driftchamber/DriftChamber.cpp index 5ac10182..c7101215 100644 --- a/Detector/DetDriftChamber/src/driftchamber/DriftChamber.cpp +++ b/Detector/DetDriftChamber/src/driftchamber/DriftChamber.cpp @@ -12,6 +12,7 @@ #include "XML/Utilities.h" #include "DDRec/DetectorData.h" #include "DDSegmentation/Segmentation.h" +#include "DetSegmentation/GridDriftChamber.h" using namespace dd4hep; using namespace dd4hep::detail; @@ -74,6 +75,7 @@ static dd4hep::Ref_t create_detector(dd4hep::Detector& theDetector, dd4hep::Tube det_outer_chamber_solid(outer_chamber_radius_min, outer_chamber_radius_max, outer_chamber_length*0.5); dd4hep::Volume det_outer_chamber_vol(det_name+"_outer_chamber_vol", det_outer_chamber_solid, det_mat); + // - layer for(int layer_id=0; layer_id<(inner_chamber_layer_number+outer_chamber_layer_number-1);layer_id++) { double rmin,rmax; diff --git a/Detector/DetSegmentation/.GridDriftChamber.h.swp b/Detector/DetSegmentation/.GridDriftChamber.h.swp new file mode 100644 index 0000000000000000000000000000000000000000..51f757f081f232cc857fcd0ed4b1246ecaf06edb GIT binary patch literal 16384 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 literal 0 HcmV?d00001 diff --git a/Detector/DetSegmentation/CMakeLists.txt b/Detector/DetSegmentation/CMakeLists.txt new file mode 100644 index 00000000..f6b2611e --- /dev/null +++ b/Detector/DetSegmentation/CMakeLists.txt @@ -0,0 +1,33 @@ +################################################################################# +##Package : DetSegmentation +################################################################################# +gaudi_subdir(DetSegmentation v1r0) + +gaudi_depends_on_subdirs(GaudiKernel) + +find_package(DD4hep COMPONENTS DDRec DDG4 DDParsers REQUIRED) +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${DD4hep_ROOT}/cmake ) + +include(DD4hep) + +find_package(ROOT COMPONENTS MathCore Physics GenVector Geom REQUIRED) + +gaudi_add_library(DetSegmentation + src/*.cpp + INCLUDE_DIRS DD4hep ROOT + LINK_LIBRARIES GaudiKernel DD4hep ROOT ${DD4hep_COMPONENT_LIBRARIES} + PUBLIC_HEADERS DetSegmentation) + +gaudi_add_module(DetSegmentationPlugin + src/plugins/*.cpp + INCLUDE_DIRS DD4hep ROOT + LINK_LIBRARIES GaudiKernel DD4hep ROOT ${DD4hep_COMPONENT_LIBRARIES} DetSegmentation) + +set(LIBRARY_OUTPUT_PATH ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}) +message(STATUS "LIBRARY_OUTPUT_PATH -> ${LIBRARY_OUTPUT_PATH}") +dd4hep_generate_rootmap(DetSegmentationPlugin) + +include(CTest) +gaudi_add_test(TestSegmentationPhiEta + WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} + FRAMEWORK tests/options/phiEtaSegmentation.py) diff --git a/Detector/DetSegmentation/DetSegmentation/GridDriftChamber.h b/Detector/DetSegmentation/DetSegmentation/GridDriftChamber.h new file mode 100644 index 00000000..379ad4a1 --- /dev/null +++ b/Detector/DetSegmentation/DetSegmentation/GridDriftChamber.h @@ -0,0 +1,90 @@ +#ifndef DETSEGMENTATION_GRIDDRIFTCHAMBER_H +#define DETSEGMENTATION_GRIDDRIFTCHAMBER_H + +#include "DDSegmentation/Segmentation.h" + +#include "TVector3.h" +#include <cmath> +#include <iostream> + +/** GridDriftChamber Detector/DetSegmentation/DetSegmentation/GridDriftChamber.h GridDriftChamber.h + * + * Segmentation for drift chamber. + * + * @author nalipour + */ + +namespace dd4hep { +namespace DDSegmentation { +class GridDriftChamber : public Segmentation { +public: + /// default constructor using an arbitrary type + GridDriftChamber(const std::string& aCellEncoding); + /// Default constructor used by derived classes passing an existing decoder + GridDriftChamber(const BitFieldCoder* decoder); + /// destructor + virtual ~GridDriftChamber() = default; + + virtual Vector3D position(const CellID& aCellID) const; + virtual CellID cellID(const Vector3D& aLocalPosition, const Vector3D& aGlobalPosition, + const VolumeID& aVolumeID) const; + +// inline double innerRadius() const { return m_innerRadius; } +// inline double detectorLength() const { return m_detectorLength; } + inline double offsetPhi() const { return m_offsetPhi; } + inline double delta_phi() const{ return m_delta_phi; } + inline const std::string& fieldNamePhi() const { return m_phiID; } + // Setters + +// inline void setGeomParams(int layer, double sizePhi) { +// layer_params[layer] = {sizePhi}; +// } + +// void updateParams(int layer) const { +// auto it_end = layer_params.cend(); +// --it_end; +// double size = it_end->second[0]; +// double radius = it_end->second[1]; +// double eps = it_end->second[2]; +// +// auto map_it = layer_params.find(layer); +// if (map_it != layer_params.cend()) { +// size = map_it->second[0]; +// radius = map_it->second[1]; +// eps = map_it->second[2]; +// } +// +// _currentGridSizePhi = size; +// _currentRadius = radius; +// m_epsilon = eps; +// } + + inline double phiFromXY(const Vector3D& aposition) const { + return std::atan2(aposition.Y, aposition.X) + M_PI ; + } + +// inline int returnLayer(double x, double y) const { +// // Hit R position +// double R = std::sqrt(x * x + y * y); +// // Layer +// int layer = int((R - m_innerRadius) / m_cellSize); +// return layer; +// } + +protected: + /* *** nalipour *** */ + double phi(const CellID& cID) const; + + + double m_offsetPhi; + double m_delta_phi; + std::string m_phiID; + + // Current parameters of the layer: sizePhi +// mutable double _currentGridSizePhi; // current size Phi +// mutable double _currentRadius; // current size radius +// mutable double m_epsilon; +}; +} +} +#endif /* DETSEGMENTATION_GRIDDRIFTCHAMBER_H */ diff --git a/Detector/DetSegmentation/src/GridDriftChamber.cpp b/Detector/DetSegmentation/src/GridDriftChamber.cpp new file mode 100644 index 00000000..4b1ed216 --- /dev/null +++ b/Detector/DetSegmentation/src/GridDriftChamber.cpp @@ -0,0 +1,55 @@ +#include "DetSegmentation/GridDriftChamber.h" + +namespace dd4hep { +namespace DDSegmentation { + +/// default constructor using an encoding string +GridDriftChamber::GridDriftChamber(const std::string& cellEncoding) : Segmentation(cellEncoding) { + // define type and description + _type = "GridDriftChamber"; + _description = "Drift chamber segmentation in the global coordinates"; + + registerIdentifier("identifier_phi", "Cell ID identifier for phi", m_phiID, "phi"); + registerParameter("delta_phi", "delta phi", m_delta_phi, 0., SegmentationParameter::LengthUnit); +} + +GridDriftChamber::GridDriftChamber(const BitFieldCoder* decoder) : Segmentation(decoder) { + // define type and description + _type = "GridDriftChamber"; + _description = "Drift chamber segmentation in the global coordinates"; + + registerIdentifier("identifier_phi", "Cell ID identifier for phi", m_phiID, "phi"); + registerParameter("delta_phi", "delta phi", m_delta_phi, 0., SegmentationParameter::LengthUnit); +} + +Vector3D GridDriftChamber::position(const CellID& /*cID*/) const { + Vector3D cellPosition = {0, 0, 0}; + return cellPosition; +} + +CellID GridDriftChamber::cellID(const Vector3D& /*localPosition*/, const Vector3D& globalPosition, + const VolumeID& vID) const { + + CellID cID = vID; + + double phi_hit = phiFromXY(globalPosition); + double posx = globalPosition.X; + double posy = globalPosition.Y; + + int lphi = (int) (phi_hit/m_delta_phi); + _decoder->set(cID, m_phiID, lphi); + +// std::cout << " myliu: " +// << " x: " << posx +// << " y: " << posy +//// << " pre: " << phi_pre +// << " phi_hit: " << phi_hit +// << " lphi: " << lphi +// << std::endl; + return cID; +} + + +REGISTER_SEGMENTATION(GridDriftChamber) +} +} diff --git a/Detector/DetSegmentation/src/plugins/SegmentationFactories.cpp b/Detector/DetSegmentation/src/plugins/SegmentationFactories.cpp new file mode 100644 index 00000000..9c06d383 --- /dev/null +++ b/Detector/DetSegmentation/src/plugins/SegmentationFactories.cpp @@ -0,0 +1,22 @@ +#include "DD4hep/Factories.h" +#include "DD4hep/detail/SegmentationsInterna.h" + +namespace { +template <typename T> +dd4hep::SegmentationObject* create_segmentation(const dd4hep::BitFieldCoder* decoder) { + return new dd4hep::SegmentationWrapper<T>(decoder); +} +} + +//#include "DetSegmentation/GridEta.h" +//DECLARE_SEGMENTATION(GridEta, create_segmentation<dd4hep::DDSegmentation::GridEta>) + +//#include "DetSegmentation/FCCSWGridPhiEta.h" +//DECLARE_SEGMENTATION(FCCSWGridPhiEta, create_segmentation<dd4hep::DDSegmentation::FCCSWGridPhiEta>) + +//#include "DetSegmentation/GridRPhiEta.h" +//DECLARE_SEGMENTATION(GridRPhiEta, create_segmentation<dd4hep::DDSegmentation::GridRPhiEta>) + +#include "DetSegmentation/GridDriftChamber.h" +DECLARE_SEGMENTATION(GridDriftChamber, create_segmentation<dd4hep::DDSegmentation::GridDriftChamber>) + -- GitLab