Move new geometry reading to init

Author: Elros60

Detectors/MUON/MCH/Align/src/AlignmentSpec.cxx

@@ -159,10 +159,6 @@ class AlignmentTask
     }
 
     doReAlign = ic.options().get<bool>("do-realign");
-    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";
@@ -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");
@@ -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";