Iss1117 by EinarElen · Pull Request #1135 · LDMX-Software/ldmx-sw

EinarElen · 2022-12-05T22:58:38Z

I am updating ldmx-sw, here are the details.

What are the issues that this addresses?

This resolves #1117. This primarily means providing the length of a scintillator bar given an HcalID from the geometry condition. Since the side hcal for v14 has different length of bars depending on the layer number, this needs to be a function of both section and layer.

Example use would be

auto barLength {hcalGeometry.getScintillatorLength(id);

Check List

I successfully compiled ldmx-sw with my developments
I ran my developments and the following shows that they are successful.
To check that these changes didn't change the output of the condition, I added the following to the end of configure step

  auto section_to_string{[](const ldmx::HcalID id) { // Really wish we would have reflection in C++
    switch (id.section()) {
      case ldmx::HcalID::HcalSection::BACK:
        return "BACK";
      case ldmx::HcalID::HcalSection::TOP:
        return "TOP";
      case ldmx::HcalID::HcalSection::BOTTOM:
        return "BOTTOM";
      case ldmx::HcalID::HcalSection::LEFT:
        return "LEFT";
      case ldmx::HcalID::HcalSection::RIGHT:
        return "RIGHT";
    }
  }};
  std::cout << std::boolalpha;
  std::cout << "HcalGeo->Geometry has " << getNumSections()
            << " sections, a scintillator width of " << getScintillatorWidth()
            << "mm, Ecal dx/dy of " << getEcalDx() << "/" << getEcalDy()
            << " mm" << std::endl;
  for (auto section{0}; section < getNumSections(); ++section) {
    std::cout << "\tHcalGeo->Section: " << section_to_string({section, 1, 2})
              << " has " << num_layers_[section] << " layers\n";
    for (auto layer{1}; layer <= getNumLayers(section); ++layer) {
      // Number of strips per layer
      std::cout << "\tHcalGeo-> S: " << section << ", L: " << layer << " has "
                << getNumStrips(section, layer)
                << " strips, Zero Strip: " << getZeroStrip(section, layer)
                << ", halfTotalWidth: " << getHalfTotalWidth(section, layer)
                << " mm";
      if (section == ldmx::HcalID::HcalSection::BACK) {
        std::cout << " is horizontal? " << layerIsHorizontal(layer);
      }
      std::cout << std::endl;
      for (auto strip{0}; strip < getNumStrips(section, layer); ++strip) {
        ldmx::HcalID id{section, layer, strip};
        auto pos{getStripCenterPosition(id)};
        std::cout << "\t\tHcalGeo->" << id << " center position: " << pos[0]
                  << '/' << pos[1] << '/' << pos[2] << std::endl;
      }
    }
  }

I then ran this for the v13, v14, and prototype v2 geometries along the lines of

ldmx fire config.py | grep HcalGeo >> v13_iss1117.txt

for both the iss1117 branch and trunk and then checked

diff v13_iss1117.txt v13_trunk.txt # etc

I attached any sub-module related changes to this PR.

Related Sub-Module PRs

Factor out rotations to hcal geometry condition SimCore#92
Switch to using orientation from the geometry condition Hcal#63
Not directly, but relevant for Improved Hcal scintillator simulation #1110 and new scintillator simulation #1349

EinarElen · 2022-12-05T23:16:31Z

Here's an incredibly 24.00 in the evening test that we are getting it right, adding:

    for (auto section{0}; section < num_sections_; ++section) {
      std::cout << "Section: " << section_to_string({section, 1, 2})
                << std::endl;
      for (auto layer{1}; layer <= num_layers_[section]; ++layer) {
        if (section == 0) {
          std::cout << "First layer has length: "
                    << getScintillatorLength({section, layer, 0}) << "mm\n";
          std::cout << "Alternate layer has length: "
                    << getScintillatorLength({section, layer + 1, 0}) << "mm\n";
          break;
        } else {
          int strip{0};
          const ldmx::HcalID id{section, layer, strip};
          std::cout << "Layer: " << layer << std::setw(2) << " has length "
                    << getScintillatorLength(id) << "mm\n";
        }
      }
    }

at the bottom of the configure function gives:

V13 geometry

Section: BACK
First layer has length: 3100mm
Alternate layer has length: 3100mm
Section: TOP
Layer: 1 has length 2500mm
Layer: 2 has length 2500mm
Layer: 3 has length 2500mm
Layer: 4 has length 2500mm
Layer: 5 has length 2500mm
Layer: 6 has length 2500mm
Layer: 7 has length 2500mm
Layer: 8 has length 2500mm
Layer: 9 has length 2500mm
Layer: 10 has length 2500mm
Layer: 11 has length 2500mm
Layer: 12 has length 2500mm
Layer: 13 has length 2500mm
Layer: 14 has length 2500mm
Layer: 15 has length 2500mm
Layer: 16 has length 2500mm
Layer: 17 has length 2500mm
Layer: 18 has length 2500mm
Layer: 19 has length 2500mm
Layer: 20 has length 2500mm
Layer: 21 has length 2500mm
Layer: 22 has length 2500mm
Layer: 23 has length 2500mm
Layer: 24 has length 2500mm
Layer: 25 has length 2500mm
Layer: 26 has length 2500mm
Layer: 27 has length 2500mm
Layer: 28 has length 2500mm
Section: BOTTOM
Layer: 1 has length 2500mm
Layer: 2 has length 2500mm
Layer: 3 has length 2500mm
Layer: 4 has length 2500mm
Layer: 5 has length 2500mm
Layer: 6 has length 2500mm
Layer: 7 has length 2500mm
Layer: 8 has length 2500mm
Layer: 9 has length 2500mm
Layer: 10 has length 2500mm
Layer: 11 has length 2500mm
Layer: 12 has length 2500mm
Layer: 13 has length 2500mm
Layer: 14 has length 2500mm
Layer: 15 has length 2500mm
Layer: 16 has length 2500mm
Layer: 17 has length 2500mm
Layer: 18 has length 2500mm
Layer: 19 has length 2500mm
Layer: 20 has length 2500mm
Layer: 21 has length 2500mm
Layer: 22 has length 2500mm
Layer: 23 has length 2500mm
Layer: 24 has length 2500mm
Layer: 25 has length 2500mm
Layer: 26 has length 2500mm
Layer: 27 has length 2500mm
Layer: 28 has length 2500mm
Section: RIGHT
Layer: 1 has length 2300mm
Layer: 2 has length 2300mm
Layer: 3 has length 2300mm
Layer: 4 has length 2300mm
Layer: 5 has length 2300mm
Layer: 6 has length 2300mm
Layer: 7 has length 2300mm
Layer: 8 has length 2300mm
Layer: 9 has length 2300mm
Layer: 10 has length 2300mm
Layer: 11 has length 2300mm
Layer: 12 has length 2300mm
Layer: 13 has length 2300mm
Layer: 14 has length 2300mm
Layer: 15 has length 2300mm
Layer: 16 has length 2300mm
Layer: 17 has length 2300mm
Layer: 18 has length 2300mm
Layer: 19 has length 2300mm
Layer: 20 has length 2300mm
Layer: 21 has length 2300mm
Layer: 22 has length 2300mm
Layer: 23 has length 2300mm
Layer: 24 has length 2300mm
Layer: 25 has length 2300mm
Layer: 26 has length 2300mm
Section: LEFT
Layer: 1 has length 2300mm
Layer: 2 has length 2300mm
Layer: 3 has length 2300mm
Layer: 4 has length 2300mm
Layer: 5 has length 2300mm
Layer: 6 has length 2300mm
Layer: 7 has length 2300mm
Layer: 8 has length 2300mm
Layer: 9 has length 2300mm
Layer: 10 has length 2300mm
Layer: 11 has length 2300mm
Layer: 12 has length 2300mm
Layer: 13 has length 2300mm
Layer: 14 has length 2300mm
Layer: 15 has length 2300mm
Layer: 16 has length 2300mm
Layer: 17 has length 2300mm
Layer: 18 has length 2300mm
Layer: 19 has length 2300mm
Layer: 20 has length 2300mm
Layer: 21 has length 2300mm
Layer: 22 has length 2300mm
Layer: 23 has length 2300mm
Layer: 24 has length 2300mm
Layer: 25 has length 2300mm
Layer: 26 has length 2300mm

V14 geometry

Section: BACK
First layer has length: 2000mm
Alternate layer has length: 2000mm
Section: TOP
Layer: 1 has length 600mm
Layer: 2 has length 1800mm
Layer: 3 has length 600mm
Layer: 4 has length 1800mm
Layer: 5 has length 600mm
Layer: 6 has length 1800mm
Layer: 7 has length 600mm
Layer: 8 has length 1800mm
Layer: 9 has length 600mm
Layer: 10 has length 1600mm
Layer: 11 has length 600mm
Layer: 12 has length 1600mm
Layer: 13 has length 600mm
Layer: 14 has length 1600mm
Layer: 15 has length 600mm
Layer: 16 has length 1400mm
Layer: 17 has length 600mm
Layer: 18 has length 1400mm
Layer: 19 has length 600mm
Layer: 20 has length 1200mm
Layer: 21 has length 600mm
Layer: 22 has length 1200mm
Layer: 23 has length 600mm
Layer: 24 has length 1200mm
Section: BOTTOM
Layer: 1 has length 600mm
Layer: 2 has length 1800mm
Layer: 3 has length 600mm
Layer: 4 has length 1800mm
Layer: 5 has length 600mm
Layer: 6 has length 1800mm
Layer: 7 has length 600mm
Layer: 8 has length 1800mm
Layer: 9 has length 600mm
Layer: 10 has length 1600mm
Layer: 11 has length 600mm
Layer: 12 has length 1600mm
Layer: 13 has length 600mm
Layer: 14 has length 1600mm
Layer: 15 has length 600mm
Layer: 16 has length 1400mm
Layer: 17 has length 600mm
Layer: 18 has length 1400mm
Layer: 19 has length 600mm
Layer: 20 has length 1200mm
Layer: 21 has length 600mm
Layer: 22 has length 1200mm
Layer: 23 has length 600mm
Layer: 24 has length 1200mm
Section: RIGHT
Layer: 1 has length 600mm
Layer: 2 has length 1800mm
Layer: 3 has length 600mm
Layer: 4 has length 1800mm
Layer: 5 has length 600mm
Layer: 6 has length 1800mm
Layer: 7 has length 600mm
Layer: 8 has length 1800mm
Layer: 9 has length 600mm
Layer: 10 has length 1600mm
Layer: 11 has length 600mm
Layer: 12 has length 1600mm
Layer: 13 has length 600mm
Layer: 14 has length 1600mm
Layer: 15 has length 600mm
Layer: 16 has length 1400mm
Layer: 17 has length 600mm
Layer: 18 has length 1400mm
Layer: 19 has length 600mm
Layer: 20 has length 1200mm
Layer: 21 has length 600mm
Layer: 22 has length 1200mm
Layer: 23 has length 600mm
Layer: 24 has length 1200mm
Section: LEFT
Layer: 1 has length 600mm
Layer: 2 has length 1800mm
Layer: 3 has length 600mm
Layer: 4 has length 1800mm
Layer: 5 has length 600mm
Layer: 6 has length 1800mm
Layer: 7 has length 600mm
Layer: 8 has length 1800mm
Layer: 9 has length 600mm
Layer: 10 has length 1600mm
Layer: 11 has length 600mm
Layer: 12 has length 1600mm
Layer: 13 has length 600mm
Layer: 14 has length 1600mm
Layer: 15 has length 600mm
Layer: 16 has length 1400mm
Layer: 17 has length 600mm
Layer: 18 has length 1400mm
Layer: 19 has length 600mm
Layer: 20 has length 1200mm
Layer: 21 has length 600mm
Layer: 22 has length 1200mm
Layer: 23 has length 600mm
Layer: 24 has length 1200mm

Prototype geometry

Section: BACK
First layer has length: 2000mm
Alternate layer has length: 2000mm

@cmantill to me the v14 ordering looks good, but its the kind of thing where having a second pair of eyes on would be good. Does the order of z vs x/y layers and the number of x/y layers per module look good?

For the v13 geometry, I just dropped some dummy values for the side hcal length. Do you know what the actual lengths were @cmantill?

cmantill

Looks good! Small comments for documentation and hopefully v13 is right (is complicated so feel free to correct me)

DetDescr/include/DetDescr/HcalGeometry.h

DetDescr/python/HcalGeometry.py

DetDescr/src/DetDescr/HcalGeometry.cxx

Note: This does NOT change the values!

EinarElen · 2023-04-27T17:55:46Z

Ive edited the original post but since it is important i'm also noting here that the PR now includes two submodule PRs

Related Sub-Module PRs

EinarElen · 2023-04-28T16:28:48Z

Note: I think merging this can wait until we have more progress on #1136 since that will be a good opportunity to test the features.

EinarElen · 2023-05-10T12:29:21Z

Ok, after having relied on it a bunch in #1136, I think this is ready to go. I think we should have separate PRs for this and #1136 though, so we know that this PR didn't break any of the existing validation samples.

cmantill · 2023-05-10T12:39:34Z

This sounds good to me. No reason to not integrate this.

EinarElen · 2023-05-10T13:15:25Z

Ok, let's just wait for a check from @tomeichlersmith. I don 't think this needs to have a dedicated release be created, since I'd like to get #1136 in as well

tomeichlersmith

This looks good from my end :) thanks for reminding me @EinarElen

For merging, I would request that the submodule PRs are merged first, then this is updated to use those new commits on the submodule trunks. I'm away at conference/meeting this week - so feel free to poke me again next week if you need help going through that procedure.

EinarElen · 2023-05-10T15:33:26Z

Should be up now!

EinarElen added 26 commits November 8, 2022 08:56

Update comment to align with earlier code

9b48102

clang-format a bit

82be482

Rename horizontal parity to back for now

023a141

Update default types in python config

34ee625

Move num layers/sections to earlier in v13

9869d01

Store the prototype check for now

4452bc0

Update the v13 python config

0146b78

Replace the non list[list] parameter reads

d922690

Yeet out the hacky template <3

68d4d7c

Update v1 prototype

75e103b

Update v2 prototype

2508df0

Remove unused comment

68d9b52

Add a scint_length parameter

e73fdf4

Prototype scint lengths

6d0373c

Rename side_hcal_length

ad90e37

Add back_hcal_scint_length to v14

b0fc4ea

Set up back scint lengths

4f7942b

Set up loop over section/module/layer

5207b1e

Even layers, length along XY

9994ca4

Odd layers, length along Z

15a72bb

Comments + missed one _scint_

6d0629c

Add an accessor for scintillator length

41cd81c

Print position map if verbose setting on

045973d

Add dummy scint_length values for v13

5979c89

Move constants around

05ae1ce

Merge branch 'trunk' into iss1117

b962fce

EinarElen requested a review from cmantill December 5, 2022 23:17

EinarElen added 2 commits December 6, 2022 00:27

Remove commented out code

df7df4e

Add funcs for checking if we have 3d readout/proto

a42a8b1

cmantill reviewed Apr 26, 2023

View reviewed changes

Merge remote-tracking branch 'origin/trunk' into iss1117

d906052

This was referenced Apr 26, 2023

Switch to using hcal geometry for scintillator orientation LDMX-Software/Hcal#62

Closed

Switch to using Hcal Geometry condition for scintillator orientations LDMX-Software/SimCore#91

Closed

EinarElen added 9 commits April 27, 2023 18:45

Change layerIsHorizontal to backLayerIsHorizontal

ad4503a

Put HcalSection entries in the expected order

15b7dd4

Note: This does NOT change the values!

Apply the back renaming to the python config

328e0ae

First attempt at a rotate function

32549e5

Update submodules

791d6f1

Update v13 side hcal config to use correct length

ce7090d

Comment on why we start layer/section at 1

4620c67

Use orientation rather than layer %

c63f46a

Comment on layer indexing

2819868

cmantill approved these changes Apr 27, 2023

View reviewed changes

EinarElen marked this pull request as draft April 27, 2023 18:13

EinarElen marked this pull request as ready for review April 27, 2023 18:14

EinarElen requested a review from tomeichlersmith April 28, 2023 09:03

Factor out the back section since it is straight forward

9a5385e

EinarElen mentioned this pull request May 10, 2023

Iss1136 hcaldqm #1160

Merged

3 tasks

tomeichlersmith approved these changes May 10, 2023

View reviewed changes

Update submodule refs

7e77f09

EinarElen mentioned this pull request May 10, 2023

Event topology based PN filters + Alternative PN models #1161

Closed

EinarElen merged commit 1d6239b into trunk May 10, 2023

EinarElen deleted the iss1117 branch May 10, 2023 17:32

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Iss1117#1135

Iss1117#1135
EinarElen merged 47 commits intotrunkfrom
iss1117

EinarElen commented Dec 5, 2022 •

edited

Loading

Uh oh!

EinarElen commented Dec 5, 2022

Uh oh!

cmantill left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

EinarElen commented Apr 27, 2023

Uh oh!

EinarElen commented Apr 28, 2023

Uh oh!

EinarElen commented May 10, 2023

Uh oh!

cmantill commented May 10, 2023

Uh oh!

EinarElen commented May 10, 2023 •

edited

Loading

Uh oh!

tomeichlersmith left a comment

Uh oh!

EinarElen commented May 10, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

EinarElen commented Dec 5, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What are the issues that this addresses?

Check List

Related Sub-Module PRs

Uh oh!

EinarElen commented Dec 5, 2022

Uh oh!

cmantill left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

EinarElen commented Apr 27, 2023

Related Sub-Module PRs

Uh oh!

EinarElen commented Apr 28, 2023

Uh oh!

EinarElen commented May 10, 2023

Uh oh!

cmantill commented May 10, 2023

Uh oh!

EinarElen commented May 10, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

tomeichlersmith left a comment

Choose a reason for hiding this comment

Uh oh!

EinarElen commented May 10, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

EinarElen commented Dec 5, 2022 •

edited

Loading

EinarElen commented May 10, 2023 •

edited

Loading