Skip to content
Merged
Changes from 1 commit
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
35 changes: 16 additions & 19 deletions Detectors/MUON/MCH/Align/src/AlignmentSpec.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -159,10 +159,6 @@ class AlignmentTask
}

doReAlign = ic.options().get<bool>("do-realign");
Comment thread
pillot marked this conversation as resolved.
if (doReAlign) {
LOG(info) << "Re-alignment mode";
NewGeoFileName = ic.options().get<string>("geo-file-new");
}

if (mCCDBRequest) {
LOG(info) << "Loading magnetic field and reference geometry from CCDB";
Expand Down Expand Up @@ -205,6 +201,22 @@ class AlignmentTask
} else {
LOG(fatal) << "No reference geometry";
}

if (doReAlign) {
LOG(info) << "Re-alignment mode";
LOG(info) << "Loading re-alignment geometry";
NewGeoFileName = ic.options().get<string>("geo-file-new");
if (std::filesystem::exists(NewGeoFileName)) {
base::GeometryManager::loadGeometry(NewGeoFileName.c_str());
transformation = geo::transformationFromTGeoManager(*gGeoManager);
for (int i = 0; i < 156; i++) {
int iDEN = GetDetElemId(i);
transformNew[iDEN] = transformation(iDEN);
}
} else {
LOG(fatal) << "No re-alignment geometry";
}
}
}

auto doEvaluation = ic.options().get<bool>("do-evaluation");
Expand Down Expand Up @@ -388,21 +400,6 @@ class AlignmentTask
}
}

// Load new geometry if we need to do re-align
if (doReAlign) {
LOG(info) << "Loading re-alignment geometry";
if (std::filesystem::exists(NewGeoFileName)) {
base::GeometryManager::loadGeometry(NewGeoFileName.c_str());
transformation = geo::transformationFromTGeoManager(*gGeoManager);
for (int i = 0; i < 156; i++) {
int iDEN = GetDetElemId(i);
transformNew[iDEN] = transformation(iDEN);
}
} else {
LOG(fatal) << "No re-alignment geometry";
}
}

if (!readFromRec) {
// Loading input data
LOG(info) << "Loading MCH tracks";
Expand Down