Skip to content
Snippets Groups Projects

Applying code format and change default time error according to new improvements in the time reconstruction in the CbmTrdModuleRecR

Closed Etienne Bechtel requested to merge ebechtel_AT_ikf.uni-frankfurt.de/cbmroot:master into master
1 unresolved thread

I tried to apply the correct code format with the clang-format installed in /cvmfs. Additionally, there is a small change in a default parameter for the EB-simulation and an adaptation of the time error according to the newest observations in simulation. The time error was overestimated now due to improvements in the time reconstruction step.

Edited by Etienne Bechtel

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
  • I am a bit confused now... The pipeline failed and cdash reports problems with the MR-79. However, cdash reports 5 warnings with other classes. What did I do wrong here?

  • Etienne Bechtel changed title from Applying code format with clang-format version 8.0 and change default time error according to new improvements in the time reconstruction to Applying code format and change default time error according to new improvements in the time reconstruction in the CbmTrdModuleRecR

    changed title from Applying code format with clang-format version 8.0 and change default time error according to new improvements in the time reconstruction to Applying code format and change default time error according to new improvements in the time reconstruction in the CbmTrdModuleRecR

572 609 yVar = 0.0519485;
573 610 else if (errorclass == 4)
574 611 yVar = 0.0504586;
575 612 }
  • In the lines above are many hard coded numbers. Is it possible to gather them at one place in the header file instead of hiding them in the code?

  • I meant something like

      static constexpr Double_t kxVar_Value[2][5] = { 
                   {0.0258725, 0.0267693, 0.0344325, 0.0260322, 0.040115}, 
                   {0.0426313, 0.0426206, 0.0636962, 0.038981, 0.0723851} 
                                 };
      static constexpr Double_t kyVar_Value[2][5] = { 
                   {0.024549, 0.025957, 0.0250713, 0.0302682, 0.0291146},
                   {0.0401438, 0.0407502, 0.0397242, 0.0519485, 0.0504586}
                                  };

    in the header file with a proper comment what the numbers really mean. This shortens the code in the source file to

       if (EB) {
         xVar = kxVar_Value[0][errorclass];
         yVar = kyVar_Value[0][errorclass];
       } else {
         if (EBP)
           time -=
             50;  //due to the event time of 0 in the EB mode and the ULong in the the digi time
         xVar = kxVar_Value[1][errorclass];
         yVar = kyVar_Value[1][errorclass];
       }
    Edited by Florian Uhlig
  • changed this line in version 2 of the diff

  • Please register or sign in to reply
  • added 1 commit

    • 28346d62 - Move parameters from the source code into the header file

    Compare with previous version

  • added 1 commit

    Compare with previous version

  • Could you please rebase your local branch and push the changes to the repository.

  • Etienne Bechtel added 12 commits

    added 12 commits

    Compare with previous version

  • added 1 commit

    • 49fefcc9 - adding declaration in the source file and updating namespace calls for proper coding conventions

    Compare with previous version

  • added 1 commit

    Compare with previous version

  • Etienne Bechtel added 2 commits

    added 2 commits

    • d994dd50 - adding declaration in the source file and updating namespace calls for proper coding conventions
    • ac0a613f - apply clang-format

    Compare with previous version

  • Redone in !MR86

  • Dominik Smith mentioned in merge request !792 (merged)

    mentioned in merge request !792 (merged)

  • Please register or sign in to reply
    Loading