Skip to content
Snippets Groups Projects

Actsfw 6 12 read sim digi adaptions

Merged Andreas Salzburger requested to merge ACTSFW-6-12_Read_Sim_Digi_Adaptions into master

This is a couple of updates needed for the ML prototype, I also renamed associatedSurface() for parameters to referenceSurface() because that's what they actually are.

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
73 76 virtual const std::vector<std::shared_ptr<const Surface>>&
74 77 surfaces() const = 0;
75 78
79 /// Return the DigitizationModule
80 /// @return optionally the DigitizationModule
81 virtual std::shared_ptr<const DigitizationModule>
  • Looking for a clarification here: should the DetectorElementBase share ownership of its DigitizationModule with its clients here, which is the intent expressed by returning a shared_ptr? Or is it the owner of the DigitizationModule, and should it only return a raw pointer to it?

  • Many detector elements can share one DigitizationModule, if they have the same readout segmentation. A DigitizationModule can have quite a lot of surfaces, so it's potentially quite heavy to make a one-to-one relationship.

  • I will postpone this change when we have agreed on a strategy

  • Please register or sign in to reply
  • 112 124 /// @param neighbours are DetectorElementBase objects that are neighbours
    113 125 void
    114 126 registerNeighbours(std::vector<const DetectorElementBase*>& neighbours) const;
    127
    115 128
    116 129 private:
    117 130 mutable std::vector<const DetectorElementBase*> m_binmembers;
    118 131 mutable std::vector<const DetectorElementBase*> m_neighbours;
    132
    119 133 };
    120 134
    135 inline std::shared_ptr<const DigitizationModule>
    136 DetectorElementBase::digitizationModule() const
    137 {
    138 return nullptr;
  • Unfortunately my attempt to remove the GCC warnings and CLANG warnings has not worked out, it seems :

    // external include(s) #pragma GCC diagnostic push #if defined(__USE_GNU) #pragma GCC diagnostic ignored "-Wmisleading-indentation" #endif #include <Eigen/Dense> #pragma GCC diagnostic pop

    has now worked :-( , at least I see the warnings appearing in the GCC jenkins build.

    @cgumpert or @hgraslan do you have a better idea ?

  • Found 2 files with missing MPLv2 license statement:
    Tests/Digitization/PlanarModuleStepper_test.cpp
    Tests/Digitization/CartesianSegmentation_test.cpp

  • This merge request does not close a JIRA ticket. Please consider creating a JIRA ticket to describe your changes. This is important for generating a complete ChangeLog for the next release.

  • :negative_squared_cross_mark: Jenkins Build FAILURE

    Results available at: Jenkins [ACTS-MERGE #53]

  • ATS Jenkins Added 1 commit:

    Added 1 commit:

    • 95b2e5ac - clang-format: enforce code style [ci-skip]

    Compare with previous version

  • Found 2 files with missing MPLv2 license statement:
    Tests/Digitization/PlanarModuleStepper_test.cpp
    Tests/Digitization/CartesianSegmentation_test.cpp

  • This merge request does not close a JIRA ticket. Please consider creating a JIRA ticket to describe your changes. This is important for generating a complete ChangeLog for the next release.

  • :negative_squared_cross_mark: Jenkins Build FAILURE

    Results available at: Jenkins [ACTS-MERGE #54]

  • 16 16
    17 17 // external include(s)
    18 18 #pragma GCC diagnostic push
    19 #if defined(__USE_GNU)
    19 20 #pragma GCC diagnostic ignored "-Wmisleading-indentation"
    21 #endif
    20 22 #include <Eigen/Dense>
    21 23 #pragma GCC diagnostic pop
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading