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.

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

Improve DD4hep workflow perf, step 3: Also reduced the number of paths (with regex) looped over for HCAL #32540

Merged
merged 18 commits into from Jan 12, 2021

Commits on Dec 16, 2020

  1. Remove regex from Geometry/TrackerRecoData/data/PhaseI/trackerRecoMat…

    …erial.xml. I presume the pixfwdblade.*Zplus had been done to distinguish from the pixfwdblade[0-9]:PixelForwardBlade. But this is not recessary, because the pixfwdblade[0-9]:PixelForwardBlade are not called in any geo scenario where data/PhaseI/trackerRecoMaterial.xml is used.
    ghugo83 committed Dec 16, 2020
    Configuration menu
    Copy the full SHA
    da1aab6 View commit details
    Browse the repository at this point in the history
  2. Also remove regex from trackingMaterialGroups_ForPhaseI.xml (but now …

    …these paths are not looped over when not needed anyway, hence this commit has no effect on workflow perf).
    ghugo83 committed Dec 16, 2020
    Configuration menu
    Copy the full SHA
    f52b55b View commit details
    Browse the repository at this point in the history
  3. Truncate the unnecessary Tracker/subdetector heads in the paths. This…

    … has very small, but non-null, impact on perf.
    ghugo83 committed Dec 16, 2020
    Configuration menu
    Copy the full SHA
    cc83df3 View commit details
    Browse the repository at this point in the history
  4. Remove regex from Geometry/TrackerRecoData/data/PhaseI/trackerRecoMat…

    …erial.xml. Very significant perf improvement. This version is compatible to work on both DDD and dd4hep cases.
    ghugo83 committed Dec 16, 2020
    Configuration menu
    Copy the full SHA
    51565c8 View commit details
    Browse the repository at this point in the history
  5. Also remove regex from SimTracker/TrackerMaterialAnalysis/data/tracki…

    …ngMaterialGroups_ForPhaseI.xml, version working for both DDD and dd4hep.
    ghugo83 committed Dec 16, 2020
    Configuration menu
    Copy the full SHA
    aaf4029 View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2020

  1. Configuration menu
    Copy the full SHA
    0880035 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    95053db View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0ff94d6 View commit details
    Browse the repository at this point in the history
  4. Also remove parents volumes from paths in PhaseI/v1/trackerRecoMateri…

    …al.xml. This has no visible impact on perf though (~85s before and after this commit), but does not harm to have a more compact file. Regex removal instead (in the previous commits) had a big impact: full DD4hep step 1 up to event generation: ~140s -> ~85s !!
    ghugo83 committed Dec 17, 2020
    Configuration menu
    Copy the full SHA
    6bcd698 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2020

  1. Configuration menu
    Copy the full SHA
    c2f90bb View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f7702d3 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    8b3d69f View commit details
    Browse the repository at this point in the history
  4. Magic: rename SpecPar sections in HCAL allow speedup in DD4hep workfl…

    …ow (~5 s gain in my local for overall step 1 XML parsing / geo construction). When SpecPar blocks jave same name, all paths are gathered unnecessarily, leading to loop over more paths (with regex) than needed).
    ghugo83 committed Dec 18, 2020
    Configuration menu
    Copy the full SHA
    b0854c4 View commit details
    Browse the repository at this point in the history
  5. Update 2021 scenarios to call v1 versions of hcalSimNumbering.xml, hc…

    …alsenspmf.xml, HcalProdCuts.xml
    ghugo83 committed Dec 18, 2020
    Configuration menu
    Copy the full SHA
    389c28e View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2020

  1. Rename the v1 version files: data/v1/hcalsenspmf.xml to data/hcalsens…

    …/2021/v1/hcalsenspmf.xml, data/v1/HcalProdCuts.xml to data/HcalProdCuts/2021/v2/HcalProdCuts.xml, data/v1/trackingMaterialGroups_ForPhaseI.xml to data/trackingMaterialGroups_ForPhaseI/v1/trackingMaterialGroups_ForPhaseI.xml.
    ghugo83 committed Dec 21, 2020
    Configuration menu
    Copy the full SHA
    d935460 View commit details
    Browse the repository at this point in the history
  2. Propagate renaming of v1 version files (there should not directly be …

    …a data/v1 directory) to geometry scenarios
    ghugo83 committed Dec 21, 2020
    Configuration menu
    Copy the full SHA
    a2d27f1 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6d520e8 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    8121aeb View commit details
    Browse the repository at this point in the history