Merge branch 'feature/interactive_refinements'

GeminiDRSoftware · Apr 30, 2021 · 6492546 · 6492546
2 parents 02d59ed + 7a6d7fc
commit 6492546
Show file tree

Hide file tree

Showing 46 changed files with 4,705 additions and 1,807 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -71,13 +71,20 @@ pipeline {
                                 testResults: 'reports/*_results.xml'
                             )
                             echo "Delete temporary folder: ${TMPDIR}"
-                            dir ( '$TMPDIR' ) { deleteDir() }
-                            echo "Delete Tox Environment: .tox/py37-unit"
-                            dir ( ".tox/py37-unit" ) { deleteDir() }
+                            dir ( '$TMPDIR' ) {
+                                deleteDir()
+                            }
                         }
                         failure {
                             echo "Archiving tests results for Unit Tests"
                             sh "find ${DRAGONS_TEST_OUT} -not -name \\*.bz2 -type f -print0 | xargs -0 -n1 -P4 bzip2"
+        //                             archiveArtifacts artifacts: "${DRAGONS_TEST_OUT}/**"
+                        }
+                        success {
+                            echo "Delete Tox Environment: .tox/py37-unit"
+                            dir ( ".tox/py37-unit" ) {
+                                deleteDir()
+                            }
                         }
                     }
 
@@ -109,9 +116,15 @@ pipeline {
                                 testResults: 'reports/*_results.xml'
                             )
                             echo "Delete temporary folder: ${TMPDIR}"
-                            dir ( '$TMPDIR' ) { deleteDir() }
+                            dir ( '$TMPDIR' ) {
+                                deleteDir()
+                            }
+                        }
+                        success {
                             echo "Delete Tox Environment: .tox/py37-integ"
-                            dir ( ".tox/py37-integ" ) { deleteDir() }
+                            dir ( ".tox/py37-integ" ) {
+                                deleteDir()
+                            }
                         }
                     } // end post
                 } // end stage
@@ -142,9 +155,15 @@ pipeline {
                                 testResults: 'reports/*_results.xml'
                             )
                             echo "Delete temporary folder: ${TMPDIR}"
-                            dir ( '$TMPDIR' ) { deleteDir() }
+                            dir ( '$TMPDIR' ) {
+                                deleteDir()
+                            }
+                        }
+                        success {
                             echo "Delete Tox Environment: .tox/py37-reg"
-                            dir ( ".tox/py37-reg" ) { deleteDir() }
+                            dir ( ".tox/py37-reg" ) {
+                                deleteDir()
+                            }
                         }
                     } // end post
                 }
@@ -176,10 +195,16 @@ pipeline {
                                 testResults: 'reports/*_results.xml'
                             )
                             echo "Delete temporary folder: ${TMPDIR}"
-                            dir ( '$TMPDIR' ) { deleteDir() }
-                            echo "Delete Tox Environment: .tox/py37-gmosls"
-                            dir( '.tox/py37-gmosls' ) { deleteDir() }
+                            dir ( '$TMPDIR' ) {
+                                deleteDir()
+                            }
                         }  // end always
+                        success {
+                            echo "Delete Tox Environment: .tox/py37-gmosls"
+                            dir( '.tox/py37-gmosls' ) {
+                                deleteDir()
+                            }
+                        }
                     }  // end post
                 }  // end stage
 
@@ -212,9 +237,15 @@ pipeline {
                         testResults: 'reports/*_results.xml'
                     )
                     echo "Delete temporary folder: ${TMPDIR}"
-                    dir ( '$TMPDIR' ) { deleteDir() }
+                    dir ( '$TMPDIR' ) {
+                        deleteDir()
+                    }
+                }
+                success {
                     echo "Delete Tox Environment: .tox/py37-slow"
-                    dir( '.tox/py37-slow' ) { deleteDir() }
+                    dir( '.tox/py37-slow' ) {
+                        deleteDir()
+                    }
                 }
             } // end post
         }

diff --git a/geminidr/core/parameters_spect.py b/geminidr/core/parameters_spect.py
@@ -410,18 +410,30 @@ def setDefaults(self):
 
 
 class traceAperturesConfig(config.Config):
-    suffix = config.Field("Filename suffix", str, "_aperturesTraced", optional=True)
-    nsum = config.RangeField("Number of lines to sum", int, 10, min=1)
-    step = config.RangeField("Step in rows/columns for tracing", int, 10, min=1)
-    order = config.RangeField("Order of fitting function", int, 2, min=1)
-    sigma = config.RangeField("Rejection in sigma of fit", float, 3,
-                        min=0, optional=True)
-    niter = config.RangeField("Maximum number of rejection iterations", int, None,
-                       min=0, optional=True)
+    """
+    Configuration for the traceApertures() primitive.
+    """
+    debug = config.Field("Draw aperture traces on image display?",
+                         bool, False)
+    interactive = config.Field("Run primitive interactively?",
+                               bool, False)
+    max_missed = config.RangeField("Maximum number of steps to miss before a line is lost",
+                                   int, 5, min=0)
     max_shift = config.RangeField("Maximum shift per pixel in line position",
                                   float, 0.05, min=0.001, max=0.1)
-    max_missed = config.RangeField("Maximum number of steps to miss before a line is lost", int, 5, min=0)
-    debug = config.Field("Draw aperture traces on image display?", bool, False)
+    niter = config.RangeField("Maximum number of rejection iterations",
+                              int, None, min=0, optional=True)
+    nsum = config.RangeField("Number of lines to sum",
+                             int, 10, min=1)
+    order = config.RangeField("Order of fitting function",
+                              int, 2, min=1)
+    sigma = config.RangeField("Rejection in sigma of fit",
+                              float, 3, min=0, optional=True)
+    step = config.RangeField("Step in rows/columns for tracing",
+                             int, 10, min=1)
+    suffix = config.Field("Filename suffix",
+                          str, "_aperturesTraced", optional=True)
+
 
 
 class write1DSpectraConfig(config.Config):