Merge pull request #618 from arunavabasu-03/slit_bug

remove the mode bug

frontend/src/components/CalcSpectrum.tsx

@@ -116,19 +116,25 @@ export const CalcSpectrum: React.FC = () => {
           .max(30, "Simulate slit must be less than 30"),
       }),
   });
-  const { control, handleSubmit, setValue, watch, formState } =
-    useForm<FormValues>({
-      defaultValues: { species: [{ molecule: "CO", mole_fraction: 0.1 }] },
-      resolver: yupResolver(Schema),
-    });
+  const { control, handleSubmit, setValue, watch } = useForm<FormValues>({
+    defaultValues: { species: [{ molecule: "CO", mole_fraction: 0.1 }] },
+    resolver: yupResolver(Schema),
+  });
 
-  console.log(formState?.errors);
   const handleBadResponse = (message: string) => {
     setCalcSpectrumResponse(undefined);
     setError(message);
   };
   const onSubmit = async (data: FormValues): Promise<void> => {
-    console.log(data);
+    if (useSlit == true) {
+      if (data.mode === "radiance_noslit") {
+        data.mode = "radiance";
+      }
+      if (data.mode === "transmittance_noslit") {
+        data.mode = "transmittance";
+      }
+    }
+
     setLoading(true);
     setError(undefined);
     setPlotData({
@@ -160,6 +166,7 @@ export const CalcSpectrum: React.FC = () => {
   };
   const databaseWatch = watch("database");
   const modeWatch = watch("mode");
+
   React.useEffect(() => {
     if (databaseWatch === "geisa") {
       setUseGesia(true);

frontend/src/components/CalcSpectrumPlot.tsx

@@ -24,9 +24,9 @@ const CalcSpectrumPlot_ = ({
   if (mode === "absorbance") {
     modeLabel = "Absorbance";
     data.units = "-ln(I/I0)";
-  } else if (mode === "transmittance_noslit") {
+  } else if (mode.startsWith("transmittance")) {
     modeLabel = "Transmittance";
-  } else if (mode === "radiance_noslit") {
+  } else if (mode.startsWith("radiance")) {
     modeLabel = "Radiance";
   } else {
     throw new Error("Invalid mode");

server/main.py

@@ -32,7 +32,7 @@ class Payload(BaseModel):
     trot: Optional[float] = None
     path_length: float
     simulate_slit: Optional[int] = None
-    mode: Literal["absorbance", "transmittance_noslit", "radiance_noslit"]
+    mode: Literal["absorbance", "transmittance_noslit", "radiance_noslit", "transmittance", "radiance"]
     database: Literal["hitran", "geisa"]
     use_simulate_slit: bool = False