Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion Detectors/Base/include/DetectorsBase/GRPGeomHelper.h
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@ struct GRPGeomRequest {
enum GeomRequest { None,
Aligned,
Ideal,
Alignments };
Alignments,
AlignmentsAndAligned };

bool askAggregateRunInfo = false;
bool askGRPECS = false;
Expand Down
4 changes: 2 additions & 2 deletions Detectors/Base/src/GRPGeomHelper.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@ namespace o2d = o2::dataformats;
GRPGeomRequest::GRPGeomRequest(bool orbitResetTime, bool GRPECS, bool GRPLHCIF, bool GRPMagField, bool askMatLUT, GeomRequest geom, std::vector<o2::framework::InputSpec>& inputs, bool askOnce, bool needPropD, std::string detMaskString)
: askGRPECS(GRPECS), askGRPLHCIF(GRPLHCIF), askGRPMagField(GRPMagField), askMatLUT(askMatLUT), askTime(orbitResetTime), askOnceAllButField(askOnce), needPropagatorD(needPropD)
{
if (geom == Aligned) {
if (geom == Aligned || geom == AlignmentsAndAligned) {
askGeomAlign = true;
addInput({"geomAlg", "GLO", "GEOMALIGN", 0, Lifetime::Condition, ccdbParamSpec("GLO/Config/GeometryAligned")}, inputs);
} else if (geom == Ideal || geom == Alignments) {
askGeomIdeal = true;
addInput({"geomIdeal", "GLO", "GEOMIDEAL", 0, Lifetime::Condition, ccdbParamSpec("GLO/Config/Geometry")}, inputs);
}
if (geom == Alignments) {
if (geom == Alignments || geom == AlignmentsAndAligned) {
askAlignments = true;
o2::detectors::DetID::mask_t algDetMask = DetID::getMask(detMaskString);
for (auto id = DetID::First; id <= DetID::Last; id++) {
Expand Down
Loading