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.

Sign up for GitHub

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

Jump to bottom

DPL: make helper for typeId consteval #12854

Open
wants to merge 3 commits into
base: dev
Choose a base branch
from
+10 −40
Open

DPL: make helper for typeId consteval #12854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a21b45
Do not expose Devices to ROOT
ktf Mar 14, 2024
dc4bf48
DPL: make helper for typeId consteval
ktf Mar 14, 2024
2d2e2f0
Merge branch 'dev' into pr12854
ktf May 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions Detectors/PHOS/calib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,21 +30,14 @@ o2_add_library(PHOSCalibWorkflow
o2_add_header_only_library(PHOSCalib)

o2_target_root_dictionary(PHOSCalibWorkflow
HEADERS include/PHOSCalibWorkflow/PHOSPedestalCalibDevice.h
include/PHOSCalibWorkflow/PHOSHGLGRatioCalibDevice.h
include/PHOSCalibWorkflow/PHOSTurnonCalibrator.h
HEADERS include/PHOSCalibWorkflow/PHOSTurnonCalibrator.h
include/PHOSCalibWorkflow/RingBuffer.h
include/PHOSCalibWorkflow/ETCalibHistos.h
include/PHOSCalibWorkflow/PHOSEnergyCalibrator.h
include/PHOSCalibWorkflow/PHOSEnergyCalibDevice.h
include/PHOSCalibWorkflow/TurnOnHistos.h
include/PHOSCalibWorkflow/PHOSTurnonCalibrator.h
include/PHOSCalibWorkflow/PHOSTurnonCalibDevice.h
include/PHOSCalibWorkflow/PHOSRunbyrunCalibrator.h
include/PHOSCalibWorkflow/PHOSRunbyrunCalibDevice.h
include/PHOSCalibWorkflow/PHOSL1phaseCalibrator.h
include/PHOSCalibWorkflow/PHOSL1phaseCalibDevice.h
include/PHOSCalibWorkflow/PHOSBadMapCalibDevice.h
LINKDEF src/PHOSCalibWorkflowLinkDef.h)

o2_add_executable(calib-workflow
Expand Down
7 changes: 1 addition & 6 deletions Detectors/PHOS/calib/include/PHOSCalibWorkflow/PHOSEnergyCalibrator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
/// @file PHOSEnergyCalibtor.h
/// @brief Device to collect energy and time PHOS energy and time calibration.

#include "Framework/Task.h"
#include "Framework/WorkflowSpec.h"
#include "DetectorsCalibration/TimeSlotCalibration.h"
#include "DataFormatsPHOS/TriggerRecord.h"
#include "DataFormatsPHOS/Cluster.h"
Expand All @@ -32,9 +30,7 @@

using namespace o2::framework;

namespace o2
{
namespace phos
namespace o2::phos
{

// structure used to store digit info for re-calibration
Expand Down Expand Up @@ -156,7 +152,6 @@ class PHOSEnergyCalibrator final : public o2::calibration::TimeSlotCalibration<o
std::unique_ptr<ETCalibHistos> mHistos; /// final histograms
};

} // namespace phos
} // namespace o2

#endif
7 changes: 1 addition & 6 deletions Detectors/PHOS/calib/include/PHOSCalibWorkflow/PHOSL1phaseCalibrator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
/// @file PHOSRunbyrunCalibDevice.h
/// @brief Device to calculate PHOS time shift (L1phase)

#include "Framework/Task.h"
#include "Framework/ProcessingContext.h"
#include "DataFormatsPHOS/BadChannelsMap.h"
#include "DataFormatsPHOS/CalibParams.h"
#include "DataFormatsPHOS/TriggerRecord.h"
Expand All @@ -25,9 +23,7 @@

using namespace o2::framework;

namespace o2
{
namespace phos
namespace o2::phos
{

class PHOSL1phaseSlot
Expand Down Expand Up @@ -95,7 +91,6 @@ class PHOSL1phaseCalibrator final : public o2::calibration::TimeSlotCalibration<
ClassDefOverride(PHOSL1phaseCalibrator, 3);
};

} // namespace phos
} // namespace o2

#endif
11 changes: 5 additions & 6 deletions Detectors/PHOS/calib/include/PHOSCalibWorkflow/PHOSRunbyrunCalibrator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
/// @file PHOSRunbyrunCalibDevice.h
/// @brief Device to calculate PHOS energy run by run corrections

#include "Framework/Task.h"
#include "Framework/ProcessingContext.h"
#include "DataFormatsPHOS/BadChannelsMap.h"
#include "DataFormatsPHOS/TriggerRecord.h"
#include "DetectorsCalibration/TimeSlotCalibration.h"
Expand All @@ -28,9 +26,11 @@

using namespace o2::framework;

namespace o2
{
namespace phos
namespace o2::framework {
struct ProcessingContext;
}

namespace o2::phos
{

class PHOSRunbyrunSlot
Expand Down Expand Up @@ -105,7 +105,6 @@ class PHOSRunbyrunCalibrator final : public o2::calibration::TimeSlotCalibration
ClassDefOverride(PHOSRunbyrunCalibrator, 1);
};

} // namespace phos
} // namespace o2

#endif
8 changes: 1 addition & 7 deletions Detectors/PHOS/calib/include/PHOSCalibWorkflow/PHOSTurnonCalibrator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
/// @file PHOSTurnonCalibrator.h
/// @brief Device to calculate PHOS turn-on curve and bad map

#include "Framework/Task.h"
#include "Framework/WorkflowSpec.h"
#include "DetectorsCalibration/TimeSlotCalibration.h"
#include "DataFormatsPHOS/Cluster.h"
#include "DataFormatsPHOS/Cell.h"
Expand All @@ -26,9 +24,7 @@

using namespace o2::framework;

namespace o2
{
namespace phos
namespace o2::phos
{

class PHOSTurnonSlot
Expand Down Expand Up @@ -96,8 +92,6 @@ class PHOSTurnonCalibrator final : public o2::calibration::TimeSlotCalibration<o
ClassDefOverride(PHOSTurnonCalibrator, 1);
};

o2::framework::DataProcessorSpec getPHOSTunronCalibDeviceSpec(bool useCCDB);
} // namespace phos
} // namespace o2

#endif
6 changes: 0 additions & 6 deletions Detectors/PHOS/calib/src/PHOSCalibWorkflowLinkDef.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,26 +15,20 @@
#pragma link off all classes;
#pragma link off all functions;

#pragma link C++ class o2::phos::PHOSPedestalCalibDevice + ;
#pragma link C++ class o2::phos::PHOSHGLGRatioCalibDevice + ;
#pragma link C++ class o2::phos::PHOSBadMapCalibDevice + ;
#pragma link C++ class o2::phos::ETCalibHistos + ;
#pragma link C++ class o2::calibration::TimeSlot < o2::phos::PHOSEnergySlot> + ;
#pragma link C++ class o2::calibration::TimeSlotCalibration < o2::phos::PHOSEnergySlot> + ;
#pragma link C++ class o2::phos::TurnOnHistos + ;
#pragma link C++ class o2::phos::PHOSTurnonSlot + ;
#pragma link C++ class o2::phos::PHOSTurnonCalibrator + ;
#pragma link C++ class o2::phos::PHOSTurnonCalibDevice + ;
#pragma link C++ class o2::calibration::TimeSlot < o2::phos::PHOSTurnonSlot> + ;
#pragma link C++ class o2::calibration::TimeSlotCalibration < o2::phos::PHOSTurnonSlot> + ;
#pragma link C++ class o2::phos::PHOSRunbyrunSlot + ;
#pragma link C++ class o2::phos::PHOSRunbyrunCalibrator + ;
#pragma link C++ class o2::phos::PHOSRunbyrunCalibDevice + ;
#pragma link C++ class o2::calibration::TimeSlot < o2::phos::PHOSRunbyrunSlot> + ;
#pragma link C++ class o2::calibration::TimeSlotCalibration < o2::phos::PHOSRunbyrunSlot> + ;
#pragma link C++ class o2::phos::PHOSL1phaseSlot + ;
#pragma link C++ class o2::phos::PHOSL1phaseCalibrator + ;
#pragma link C++ class o2::phos::PHOSL1phaseCalibDevice + ;
#pragma link C++ class o2::calibration::TimeSlot < o2::phos::PHOSL1phaseSlot> + ;
#pragma link C++ class o2::calibration::TimeSlotCalibration < o2::phos::PHOSL1phaseSlot> + ;
#pragma link C++ class vector < int> + ;
Expand Down
2 changes: 1 addition & 1 deletion Framework/Foundation/include/Framework/TypeIdHelpers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ constexpr static std::string_view type_name()

struct TypeIdHelpers {
template <typename T>
constexpr static uint32_t uniqueId()
consteval static uint32_t uniqueId()
{
#ifdef __CLING__
constexpr uint32_t r = crc32(unique_type_id_v<T>.data(), unique_type_id_v<T>.size());
Expand Down
Loading