Change Noise Generation, Fix Find Peaks

app.py

@@ -10,7 +10,7 @@
     generate_spectrum,
     process_background,
     process_spectrum,
-    find_peaks,
+    find_peaks
 )
 from functions import param_check
 
@@ -73,7 +73,7 @@ def background():
                 "success": False,
                 "text": "Parameter check failed",
             }
-    
+
         # perform:
         #   --> transmission spectrum of gas sample (calc_spectrum)
         spectrum, error, message = generate_spectrum(data)
@@ -82,7 +82,7 @@ def background():
                 "success": False,
                 "text": message,
             }
-    
+
         # perform:
         #   --> set all y-values to one
         try:
@@ -121,7 +121,7 @@ def background():
 
 
 @app.route("/find_peaks", methods=["POST"])
-def find_peaks():
+def handle_peaks():
     data = json.loads(request.data)
 
     peaks = find_peaks(

functions.py

@@ -349,10 +349,13 @@ def multiscan(spectrum, num_scans):
     # how many maximized iterations
     groups = num_scans // scans_per_group
 
+    low = 0
+    high = 0.05
+
     for _ in range(groups):
         spectrum = add_array(
             spectrum,
-            sum(np.random.normal(0, 800000000, (scans_per_group, len(w)))) / num_scans,
+            sum(np.random.uniform(low, high, (scans_per_group, len(w)))) / num_scans,
             var="transmittance_noslit",
         )
 
@@ -363,7 +366,7 @@ def multiscan(spectrum, num_scans):
         diff = num_scans - (scans_per_group * groups)
         spectrum = add_array(
             spectrum,
-            sum(np.random.normal(0, 800000000, (diff, len(w)))) / num_scans,
+            sum(np.random.uniform(low, high, (diff, len(w)))) / num_scans,
             var="transmittance_noslit",
         ) 
 
@@ -433,7 +436,7 @@ def get_component_spectra(w, source_temp):
         units={"transmittance_noslit": ""},
         name="MCT",
     )
-    # spec_MCT.normalize(normalize_how="mean", inplace=True, force=True)
+    spec_MCT.normalize(normalize_how="mean", inplace=True, force=True)
 
     # processing for indium antimonide (InSb) detector
     spec_InSb = Spectrum(
@@ -442,6 +445,7 @@ def get_component_spectra(w, source_temp):
         units={"transmittance_noslit": ""},
         name="InSb",
     )
-    # spec_InSb.normalize(normalize_how="mean", inplace=True, force=True)
+    spec_InSb.normalize(normalize_how="mean", inplace=True, force=True)
+
     return (spec_sPlanck, spec_AR_ZnSe, spec_AR_CaF2, spec_CaF2, spec_ZnSe, 
             spec_sapphire, spec_MCT, spec_InSb)

processing.py

@@ -67,11 +67,9 @@ def process_spectrum(params, raw_spectrum):
     match params["detector"]:
         case "MCT":
             spec_MCT = multiscan(spec_MCT, params["scan"])
-            spec_MCT.normalize(normalize_how="mean", inplace=True, force=True)
             slabs.extend([spec_ZnSe, spec_MCT])
         case "InSb":
             spec_InSb = multiscan(spec_InSb, params["scan"])
-            spec_InSb.normalize(normalize_how="mean", inplace=True, force=True)
             slabs.extend([spec_sapphire, spec_InSb])
 
     # SerialSlabs() multiplies the transmittance values (y-values) of the selected spectra