Millepede integration #24

YanzhaoW · 2025-01-25T15:49:03Z

Integrate millepede to R3BRoot

Checklist:

Rebased against dev branch
My name is in the resp. CONTRIBUTORS/AUTHORS file
Followed the pull request guidlines and the Git workflow
Followed the seven rules of great commit messages

github-actions · 2025-01-27T18:08:23Z

Cpp-Linter Report ⚠️

Some files did not pass the configured checks!

clang-tidy (v18.1.3) reports: 8 concern(s)

neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx:26:1: warning: [misc-include-cleaner]

included header optional is not used directly
```
   26 | #include <optional>
      | ^~~~~~~~~~~~~~~~~~~
   27 | #include <string>
```
neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx:27:1: warning: [misc-include-cleaner]

included header string is not used directly
```
   27 | #include <string>
      | ^~~~~~~~~~~~~~~~~
   28 | #include <vector>
```
neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx:28:1: warning: [misc-include-cleaner]

included header vector is not used directly
```
   28 | #include <vector>
      | ^~~~~~~~~~~~~~~~~
   29 | 
```

neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx:61:9: warning: [bugprone-branch-clone]

if with identical then and else branches

   61 |         if (const auto* r3b_dir = std::getenv("R3BROOTPATH"); r3b_dir != nullptr)
      |         ^
/__w/R3BRoot/R3BRoot/neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx:65:9: note: else branch starts here
   65 |         else
      |         ^

neuland/calibration/mille/PedeLauncher.cxx:30:20: warning: [misc-include-cleaner]

no header providing "std::runtime_error" is directly included
```
   14 |         throw std::runtime_error(
      |                    ^
```

neuland/calibration/mille/PedeLauncher.cxx:33:38: warning: [misc-include-cleaner]

no header providing "fmt::format" is directly included

   14 |         const auto exe_string = fmt::format("{}/{}", binary_directory_, executable_);
      |                                      ^

neuland/calibration/mille/PedeLauncher.cxx:34:33: warning: [misc-include-cleaner]

no header providing "std::vector" is directly included

   14 |         auto launch_args = std::vector<std::string>{ "-i", steer_filename_ };
      |                                 ^

neuland/calibration/mille/PedeLauncher.cxx:34:45: warning: [misc-include-cleaner]

no header providing "std::string" is directly included

   14 |         auto launch_args = std::vector<std::string>{ "-i", steer_filename_ };
      |                                             ^

Have any feedback or feature suggestions? Share it here.

github-actions

Cpp-linter Review

Used clang-tidy v18.1.3

Only 1 out of 4 clang-tidy concerns fit within this pull request's diff.

Click here for the full clang-tidy patch

diff --git a/neuland/calibration/cal_to_hit/R3BNeulandCalToHitParTask.h b/neuland/calibration/cal_to_hit/R3BNeulandCalToHitParTask.h
index 469e052..5996532 100644
--- a/neuland/calibration/cal_to_hit/R3BNeulandCalToHitParTask.h
+++ b/neuland/calibration/cal_to_hit/R3BNeulandCalToHitParTask.h
@@ -22,0 +23 @@
+#include <cstdint>
diff --git a/neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx b/neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx
index 5c29b0d..e75b740 100644
--- a/neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx
+++ b/neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx
@@ -14,0 +15 @@
+#include "R3BException.h"
@@ -18,0 +20 @@
+#include <cstdlib>
diff --git a/neuland/calibration/mille/PedeLauncher.cxx b/neuland/calibration/mille/PedeLauncher.cxx
index d81aed4..05787bb 100644
--- a/neuland/calibration/mille/PedeLauncher.cxx
+++ b/neuland/calibration/mille/PedeLauncher.cxx
@@ -13,0 +14,3 @@
+#include <fmt/core.h>
+#include <string>
+#include <vector>

Used clang-format v18.1.3

No concerns from clang-format.

Have any feedback or feature suggestions? Share it here.

neuland/calibration/cal_to_hit/R3BNeulandCalToHitParTask.h

github-actions

Cpp-linter Review

Used clang-tidy v18.1.3

Only 1 out of 4 clang-tidy concerns fit within this pull request's diff.

Click here for the full clang-tidy patch

diff --git a/neuland/calibration/cal_to_hit/R3BNeulandCalToHitParTask.h b/neuland/calibration/cal_to_hit/R3BNeulandCalToHitParTask.h
index 469e052..5996532 100644
--- a/neuland/calibration/cal_to_hit/R3BNeulandCalToHitParTask.h
+++ b/neuland/calibration/cal_to_hit/R3BNeulandCalToHitParTask.h
@@ -22,0 +23 @@
+#include <cstdint>
diff --git a/neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx b/neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx
index 7e8561f..0a50cea 100644
--- a/neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx
+++ b/neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx
@@ -14,0 +15 @@
+#include "R3BException.h"
@@ -18,0 +20 @@
+#include <cstdlib>
diff --git a/neuland/calibration/mille/PedeLauncher.cxx b/neuland/calibration/mille/PedeLauncher.cxx
index d81aed4..05787bb 100644
--- a/neuland/calibration/mille/PedeLauncher.cxx
+++ b/neuland/calibration/mille/PedeLauncher.cxx
@@ -13,0 +14,3 @@
+#include <fmt/core.h>
+#include <string>
+#include <vector>

Used clang-format v18.1.3

Click here for the full clang-format patch

diff --git a/neuland/calibration/mille/PedeLauncher.h b/neuland/calibration/mille/PedeLauncher.h
index 3497374..014c14b 100644
--- a/neuland/calibration/mille/PedeLauncher.h
+++ b/neuland/calibration/mille/PedeLauncher.h
@@ -38 +37,0 @@ namespace R3B::Millepede
-

Have any feedback or feature suggestions? Share it here.

neuland/calibration/mille/PedeLauncher.h

neuland/calibration/cal_to_hit/R3BNeulandCalToHitParTask.h

github-actions

Cpp-linter Review

Used clang-tidy v18.1.3

Only 1 out of 2 clang-tidy concerns fit within this pull request's diff.

Click here for the full clang-tidy patch

diff --git a/neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx b/neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx
index 434b7cb..facf6ac 100644
--- a/neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx
+++ b/neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx
@@ -21,2 +20,0 @@
-#include <fmt/format.h>
-#include <range/v3/algorithm.hpp>
diff --git a/neuland/calibration/mille/PedeLauncher.cxx b/neuland/calibration/mille/PedeLauncher.cxx
index d81aed4..05787bb 100644
--- a/neuland/calibration/mille/PedeLauncher.cxx
+++ b/neuland/calibration/mille/PedeLauncher.cxx
@@ -13,0 +14,3 @@
+#include <fmt/core.h>
+#include <string>
+#include <vector>

Used clang-format v18.1.3

Click here for the full clang-format patch

diff --git a/neuland/calibration/mille/PedeLauncher.h b/neuland/calibration/mille/PedeLauncher.h
index 3497374..014c14b 100644
--- a/neuland/calibration/mille/PedeLauncher.h
+++ b/neuland/calibration/mille/PedeLauncher.h
@@ -38 +37,0 @@ namespace R3B::Millepede
-

Have any feedback or feature suggestions? Share it here.

neuland/calibration/mille/PedeLauncher.h

neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx

github-actions

Cpp-linter Review

Used clang-tidy v18.1.3

Only 1 out of 2 clang-tidy concerns fit within this pull request's diff.

Click here for the full clang-tidy patch

diff --git a/neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx b/neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx
index 434b7cb..facf6ac 100644
--- a/neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx
+++ b/neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx
@@ -21,2 +20,0 @@
-#include <fmt/format.h>
-#include <range/v3/algorithm.hpp>
diff --git a/neuland/calibration/mille/PedeLauncher.cxx b/neuland/calibration/mille/PedeLauncher.cxx
index d81aed4..05787bb 100644
--- a/neuland/calibration/mille/PedeLauncher.cxx
+++ b/neuland/calibration/mille/PedeLauncher.cxx
@@ -13,0 +14,3 @@
+#include <fmt/core.h>
+#include <string>
+#include <vector>

Used clang-format v18.1.3

No concerns from clang-format.

Have any feedback or feature suggestions? Share it here.

neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx

github-actions

Cpp-linter Review

Used clang-tidy v18.1.3

Only 1 out of 2 clang-tidy concerns fit within this pull request's diff.

Click here for the full clang-tidy patch

diff --git a/neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx b/neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx
index 0792fe2..1583e15 100644
--- a/neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx
+++ b/neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx
@@ -22 +21,0 @@
-#include <range/v3/numeric.hpp>
diff --git a/neuland/calibration/mille/PedeLauncher.cxx b/neuland/calibration/mille/PedeLauncher.cxx
index d81aed4..05787bb 100644
--- a/neuland/calibration/mille/PedeLauncher.cxx
+++ b/neuland/calibration/mille/PedeLauncher.cxx
@@ -13,0 +14,3 @@
+#include <fmt/core.h>
+#include <string>
+#include <vector>

Used clang-format v18.1.3

No concerns from clang-format.

Have any feedback or feature suggestions? Share it here.

neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx

github-actions

Cpp-linter Review

Used clang-tidy v18.1.3

Only 1 out of 2 clang-tidy concerns fit within this pull request's diff.

Click here for the full clang-tidy patch

diff --git a/neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx b/neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx
index 0792fe2..1583e15 100644
--- a/neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx
+++ b/neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx
@@ -22 +21,0 @@
-#include <range/v3/numeric.hpp>
diff --git a/neuland/calibration/mille/PedeLauncher.cxx b/neuland/calibration/mille/PedeLauncher.cxx
index d81aed4..05787bb 100644
--- a/neuland/calibration/mille/PedeLauncher.cxx
+++ b/neuland/calibration/mille/PedeLauncher.cxx
@@ -13,0 +14,3 @@
+#include <fmt/core.h>
+#include <string>
+#include <vector>

Used clang-format v18.1.3

No concerns from clang-format.

Have any feedback or feature suggestions? Share it here.

neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx

github-actions

Cpp-linter Review

Used clang-tidy v18.1.3

Only 1 out of 2 clang-tidy concerns fit within this pull request's diff.

Click here for the full clang-tidy patch

diff --git a/neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx b/neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx
index 1583e15..4f819a5 100644
--- a/neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx
+++ b/neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx
@@ -22 +21,0 @@
-#include <range/v3/view.hpp>
diff --git a/neuland/calibration/mille/PedeLauncher.cxx b/neuland/calibration/mille/PedeLauncher.cxx
index d81aed4..05787bb 100644
--- a/neuland/calibration/mille/PedeLauncher.cxx
+++ b/neuland/calibration/mille/PedeLauncher.cxx
@@ -13,0 +14,3 @@
+#include <fmt/core.h>
+#include <string>
+#include <vector>

Used clang-format v18.1.3

No concerns from clang-format.

Have any feedback or feature suggestions? Share it here.

github-actions · 2025-01-28T22:09:09Z

neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx

-#include <optional>
-#include <range/v3/algorithm.hpp>
-#include <range/v3/numeric.hpp>
+#include <range/v3/algorithm/all_of.hpp>
 #include <range/v3/view.hpp>


clang-tidy diagnostics

included header view.hpp is not used directly [misc-include-cleaner]

Please remove the line(s)

22

YanzhaoW

Cpp-linter Review

Used clang-tidy v18.1.3

Only 4 out of 5 clang-tidy concerns fit within this pull request's diff.

Click here for the full clang-tidy patch

diff --git a/neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx b/neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx
index 589da2e..37ec0bf 100644
--- a/neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx
+++ b/neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx
@@ -26,3 +25,0 @@
-#include <optional>
-#include <string>
-#include <vector>
diff --git a/neuland/calibration/mille/PedeLauncher.cxx b/neuland/calibration/mille/PedeLauncher.cxx
index d81aed4..81569b7 100644
--- a/neuland/calibration/mille/PedeLauncher.cxx
+++ b/neuland/calibration/mille/PedeLauncher.cxx
@@ -13,0 +14,4 @@
+#include <fmt/core.h>
+#include <stdexcept>
+#include <string>
+#include <vector>

Used clang-format v18.1.3

No concerns from clang-format.

Have any feedback or feature suggestions? Share it here.

YanzhaoW · 2025-01-28T22:44:00Z

neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx

+#include <optional>
+#include <string>
+#include <vector>


clang-tidy diagnostics

included header optional is not used directly [misc-include-cleaner]

included header string is not used directly [misc-include-cleaner]

included header vector is not used directly [misc-include-cleaner]

Please remove the line(s)

26

27

28

YanzhaoW · 2025-01-28T22:44:00Z

neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx

@@ -12,15 +12,21 @@
 ******************************************************************************/

 #include "R3BNeulandMillepede.h"
+#include <R3BException.h>
 #include <R3BNeulandCalToHitParTask.h>


clang-tidy diagnostic

neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx:16:10: error: [clang-diagnostic-error]

'R3BDataMonitor.h' file not found

16 | #include <R3BDataMonitor.h> | ^~~~~~~~~~~~~~~~~~

YanzhaoW · 2025-01-28T22:44:00Z

neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx

@@ -52,6 +58,15 @@ namespace R3B::Neuland::Calibration
        par_result_.set_filename(DEFAULT_RES_FILENAME);
        pede_launcher_.set_steer_filename(pede_steer_filename_);
        pede_launcher_.set_parameter_filename(parameter_filename_);
+        if (const auto* r3b_dir = std::getenv("R3BROOTPATH"); r3b_dir != nullptr)


clang-tidy diagnostic

neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx:61:9: warning: [bugprone-branch-clone]

if with identical then and else branches

61 | if (const auto* r3b_dir = std::getenv("R3BROOTPATH"); r3b_dir != nullptr) | ^ /__w/R3BRoot/R3BRoot/neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx:65:9: note: else branch starts here 65 | else | ^

YanzhaoW · 2025-01-28T22:44:00Z

neuland/calibration/mille/PedeLauncher.h

      private:
        boost::asio::io_service ios_;
        std::string steer_filename_ = DEFAULT_STEER_FILENAME;
        std::string parameter_file_;
+        std::string binary_directory_ = ".";


clang-tidy diagnostic

neuland/calibration/mille/PedeLauncher.h:36:10: error: [clang-diagnostic-error]

'cmath' file not found

36 | #include <cmath> // std::signbit | ^~~~~~~

- add millepede2 as a submodule - disable static analysis - add calibration of predecessor - add python script to check hit_par and change hit module par member names - add input and output name for ana tasks - fix the json object merging issue

github-actions bot reviewed Jan 27, 2025

View reviewed changes

neuland/calibration/cal_to_hit/R3BNeulandCalToHitParTask.h Show resolved Hide resolved

github-actions bot reviewed Jan 28, 2025

View reviewed changes

neuland/calibration/mille/PedeLauncher.h Outdated Show resolved Hide resolved

neuland/calibration/cal_to_hit/R3BNeulandCalToHitParTask.h Show resolved Hide resolved

github-actions bot reviewed Jan 28, 2025

View reviewed changes

neuland/calibration/mille/PedeLauncher.h Show resolved Hide resolved

neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx Outdated Show resolved Hide resolved

github-actions bot reviewed Jan 28, 2025

View reviewed changes

neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx Outdated Show resolved Hide resolved

YanzhaoW force-pushed the edwin_pede_integrate branch from eadcf7f to 728184e Compare January 28, 2025 21:11

github-actions bot reviewed Jan 28, 2025

View reviewed changes

neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx Outdated Show resolved Hide resolved

github-actions bot reviewed Jan 28, 2025

View reviewed changes

neuland/calibration/cal_to_hit/engine/R3BNeulandMillepede.cxx Outdated Show resolved Hide resolved

github-actions bot reviewed Jan 28, 2025

View reviewed changes

This comment was marked as outdated.

Sign in to view

YanzhaoW commented Jan 28, 2025

View reviewed changes

YanzhaoW force-pushed the edwin_pede_integrate branch 2 times, most recently from cdb8dea to 51405d7 Compare February 13, 2025 15:55

YanzhaoW force-pushed the edwin_pede_integrate branch from 51405d7 to d34c9eb Compare February 13, 2025 18:10

YanzhaoW merged commit fd024b9 into edwin_dev Feb 13, 2025
4 of 5 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Millepede integration #24

Millepede integration #24

YanzhaoW commented Jan 25, 2025

github-actions bot commented Jan 27, 2025 •

edited by YanzhaoW

Loading

github-actions bot left a comment

github-actions bot left a comment

github-actions bot left a comment

github-actions bot left a comment

github-actions bot left a comment

github-actions bot left a comment

github-actions bot left a comment

github-actions bot Jan 28, 2025

This comment was marked as outdated.

YanzhaoW left a comment

YanzhaoW Jan 28, 2025

YanzhaoW Jan 28, 2025

YanzhaoW Jan 28, 2025

YanzhaoW Jan 28, 2025

Millepede integration #24

Millepede integration #24

Conversation

YanzhaoW commented Jan 25, 2025

github-actions bot commented Jan 27, 2025 • edited by YanzhaoW Loading

Cpp-Linter Report ⚠️

github-actions bot left a comment

Choose a reason for hiding this comment

Cpp-linter Review

Used clang-tidy v18.1.3

Used clang-format v18.1.3

github-actions bot left a comment

Choose a reason for hiding this comment

Cpp-linter Review

Used clang-tidy v18.1.3

Used clang-format v18.1.3

github-actions bot left a comment

Choose a reason for hiding this comment

Cpp-linter Review

Used clang-tidy v18.1.3

Used clang-format v18.1.3

github-actions bot left a comment

Choose a reason for hiding this comment

Cpp-linter Review

Used clang-tidy v18.1.3

Used clang-format v18.1.3

github-actions bot left a comment

Choose a reason for hiding this comment

Cpp-linter Review

Used clang-tidy v18.1.3

Used clang-format v18.1.3

github-actions bot left a comment

Choose a reason for hiding this comment

Cpp-linter Review

Used clang-tidy v18.1.3

Used clang-format v18.1.3

github-actions bot left a comment

Choose a reason for hiding this comment

Cpp-linter Review

Used clang-tidy v18.1.3

Used clang-format v18.1.3

github-actions bot Jan 28, 2025

Choose a reason for hiding this comment

clang-tidy diagnostics

This comment was marked as outdated.

YanzhaoW left a comment

Choose a reason for hiding this comment

Cpp-linter Review

Used clang-tidy v18.1.3

Used clang-format v18.1.3

YanzhaoW Jan 28, 2025

Choose a reason for hiding this comment

clang-tidy diagnostics

YanzhaoW Jan 28, 2025

Choose a reason for hiding this comment

clang-tidy diagnostic

YanzhaoW Jan 28, 2025

Choose a reason for hiding this comment

clang-tidy diagnostic

YanzhaoW Jan 28, 2025

Choose a reason for hiding this comment

clang-tidy diagnostic

github-actions bot commented Jan 27, 2025 •

edited by YanzhaoW

Loading