From bb683bd0a82bfb34b244f49d8f7c9d1140161d6d Mon Sep 17 00:00:00 2001
From: Clare Shanahan <cshanahan@stsci.edu>
Date: Thu, 30 May 2024 16:42:34 -0400
Subject: [PATCH] review changes

---
 .../spectral_extraction.py                    | 10 +++-
 .../spectral_extraction.vue                   | 51 ++++++++++---------
 2 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/jdaviz/configs/specviz2d/plugins/spectral_extraction/spectral_extraction.py b/jdaviz/configs/specviz2d/plugins/spectral_extraction/spectral_extraction.py
index d59a791b14..4321dcdf33 100644
--- a/jdaviz/configs/specviz2d/plugins/spectral_extraction/spectral_extraction.py
+++ b/jdaviz/configs/specviz2d/plugins/spectral_extraction/spectral_extraction.py
@@ -92,12 +92,17 @@ class SpectralExtraction(PluginTemplateMixin):
     * ``ext_type`` (:class:`~jdaviz.core.template_mixin.SelectPluginComponent`)
     * :attr:`ext_width` :
       full width of the extraction window.
+    * :attr:`horne_ext_profile` :
+      For Horne extract, choice of 'Gaussian' or 'Self (interpolated)' to use
+      empirical profile from data.
     * :attr:`self_prof_n_bins` :
       Number of bins to use when computing the self-derived profile for Horne Extract.
     * :attr:`self_prof_interp_degree_x` :
-      Interpolation degree (in X) to use when computing the self-derived profile for Horne Extract.
+      Interpolation degree (in X) to use when computing the self-derived profile
+      for Horne Extract.
     * :attr:`self_prof_interp_degree_y` :
-      Interpolation degree (in Y) to use when computing the self-derived profile for Horne Extract.
+      Interpolation degree (in Y) to use when computing the self-derived profile
+      for Horne Extract.
     * ``ext_add_results`` (:class:`~jdaviz.core.template_mixin.AddResults`)
     * :meth:`import_extract`
     * :meth:`export_extract`
@@ -368,6 +373,7 @@ def user_api(self):
                                            'export_bg', 'export_bg_img', 'export_bg_sub',
                                            'ext_dataset', 'ext_trace', 'ext_type',
                                            'ext_width', 'ext_add_results',
+                                           'horne_ext_profile',
                                            'self_prof_n_bins',
                                            'self_prof_interp_degree_x',
                                            'self_prof_interp_degree_y',
diff --git a/jdaviz/configs/specviz2d/plugins/spectral_extraction/spectral_extraction.vue b/jdaviz/configs/specviz2d/plugins/spectral_extraction/spectral_extraction.vue
index 5ccdda4fef..f29653b4c8 100644
--- a/jdaviz/configs/specviz2d/plugins/spectral_extraction/spectral_extraction.vue
+++ b/jdaviz/configs/specviz2d/plugins/spectral_extraction/spectral_extraction.vue
@@ -423,36 +423,41 @@
           label="N Bins"
           type="number"
           v-model.number=self_prof_n_bins
-          :rules="[() => self_prof_n_bins!=='' || 'This field is required']"
+          :rules="[() => self_prof_n_bins !== '' || 'This field is required',
+                   () => self_prof_n_bins >0 || 'Number of bins must be greater than zero']"
           hint="Number of bins used to measure self profile."
           persistent-hint
         >
         </v-text-field>
       </v-row>
 
-      <v-row v-if="horne_ext_profile_selected === 'Self (interpolated)'">
-        <v-text-field
-          label="Interpolation Degree (X)"
-          type="number"
-          v-model.number=self_prof_interp_degree_x
-          :rules="[() => self_prof_interp_degree_x!=='' || 'This field is required']"
-          hint="Interpolation degree (X) to measure self profile."
-          persistent-hint
-        >
-        </v-text-field>
-      </v-row>
+      <div v-if="ext_type_selected === 'Horne'">
+        <v-row v-if="horne_ext_profile_selected === 'Self (interpolated)'">
+          <v-text-field
+            label="Interpolation Degree (X)"
+            type="number"
+            v-model.number=self_prof_interp_degree_x
+            :rules="[() => self_prof_interp_degree_x !== '' || 'This field is required',
+                     () => self_prof_interp_degree_x >0 || 'X interpolation degree must be be greater than zero']"
+            hint="Interpolation degree (X) to measure self profile."
+            persistent-hint
+          >
+          </v-text-field>
+        </v-row>
 
-      <v-row v-if="horne_ext_profile_selected === 'Self (interpolated)'">
-        <v-text-field
-          label="Interpolation Degree (Y)"
-          type="number"
-          v-model.number=self_prof_interp_degree_y
-          :rules="[() => self_prof_interp_degree_y!=='' || 'This field is required']"
-          hint="Interpolation degree (Y) to measure self profile."
-          persistent-hint
-        >
-        </v-text-field>
-      </v-row>
+        <v-row v-if="horne_ext_profile_selected === 'Self (interpolated)'">
+          <v-text-field
+            label="Interpolation Degree (Y)"
+            type="number"
+            v-model.number=self_prof_interp_degree_y
+            :rules="[() => self_prof_interp_degree_y !== '' || 'This field is required',
+                     () => self_prof_interp_degree_y >0 || 'Y interpolation degree must be be greater than zero']"
+            hint="Interpolation degree (Y) to measure self profile."
+            persistent-hint
+          >
+          </v-text-field>
+        </v-row>
+      </div>
 
       <plugin-add-results
         :label.sync="ext_results_label"