Add some checks

observatorycontrolsystem · Aug 7, 2019 · b0295fa · b0295fa
1 parent 2de64fa
commit b0295fa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/static/js/components/instrumentconfig.vue b/static/js/components/instrumentconfig.vue
@@ -280,14 +280,14 @@ export default {
       this.opticalElementUpdates;
       let slitWidth = this.instrumentconfig.optical_elements.slit;
       let readoutMode = this.instrumentconfig.mode;
-      if (this.configurationType === 'LAMP_FLAT' && slitWidth) {
+      if (this.configurationType === 'LAMP_FLAT' && slitWidth && readoutMode && this.selectedinstrument) {
         return lampFlatDefaultExposureTime(slitWidth, this.selectedinstrument, readoutMode);
       } else {
         return undefined;
       }
     },
     suggestedArcExposureTime: function() {
-      if (this.configurationType === 'ARC') {
+      if (this.configurationType === 'ARC' && this.selectedinstrument) {
         return arcDefaultExposureTime(this.selectedinstrument);
       } else {
         return undefined;

diff --git a/static/js/utils.js b/static/js/utils.js
@@ -4,11 +4,13 @@ import $ from 'jquery';
 
 
 function isSoarInstrument(instrumentType) {
-  return _.lowerCase(instrumentType).includes('soar');
+  return _.toLower(instrumentType).includes('soar');
 }
 
-function lampFlatDefaultExposureTime(slitWidth, instrumentType, readoutMode){
+function lampFlatDefaultExposureTime(slitWidth, instrumentType, readoutMode) {
   // Lamp flats are affected by the slit width, so exposure time needs to scale with it
+  readoutMode = _.toLower(readoutMode);
+  slitWidth = _.toLower(slitWidth);
   if (isSoarInstrument(instrumentType)) {
     if (readoutMode.includes('400m1')) {
       return 3;
@@ -32,15 +34,14 @@ function lampFlatDefaultExposureTime(slitWidth, instrumentType, readoutMode){
   return 60;
 }
 
-function arcDefaultExposureTime(instrumentType){
+function arcDefaultExposureTime(instrumentType) {
   if (isSoarInstrument(instrumentType)) {
     return 0.5;
   } else {
     return 60;
   }
 }
 
-
 function semesterStart(datetime){
   if(datetime.month() < 3 ){
     return datetime.subtract(1, 'years').month(9).date(1);