AlignmentMillepede: fix enumeration of DUTs

src/modules/AlignmentMillepede/AlignmentMillepede.cpp

@@ -42,7 +42,7 @@ void AlignmentMillepede::initialise() {
     // Renumber the planes in Millepede, ignoring masked planes.
     unsigned int index = 0;
     for(const auto& det : get_detectors()) {
-        if(det->isDUT()) {
+        if(det->isDUT() && m_excludeDUT) {
             continue;
         }
         m_millePlanes[det->name()] = index;
@@ -166,7 +166,7 @@ void AlignmentMillepede::setConstraints(const size_t nPlanes) {
     // Calculate the mean z-position.
     double avgz = 0.;
     for(const auto& det : get_detectors()) {
-        if(det->isDUT()) {
+        if(det->isDUT() && m_excludeDUT) {
             continue;
         }
         avgz += det->displacement().Z();
@@ -175,7 +175,7 @@ void AlignmentMillepede::setConstraints(const size_t nPlanes) {
     // Calculate the variance.
     double varz = 0.0;
     for(const auto& det : get_detectors()) {
-        if(det->isDUT()) {
+        if(det->isDUT() && m_excludeDUT) {
             continue;
         }
         const double dz = det->displacement().Z() - avgz;
@@ -197,7 +197,7 @@ void AlignmentMillepede::setConstraints(const size_t nPlanes) {
 
     m_constraints.clear();
     for(const auto& det : get_detectors()) {
-        if(det->isDUT()) {
+        if(det->isDUT() && m_excludeDUT) {
             continue;
         }
         const unsigned int i = m_millePlanes[det->name()];
@@ -574,13 +574,13 @@ bool AlignmentMillepede::fitTrack(const std::vector<Equation>& equations,
 void AlignmentMillepede::updateGeometry() {
     auto nPlanes = num_detectors();
     for(const auto& det : get_detectors()) {
-        if(det->isDUT()) {
+        if(det->isDUT() && m_excludeDUT) {
             nPlanes--;
         }
     }
 
     for(const auto& det : get_detectors()) {
-        if(det->isDUT()) {
+        if(det->isDUT() && m_excludeDUT) {
             continue;
         }
         auto plane = m_millePlanes[det->name()];