Removed unused parameters.

cms-sw · Aug 21, 2020 · 4b9abab · 4b9abab
1 parent b42a163
commit 4b9abab
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 18 deletions.
diff --git a/Alignment/PPSTrackBased/interface/AlignmentTask.h b/Alignment/PPSTrackBased/interface/AlignmentTask.h
@@ -32,20 +32,9 @@ class AlignmentTask
     /// whether to resolve detector rotations around z
     bool resolveRotZ;
 
-
-    /// whether the per-group constraint shall be applied
-    bool useExtendedRotZConstraint;
-
-    /// whether the per-group constraint shall be applied
-    bool useZeroThetaRotZConstraint;
-
-    /// whether the per-group constraints shall be applied
-    bool useExtendedShZConstraints;
-
     /// whether to resolve only 1 rot_z per RP
     bool oneRotZPerPot;
 
-
     /// fixed detectors constraints from config file
     edm::ParameterSet fixedDetectorsConstraints;
 

diff --git a/Alignment/PPSTrackBased/python/ppsStraightTrackAligner_cfi.py b/Alignment/PPSTrackBased/python/ppsStraightTrackAligner_cfi.py
@@ -58,9 +58,6 @@
     # choices: fixedDetectors, standard
     constraintsType = cms.string("standard"),
 
-    useExtendedRotZConstraint = cms.bool(True),
-    useZeroThetaRotZConstraint = cms.bool(False),
-    useExtendedShZConstraints = cms.bool(True),
     useExtendedRPShZConstraint = cms.bool(True),
     oneRotZPerPot = cms.bool(False),
 

diff --git a/Alignment/PPSTrackBased/src/AlignmentTask.cc b/Alignment/PPSTrackBased/src/AlignmentTask.cc
@@ -29,9 +29,6 @@ AlignmentTask::AlignmentTask(const ParameterSet& ps) :
   resolveShZ(ps.getParameter<bool>("resolveShZ")),
   resolveRotZ(ps.getParameter<bool>("resolveRotZ")),
 
-  useExtendedRotZConstraint(ps.getParameter<bool>("useExtendedRotZConstraint")),
-  useZeroThetaRotZConstraint(ps.getParameter<bool>("useZeroThetaRotZConstraint")),
-  useExtendedShZConstraints(ps.getParameter<bool>("useExtendedShZConstraints")),
   oneRotZPerPot(ps.getParameter<bool>("oneRotZPerPot")),
 
   fixedDetectorsConstraints(ps.getParameterSet("fixedDetectorsConstraints")),
@@ -313,6 +310,7 @@ void AlignmentTask::buildFixedDetectorsConstraints(vector<AlignmentConstraint> &
 
 void AlignmentTask::buildOneRotZPerPotConstraints(std::vector<AlignmentConstraint> &constraints) const
 {
+  // TODO
   printf(">> AlignmentTask::BuildOneRotZPerPotConstraints > not yet ported\n");
   throw 1;
 
@@ -500,5 +498,6 @@ void AlignmentTask::buildStandardConstraints(vector<AlignmentConstraint> &constr
     }
   }
 
-  // TODO: when oneRotZPerPot=true, make use of BuildOneRotZPerPotConstraints(constraints) ??
+  if (resolveRotZ && oneRotZPerPot)
+    buildOneRotZPerPotConstraints(constraints);
 }