diff --git a/static/js/components/instrumentconfig.vue b/static/js/components/instrumentconfig.vue
index 6bd49306..628e6668 100644
--- a/static/js/components/instrumentconfig.vue
+++ b/static/js/components/instrumentconfig.vue
@@ -66,9 +66,15 @@
v-if="suggestedLampFlatSlitExposureTime"
>
Suggested exposure time for a Lamp Flat with
- slit {{ instrumentconfig.optical_elements.slit }}
+ slit {{ instrumentconfig.optical_elements.slit }} and readout mode {{ instrumentconfig.mode }}
is {{ suggestedLampFlatSlitExposureTime }} seconds
-
+
+
+ Suggested exposure time for an Arc is {{ suggestedArcExposureTime }} seconds
+
import _ from 'lodash';
-import { collapseMixin, slitWidthToExposureTime } from '../utils.js';
+import { collapseMixin, lampFlatDefaultExposureTime, arcDefaultExposureTime } from '../utils.js';
import customfield from './util/customfield.vue';
import customselect from './util/customselect.vue';
import panel from './util/panel.vue';
@@ -273,8 +279,16 @@ export default {
// Update on optical element updates
this.opticalElementUpdates;
let slitWidth = this.instrumentconfig.optical_elements.slit;
- if (this.configurationType === 'LAMP_FLAT' && slitWidth) {
- return slitWidthToExposureTime(slitWidth);
+ let readoutMode = this.instrumentconfig.mode;
+ if (this.configurationType === 'LAMP_FLAT' && slitWidth && readoutMode && this.selectedinstrument) {
+ return lampFlatDefaultExposureTime(slitWidth, this.selectedinstrument, readoutMode);
+ } else {
+ return undefined;
+ }
+ },
+ suggestedArcExposureTime: function() {
+ if (this.configurationType === 'ARC' && this.selectedinstrument) {
+ return arcDefaultExposureTime(this.selectedinstrument);
} else {
return undefined;
}
diff --git a/static/js/components/request.vue b/static/js/components/request.vue
index 725ab4a3..45a282b0 100644
--- a/static/js/components/request.vue
+++ b/static/js/components/request.vue
@@ -93,7 +93,7 @@