Move residual step before smooth one

Former-commit-id: 8484f1ba
Former-commit-id: c6a0ede5

subworkflow/clocktec.cwl

@@ -105,7 +105,7 @@ steps:
       - id: soltab
         default: sol000/clock
       - id: soltabOut
-        default: clockOrig
+        default: OrigClock
     out:
       - id: output_h5parm
       - id: log
@@ -136,6 +136,9 @@ steps:
     'sbg:x': 900
     'sbg:y': 0
   - id: losoto_residual
+    doc: |
+      Note: this step uses the OrigClock solutions, to ensure that the
+      unsmoothed clock is used to calculate the residuals
     in:
       - id: input_h5parm
         source: smooth/output_h5parm
@@ -144,7 +147,7 @@ steps:
       - id: soltabsToSub
         source:
           - fit3rdorder
-        valueFrom: '$(self ? ["tec", "clock", "tec3rd"] : ["tec", "clock"])'
+        valueFrom: '$(self ? ["tec", "OrigClock", "tec3rd"] : ["tec", "OrigClock"])'
     out:
       - id: output_h5parm
       - id: log