Skip to content
Snippets Groups Projects

Major Update of LMVM Analysis

1 unresolved thread
  • Introduce 2D Elid Cuts in CbmLitGlobalElectronId
  • Implement a Fast Simulation Procedure for an artificially enhanced background (LmvmRandomEvent)
  • Calculated Combinatorial Background (CBcalc): Implement it in seperate classes and macros to enable large and fast mixing depth (LmvmCBCalc)
  • Add method to easily create histograms with variable bin widths (VaryBinWidth) from origin histograms
  • Add temperature calculation/estimation from fit of di-lepton spectra
  • Various other small implementations/changes

Merge request reports

Merge request pipeline #30553 passed

Merge request pipeline passed for 4ee9d9ee

Approval is optional

Closed by Cornelius Feier-RiesenCornelius Feier-Riesen 1 month ago (Apr 15, 2025 7:36am UTC)

Merge details

  • The changes were not merged into master.

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • added 2 commits

    • 71ad1331 - 1 commit from branch computing:master
    • 34c4feb5 - Major Update of LMVM Analysis

    Compare with previous version

  • Hi @cornelius.riesen_AT_physik.uni-giessen.de

    Here are a few hints/tips for the formatting checks:

    • File format: quite easy, just re-open the affected files, make sure to set your editor to Linux (LF) file ending and resave the files. From the test logs it seems to be only two files with Windows/Dos style line ending
      File analysis/PWGDIL/dielectron/lmvm/LmvmTask.cxx has wrong file format
      analysis/PWGDIL/dielectron/lmvm/LmvmTask.cxx: C++ source, ASCII text, with CRLF line terminators
      File macro/analysis/dielectron/run_digi.C has wrong file format
      macro/analysis/dielectron/run_digi.C: C source, ASCII text, with CRLF line terminators
    • File end: also quite easy, all files should end with a new line character, just re-open the affected files, add a new line at the end or make sure your editor is set to Ensure new line at file end (typically in the Files or Save preference tab) and resave the files. From the test logs it seems to be only three files
      File analysis/PWGDIL/dielectron/lmvm/LmvmRandomEvent.h does not finish with end of line
      File macro/analysis/dielectron/hadd_cbcalc.py does not finish with end of line
      File macro/analysis/dielectron/hadd_rndm.py does not finish with end of line
    • Code Format: please have a look at the following redmine wiki page. My personal advice would be to use the check-apply-format-changes.sh script prepared by @f.uhlig in two passes, first with check to make sure the proposed changes are ok for you and then with apply. When I find some proposed changes not optimal I modify the corresponding section(s) by hand before redoing a check until happy with the automatic suggestion on the reminder sections.
      You can also see the list of errors in our CDASH server if you want to fix them by hand (I set the link to point to the page corresponding to your last pipeline).
    • License headers: here you can try to have a look at the following redmine page, but as it affect only a few newly added files, the easiest may be to copy the headers of similar files in the same folder and edit the year and institution/commiter info to match your own
      analysis/PWGDIL/dielectron/lmvm/legacy/LmvmRandomEvent.h/.cxx
      analysis/PWGDIL/dielectron/lmvm/LmvmCBCalc.h/.cxx
      analysis/PWGDIL/dielectron/lmvm/LmvmRandomEvent.h/.cxx
      macro/analysis/dielectron/run_cbcalc.C

    You can also have a look at the CI doc page shipped in the repo for a combined summary of each stage with resolution hints and some short explanations

    As you have only a single commit in this MR, feel free to either amend the changes into it (git commit --amend --no-edit) or to make extra commits per "format type" if you want to keep an overview (we will then tick the Squash commits when merging box of the MR and still get a single commit at the end in the master history)

    Edit:
    As I see that you have quite a few new Python files and we do not have yet a convention on how to make the license headers for them as we have for the C/C++ files and Bash scripts, please feel free to propose one if you have an idea (not expert on Python conventions myself so no clue how it should look like) and we may discuss it in one of the upcoming Software meeting (or in the Computing Board)

    Edited by Pierre-Alain Loizeau
  • added 4 commits

    Compare with previous version

  • @p.-a.loizeau: Thank you for your detailed suggestions. I applied them,hoping that it works now. Should have done it before...

  • added 4 commits

    Compare with previous version

  • added 2 commits

    Compare with previous version

  • added 4 commits

    Compare with previous version

  • @f.uhlig I think the remaining compilation error will be for you as you are the MacOS expert:

    /Users/fairroot/builds/cornelius.riesen_AT_physik.uni-giessen.de/cbmroot/analysis/PWGDIL/dielectron/lmvm/LmvmTask.cxx:220:20: error: variable-sized object may not be initialized
      Int_t REnBinsMom[nDim]  = {5000, 5000, 5000};  // Number of bins for momentum histogram
                       ^~~~
    /Users/fairroot/builds/cornelius.riesen_AT_physik.uni-giessen.de/cbmroot/analysis/PWGDIL/dielectron/lmvm/LmvmTask.cxx:221:21: error: variable-sized object may not be initialized
      Double_t REMomMin[nDim] = {-3., -3., 0.};      // Minimum values for momentum in X, Y, Z
                        ^~~~
    /Users/fairroot/builds/cornelius.riesen_AT_physik.uni-giessen.de/cbmroot/analysis/PWGDIL/dielectron/lmvm/LmvmTask.cxx:222:21: error: variable-sized object may not be initialized
      Double_t REMomMax[nDim] = {3., 3., 10.};       // Maximum values for momentum in X, Y, Z

    I think this already happened once and it was down to a feature of GCC which is neither explicitly in the standard not explicitly forbidden and therefore not present in CLANG.

    If I remember properly, at the time you did find a way to rewrite it beyond the "old-style" init each field after another in its own line, but I cannot remember in which MR it was nor find it back (the search tools of Gitlab are not really helpful for this I must say). Also did not find it in any redmine issue.

    Edit: looking at the core around the error, maybe making nDim const would be enough without breaking anything?

    Edited by Pierre-Alain Loizeau
  • added 1 commit

    Compare with previous version

  • added 1 commit

    Compare with previous version

  • added 1 commit

    Compare with previous version

  • Dear @i.selyuzhenkov, @f.uhlig, @v.friese, @p.-a.loizeau, @s.lebedev, @andrey.lebedev,

    you have been identified as code owner of at least one file which was changed with this merge request.

    Please check the changes and approve them or request changes.

  • @cornelius.riesen_AT_physik.uni-giessen.de,

    I stumbled over the MR which is now hanging for 8 month. Could you please let me know who should review the MR.

  • @cornelius.riesen_AT_physik.uni-giessen.de,

    please rebase the MR locally. I am not able to do it using the web interface.

Please register or sign in to reply
Loading