From e08c23289fbfa0d3f6d74d2b1efa39fafc836bc6 Mon Sep 17 00:00:00 2001
From: Arthur Hennequin <arthur.hennequin@cern.ch>
Date: Thu, 20 Mar 2025 13:44:32 +0100
Subject: [PATCH 1/2] Adapt to rapidyaml switch
---
Alignment/TAlignment/src/AlignConditionHelpers.h | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/Alignment/TAlignment/src/AlignConditionHelpers.h b/Alignment/TAlignment/src/AlignConditionHelpers.h
index 236e4cddd..c9f73185f 100644
--- a/Alignment/TAlignment/src/AlignConditionHelpers.h
+++ b/Alignment/TAlignment/src/AlignConditionHelpers.h
@@ -27,9 +27,7 @@ namespace LHCb::Alignment::ConditionHelpers {
return T( cond );
} else {
using DT = std::decay_t<T>;
- if constexpr ( std::is_same_v<DT, YAML::Node> ) {
- return LHCb::Detector::utils::json2yaml( cond.get<nlohmann::json>() );
- } else if constexpr ( !detail::PassAsAny<DT>::value ) {
+ if constexpr ( !detail::PassAsAny<DT>::value ) {
return cond.get<DT>();
} else {
const DT* p = nullptr;
--
GitLab
From 95a9f42b1750511b7e45bb273bbb939729b84aa2 Mon Sep 17 00:00:00 2001
From: Arthur Hennequin <arthur.hennequin@cern.ch>
Date: Fri, 21 Mar 2025 11:12:01 +0100
Subject: [PATCH 2/2] Remove unused includes, add missing whitespace in test
yaml
---
Alignment/Humboldt/tests/options/input_and_conds.py | 2 +-
Calibration/Pi0Calibration/src/Pi0CalibrationAlg.cpp | 2 --
Calibration/Pi0Calibration/src/Pi0LambdaMap.cpp | 2 --
Calibration/Pi0Calibration/src/Pi0MMap2Histo.cpp | 2 --
4 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/Alignment/Humboldt/tests/options/input_and_conds.py b/Alignment/Humboldt/tests/options/input_and_conds.py
index 9875b318a..51400d070 100644
--- a/Alignment/Humboldt/tests/options/input_and_conds.py
+++ b/Alignment/Humboldt/tests/options/input_and_conds.py
@@ -21,7 +21,7 @@ if UseDD4Hep:
from Configurables import LHCb__Det__LbDD4hep__DD4hepSvc as DD4hepSvc
dx = 1.092
dy = 0.474
- condval = "!alignment{ position: [%f * mm, %f * mm, 0 * mm], rotation: [0,0,0]}" % (
+ condval = "!alignment { position: [%f * mm, %f * mm, 0 * mm], rotation: [0,0,0]}" % (
dx, dy)
DD4hepSvc().ConditionsOverride = {
"/world/BeforeMagnetRegion/VP/MotionVPLeft:alignment_delta": condval,
diff --git a/Calibration/Pi0Calibration/src/Pi0CalibrationAlg.cpp b/Calibration/Pi0Calibration/src/Pi0CalibrationAlg.cpp
index c64af87f4..652162f86 100644
--- a/Calibration/Pi0Calibration/src/Pi0CalibrationAlg.cpp
+++ b/Calibration/Pi0Calibration/src/Pi0CalibrationAlg.cpp
@@ -34,8 +34,6 @@
#include <boost/filesystem.hpp>
-#include <yaml-cpp/yaml.h>
-
#include <fstream>
#include <iostream>
#include <map>
diff --git a/Calibration/Pi0Calibration/src/Pi0LambdaMap.cpp b/Calibration/Pi0Calibration/src/Pi0LambdaMap.cpp
index f110e260b..e65baed04 100644
--- a/Calibration/Pi0Calibration/src/Pi0LambdaMap.cpp
+++ b/Calibration/Pi0Calibration/src/Pi0LambdaMap.cpp
@@ -42,8 +42,6 @@ using namespace boost;
using namespace boost::filesystem;
using namespace Calibration::Pi0Calibration;
-#include "yaml-cpp/yaml.h"
-
Pi0LambdaMap::Pi0LambdaMap( const std::vector<unsigned int>& indices ) {
for ( auto index : indices ) m_lambdas[index] = std::make_pair( -1., -1. );
}
diff --git a/Calibration/Pi0Calibration/src/Pi0MMap2Histo.cpp b/Calibration/Pi0Calibration/src/Pi0MMap2Histo.cpp
index cc97c1b4b..7ef7a9593 100644
--- a/Calibration/Pi0Calibration/src/Pi0MMap2Histo.cpp
+++ b/Calibration/Pi0Calibration/src/Pi0MMap2Histo.cpp
@@ -34,8 +34,6 @@
#include <boost/filesystem.hpp>
-#include <yaml-cpp/yaml.h>
-
#include <cstdint>
#include <iostream>
#include <map>
--
GitLab