speaker-calibration 2.2.255 → 2.2.257

package/src/tasks/combination/combination.js

@@ -10,6 +10,7 @@ import {
   getCurrentTimeString,
   standardDeviation,
   interpolate,
+  reorderMLS
 } from '../../utils';
 
 import {volumePowerCheck, getPower} from '../../powerCheck';
@@ -363,12 +364,21 @@ class Combination extends AudioCalibrator {
       const reportWebAudioNames = `${this.webAudioDeviceNames.loudspeakerText}<br/> ${this.webAudioDeviceNames.microphoneText}`;
       soundSubtitle.innerHTML = reportWebAudioNames;
     }
+    const simulationEnabled =
+      this.calibrateSoundSimulateMicrophone !== null &&
+      this.calibrateSoundSimulateLoudspeaker !== null;
+
+    const simulateText = simulationEnabled
+      ? `
+      Simulating Loudspeaker: ${this.calibrateSoundSimulateLoudspeakerFileName}, Microphone: ${this.calibrateSoundSimulateMicrophoneFileName}
+    <br>`
+      : '';
 
     const samplingParamText = this.phrases.RC_SamplingHzBits[this.language]
       .replace('111', this.sourceSamplingRate)
       .replace('222', this.sinkSamplingRate)
       .replace('333', this.calibrateSoundSamplingDesiredBits);
-    const reportParameters = `${samplingParamText} ↓${this._calibrateSoundBurstDownsample}:1`;
+    const reportParameters = `${simulateText}${samplingParamText} ↓${this._calibrateSoundBurstDownsample}:1`;
     if (this.flags) {
       flags = `<br> autoGainControl: ${this.flags.autoGainControl}, echoCancellation: ${this.flags.echoCancellation}, noiseSuppression: ${this.flags.noiseSuppression}`;
     }
@@ -760,7 +770,7 @@ class Combination extends AudioCalibrator {
         sampleRate: fMLS,
         binDesiredSec: this._calibrateSoundPowerBinDesiredSec,
         burstSec: this.desired_time_per_mls,
-        repeats: this.numMLSPerCapture - this.num_mls_to_skip,
+        repeats: this._calibrateSoundBurstRepeats,
         warmUp: this._calibrateSoundBurstPreSec,
         downsample: this._calibrateSoundBurstDownsample,
       })
@@ -833,8 +843,9 @@ class Combination extends AudioCalibrator {
             }
             this.recordingChecks['unfiltered'].push(result);
             console.log('start calculate impulse response');
-            const usedPeriodStart = this.num_mls_to_skip * this.sourceSamplingRate;
-            const payload_skipped_warmUp = payload.slice(usedPeriodStart);
+            const usedPeriodStart = this.calibrateSoundBurstPreSec * this.sourceSamplingRate;
+            const usedPeriodEnd = (this.calibrateSoundBurstPreSec + this._calibrateSoundBurstRepeats * this.calibrateSoundBurstBurstSec) * this.sourceSamplingRate;
+            const payload_skipped_warmUp = payload.slice(usedPeriodStart, usedPeriodEnd);
             const payload_skipped_warmUp_downsampled = this.downsampleSignal(
               payload_skipped_warmUp,
               this._calibrateSoundBurstDownsample
@@ -850,7 +861,7 @@ class Combination extends AudioCalibrator {
                 mls: mls,
                 payload: payload_skipped_warmUp_downsampled,
                 sampleRate: fMLS,
-                numPeriods: (this.numMLSPerCapture - this.num_mls_to_skip) / factor,
+                numPeriods: (this._calibrateSoundBurstRepeats) / factor,
                 downsample: this._calibrateSoundBurstDownsample,
               })
               .then(async res => {
@@ -863,7 +874,7 @@ class Combination extends AudioCalibrator {
                     .getImpulseResponse({
                       mls,
                       sampleRate: fMLS,
-                      numPeriods: (this.numMLSPerCapture - this.num_mls_to_skip) / factor,
+                      numPeriods: (this._calibrateSoundBurstRepeats) / factor,
                       sig: payload_skipped_warmUp_downsampled,
                       fs2: this.fs2,
                       L_new_n: this.L_new_n,
@@ -978,7 +989,7 @@ class Combination extends AudioCalibrator {
     let number_of_bursts_to_skip = 0;
     let time_to_sleep = 0;
     if (this.mode === 'unfiltered') {
-      time_to_sleep = (this.#mls[0].length / this.sourceSamplingRate) * number_of_bursts_to_skip;
+      time_to_sleep = this._calibrateSoundBurstPreSec;
     } else if (this.mode === 'filtered') {
       console.log(this.#currentConvolution.length);
       // time_to_sleep =
@@ -1050,15 +1061,16 @@ class Combination extends AudioCalibrator {
    * @example
    */
   #createCalibrationNodeFromBuffer = dataBuffer => {
+    const mlsSignal = reorderMLS(dataBuffer, this.calibrateSound1000HzPreSec, this.sourceSamplingRate);
     console.log('length databuffer');
-    console.log(dataBuffer.length);
+    console.log(mlsSignal.length);
     if (!this.sourceAudioContext) {
       this.makeNewSourceAudioContext();
     }
 
     const buffer = this.sourceAudioContext.createBuffer(
       1, // number of channels
-      dataBuffer.length,
+      mlsSignal.length,
       this.sourceAudioContext.sampleRate // sample rate
     );
 
@@ -1066,8 +1078,8 @@ class Combination extends AudioCalibrator {
 
     // fill the buffer with our data
     try {
-      for (let i = 0; i < dataBuffer.length; i += 1) {
-        data[i] = dataBuffer[i];
+      for (let i = 0; i < mlsSignal.length; i += 1) {
+        data[i] = mlsSignal[i];
       }
     } catch (error) {
       console.error(error);
@@ -2354,9 +2366,13 @@ class Combination extends AudioCalibrator {
       for (var i = 0; i < this.numCaptures; i++) {
         this.icapture = i;
         if (this.isCalibrating) return null;
-
+      // From Denis July 20th, 2025:
+      // Imagine playing the 10 s MLS, repeatedly, forever, and we record part of it. That piece should be
+      //  2.5+10+10+1 second long. To synthesize this, the pre-interval should be the final 2.5 sec of MLS.
+      //  Followed by two whole MLS. Followed by the initial 1 sec of MLS. Again, all the pieces together 
+      // should be one contiguous piece cut out from an infinitely repeating MLS.
         // Get the MLS signal for this capture
-        const mlsSignal = this.#mlsBufferView[this.icapture];
+        const mlsSignal = reorderMLS(this.#mlsBufferView[this.icapture], this.calibrateSound1000HzPreSec, this.sourceSamplingRate);
 
         // Run the simulation
         await this.simulatedMLSCalibration(
@@ -2376,6 +2392,8 @@ class Combination extends AudioCalibrator {
       }
     } else {
       // Use actual recording mode
+      
+      
       for (var i = 0; i < this.numCaptures; i++) {
         this.icapture = i;
         await this.calibrationSteps(
@@ -2419,281 +2437,278 @@ class Combination extends AudioCalibrator {
         iir_ir_and_plots = await this.bothSoundCheck(stream);
         if (this.isCalibrating) return null;
       }
-    
-    // } else {
-    //   let unconv_rec = this.componentInvertedImpulseResponseNoBandpass;
-    //   let conv_rec = this.componentInvertedImpulseResponse;
-    //   if (this.isCalibrating) return null;
-    //   let component_iir_psd = await this.pyServerAPI
-    //     .getPSDWithRetry({
-    //       unconv_rec: this.componentInvertedImpulseResponseNoBandpass,
-    //       conv_rec: this.componentInvertedImpulseResponse,
-    //       sampleRate: fMLS,
-    //       downsample: this._calibrateSoundBurstDownsample,
-    //     })
-    //     .then(res => {
-    //       this.incrementStatusBar();
-    //       this.status = this.generateTemplate(
-    //         `All Hz Calibration: done computing the PSD graphs...`.toString()
-    //       ).toString();
-    //       this.emit('update', {message: this.status});
-    //       return res;
-    //     })
-    //     .catch(err => {
-    //       console.error(err);
-    //     });
-    //   unconv_rec = this.systemInvertedImpulseResponseNoBandpass;
-    //   conv_rec = this.systemInvertedImpulseResponse;
-    //   if (this.isCalibrating) return null;
-    //   let system_iir_psd = await this.pyServerAPI
-    //     .getPSDWithRetry({
-    //       unconv_rec: this.systemInvertedImpulseResponseNoBandpass,
-    //       conv_rec: this.systemInvertedImpulseResponse,
-    //       sampleRate: fMLS,
-    //       downsample: this._calibrateSoundBurstDownsample,
-    //     })
-    //     .then(res => {
-    //       this.incrementStatusBar();
-    //       this.status = this.generateTemplate(
-    //         `All Hz Calibration: done computing the PSD graphs...`.toString()
-    //       ).toString();
-    //       this.emit('update', {message: this.status});
-    //       return res;
-    //     })
-    //     .catch(err => {
-    //       console.error(err);
-    //     });
-
-    //   let gainValue = this.getGainDBSPL();
-    //   let return_unconv_rec = unconv_rec;
-    //   let return_conv_rec   = conv_rec;
-    //   iir_ir_and_plots = {
-    //     unfiltered_recording: return_unconv_rec,
-    //     filtered_recording: return_conv_rec,
-    //     system: {
-    //       iir: this.systemInvertedImpulseResponse,
-    //       iir_no_bandpass: this.systemInvertedImpulseResponseNoBandpass,
-    //       ir: this.systemIR,
-    //       iir_psd: {
-    //         y: system_iir_psd['y_conv'],
-    //         x: system_iir_psd['y_conv'],
-    //         y_no_bandpass: system_iir_psd['y_unconv'],
-    //         x_no_bandpass: system_iir_psd['x_unconv'],
-    //       },
-    //       filtered_recording: [],
-    //       convolution: this.systemConvolution,
-    //       convolutionNoBandpass: this.systemConvolutionNoBandpass,
-    //       psd: {
-    //         unconv: {
-    //           x: [],
-    //           y: [],
-    //         },
-    //         conv: {
-    //           x: [],
-    //           y: [],
-    //         },
-    //       },
-    //     },
-    //     component: {
-    //       iir: this.componentInvertedImpulseResponse,
-    //       iir_no_bandpass: this.componentInvertedImpulseResponseNoBandpass,
-    //       ir: this.componentIR,
-    //       ir_in_time_domain: this.componentIRInTimeDomain,
-    //       iir_psd: {
-    //         y: component_iir_psd['y_conv'],
-    //         x: component_iir_psd['x_conv'],
-    //         y_no_bandpass: component_iir_psd['y_unconv'],
-    //         x_no_bandpass: component_iir_psd['x_unconv'],
-    //       },
-    //       convolution: this.componentConvolution,
-    //       convolutionNoBandpass: this.componentConvolutionNoBandpass,
-    //       psd: {
-    //         unconv: {
-    //           x: [],
-    //           y: [],
-    //         },
-    //         conv: {
-    //           x: [],
-    //           y: [],
-    //         },
-    //       },
-    //       gainDBSPL: gainValue,
-    //     },
-    //     mls: this.#mlsBufferView,
-    //     autocorrelations: this.autocorrelations,
-    //     impulseResponses: [],
-    //   };
-    //   if (this.isCalibrating) return null;
-    //   await Promise.all(this.impulseResponses).then(res => {
-    //     for (let i = 0; i < res.length; i++) {
-    //       if (res[i] != undefined) {
-    //         iir_ir_and_plots['impulseResponses'].push(res[i]);
-    //       }
-    //     }
-    //   });
 
-    //   if (this.#download) {
-    //     saveToCSV(this.#mls, 'MLS.csv');
-    //     saveToCSV(this.componentConvolution, 'python_component_convolution_mls_iir.csv');
-    //     saveToCSV(this.systemConvolution, 'python_system_convolution_mls_iir.csv');
-    //     saveToCSV(this.componentInvertedImpulseResponse, 'componentIIR.csv');
-    //     saveToCSV(this.systemInvertedImpulseResponse, 'systemIIR.csv');
-    //     for (let i = 0; i < this.autocorrelations.length; i++) {
-    //       saveToCSV(this.autocorrelations[i], `autocorrelation_${i}`);
-    //     }
-    //     const computedIRagain = await Promise.all(this.impulseResponses).then(res => {
-    //       for (let i = 0; i < res.length; i++) {
-    //         if (res[i] != undefined) {
-    //           saveToCSV(res[i], `IR_${i}`);
-    //         }
-    //       }
-    //     });
-    //   }
-    // }
-  } else {
-    
-    let unconv_rec = this.componentInvertedImpulseResponseNoBandpass;
-    let conv_rec   = this.componentInvertedImpulseResponse;
-  
-  
-    let return_unconv_rec = unconv_rec;
-    let return_conv_rec   = conv_rec;
-  
-    const fMLS = this.sourceSamplingRate / this._calibrateSoundBurstDownsample;
-  
-   
-    this.addTimeStamp('Compute spectrum of component IIR and component IIR no band pass');
-    if (this.isCalibrating) return null;
-    let component_iir_psd = await this.pyServerAPI.getPSDWithRetry({
-      unconv_rec: this.componentInvertedImpulseResponseNoBandpass,
-      conv_rec:   this.componentInvertedImpulseResponse,
-      sampleRate: fMLS,
-      downsample: this._calibrateSoundBurstDownsample,
-    })
-    .then(res => {
-      this.incrementStatusBar();
-      this.status = this.generateTemplate(`All Hz Calibration: done computing the PSD graphs...`).toString();
-      this.emit('update', { message: this.status });
-      return res;
-    })
-    .catch(err => {
-      console.error(err);
-    });
-  
-   
-    this.addTimeStamp('Compute spectrum of speaker+mic IIR and speaker+mic IIR no band pass');
-    if (this.isCalibrating) return null;
-    let system_iir_psd = await this.pyServerAPI.getPSDWithRetry({
-      unconv_rec: this.systemInvertedImpulseResponseNoBandpass,
-      conv_rec:   this.systemInvertedImpulseResponse,
-      sampleRate: fMLS,
-      downsample: this._calibrateSoundBurstDownsample,
-    })
-    .then(res => {
-      this.incrementStatusBar();
-      this.status = this.generateTemplate(`All Hz Calibration: done computing the PSD graphs...`).toString();
-      this.emit('update', { message: this.status });
-      return res;
-    })
-    .catch(err => {
-      console.error(err);
-    });
-  
-    
-    let gainValue = this.getGainDBSPL();
-  
-    
-    iir_ir_and_plots = {
-      unfiltered_recording: return_unconv_rec,
-      filtered_recording:   return_conv_rec,
-  
-      system: {
-        iir:                  this.systemInvertedImpulseResponse,
-        iir_no_bandpass:      this.systemInvertedImpulseResponseNoBandpass,
-        ir:                   this.systemIR,
-        iir_psd: {
-          y:                 system_iir_psd['y_conv'],
-          x:                 system_iir_psd['x_conv'],
-          y_no_bandpass:     system_iir_psd['y_unconv'],
-          x_no_bandpass:     system_iir_psd['x_unconv'],
-        },
-       
-        filtered_mls_psd:         {},
-        filtered_no_bandpass_mls_psd: {},
-        convolution:              this.systemConvolution,
-        convolutionNoBandpass:    this.systemConvolutionNoBandpass,
-        psd: {
-          unconv: { x: [], y: [] },
-          conv:   { x: [], y: [] },
-        },
-      },
-  
-      component: {
-        iir:                  this.componentInvertedImpulseResponse,
-        iir_no_bandpass:      this.componentInvertedImpulseResponseNoBandpass,
-        ir:                   this.componentIR,
-        ir_origin:            this.componentIROrigin,
-        ir_in_time_domain:    this.componentIRInTimeDomain,
-        iir_psd: {
-          y:                 component_iir_psd['y_conv'],
-          x:                 component_iir_psd['x_conv'],
-          y_no_bandpass:     component_iir_psd['y_unconv'],
-          x_no_bandpass:     component_iir_psd['x_unconv'],
+      // } else {
+      //   let unconv_rec = this.componentInvertedImpulseResponseNoBandpass;
+      //   let conv_rec = this.componentInvertedImpulseResponse;
+      //   if (this.isCalibrating) return null;
+      //   let component_iir_psd = await this.pyServerAPI
+      //     .getPSDWithRetry({
+      //       unconv_rec: this.componentInvertedImpulseResponseNoBandpass,
+      //       conv_rec: this.componentInvertedImpulseResponse,
+      //       sampleRate: fMLS,
+      //       downsample: this._calibrateSoundBurstDownsample,
+      //     })
+      //     .then(res => {
+      //       this.incrementStatusBar();
+      //       this.status = this.generateTemplate(
+      //         `All Hz Calibration: done computing the PSD graphs...`.toString()
+      //       ).toString();
+      //       this.emit('update', {message: this.status});
+      //       return res;
+      //     })
+      //     .catch(err => {
+      //       console.error(err);
+      //     });
+      //   unconv_rec = this.systemInvertedImpulseResponseNoBandpass;
+      //   conv_rec = this.systemInvertedImpulseResponse;
+      //   if (this.isCalibrating) return null;
+      //   let system_iir_psd = await this.pyServerAPI
+      //     .getPSDWithRetry({
+      //       unconv_rec: this.systemInvertedImpulseResponseNoBandpass,
+      //       conv_rec: this.systemInvertedImpulseResponse,
+      //       sampleRate: fMLS,
+      //       downsample: this._calibrateSoundBurstDownsample,
+      //     })
+      //     .then(res => {
+      //       this.incrementStatusBar();
+      //       this.status = this.generateTemplate(
+      //         `All Hz Calibration: done computing the PSD graphs...`.toString()
+      //       ).toString();
+      //       this.emit('update', {message: this.status});
+      //       return res;
+      //     })
+      //     .catch(err => {
+      //       console.error(err);
+      //     });
+
+      //   let gainValue = this.getGainDBSPL();
+      //   let return_unconv_rec = unconv_rec;
+      //   let return_conv_rec   = conv_rec;
+      //   iir_ir_and_plots = {
+      //     unfiltered_recording: return_unconv_rec,
+      //     filtered_recording: return_conv_rec,
+      //     system: {
+      //       iir: this.systemInvertedImpulseResponse,
+      //       iir_no_bandpass: this.systemInvertedImpulseResponseNoBandpass,
+      //       ir: this.systemIR,
+      //       iir_psd: {
+      //         y: system_iir_psd['y_conv'],
+      //         x: system_iir_psd['y_conv'],
+      //         y_no_bandpass: system_iir_psd['y_unconv'],
+      //         x_no_bandpass: system_iir_psd['x_unconv'],
+      //       },
+      //       filtered_recording: [],
+      //       convolution: this.systemConvolution,
+      //       convolutionNoBandpass: this.systemConvolutionNoBandpass,
+      //       psd: {
+      //         unconv: {
+      //           x: [],
+      //           y: [],
+      //         },
+      //         conv: {
+      //           x: [],
+      //           y: [],
+      //         },
+      //       },
+      //     },
+      //     component: {
+      //       iir: this.componentInvertedImpulseResponse,
+      //       iir_no_bandpass: this.componentInvertedImpulseResponseNoBandpass,
+      //       ir: this.componentIR,
+      //       ir_in_time_domain: this.componentIRInTimeDomain,
+      //       iir_psd: {
+      //         y: component_iir_psd['y_conv'],
+      //         x: component_iir_psd['x_conv'],
+      //         y_no_bandpass: component_iir_psd['y_unconv'],
+      //         x_no_bandpass: component_iir_psd['x_unconv'],
+      //       },
+      //       convolution: this.componentConvolution,
+      //       convolutionNoBandpass: this.componentConvolutionNoBandpass,
+      //       psd: {
+      //         unconv: {
+      //           x: [],
+      //           y: [],
+      //         },
+      //         conv: {
+      //           x: [],
+      //           y: [],
+      //         },
+      //       },
+      //       gainDBSPL: gainValue,
+      //     },
+      //     mls: this.#mlsBufferView,
+      //     autocorrelations: this.autocorrelations,
+      //     impulseResponses: [],
+      //   };
+      //   if (this.isCalibrating) return null;
+      //   await Promise.all(this.impulseResponses).then(res => {
+      //     for (let i = 0; i < res.length; i++) {
+      //       if (res[i] != undefined) {
+      //         iir_ir_and_plots['impulseResponses'].push(res[i]);
+      //       }
+      //     }
+      //   });
+
+      //   if (this.#download) {
+      //     saveToCSV(this.#mls, 'MLS.csv');
+      //     saveToCSV(this.componentConvolution, 'python_component_convolution_mls_iir.csv');
+      //     saveToCSV(this.systemConvolution, 'python_system_convolution_mls_iir.csv');
+      //     saveToCSV(this.componentInvertedImpulseResponse, 'componentIIR.csv');
+      //     saveToCSV(this.systemInvertedImpulseResponse, 'systemIIR.csv');
+      //     for (let i = 0; i < this.autocorrelations.length; i++) {
+      //       saveToCSV(this.autocorrelations[i], `autocorrelation_${i}`);
+      //     }
+      //     const computedIRagain = await Promise.all(this.impulseResponses).then(res => {
+      //       for (let i = 0; i < res.length; i++) {
+      //         if (res[i] != undefined) {
+      //           saveToCSV(res[i], `IR_${i}`);
+      //         }
+      //       }
+      //     });
+      //   }
+      // }
+    } else {
+      let unconv_rec = this.componentInvertedImpulseResponseNoBandpass;
+      let conv_rec = this.componentInvertedImpulseResponse;
+
+      let return_unconv_rec = unconv_rec;
+      let return_conv_rec = conv_rec;
+
+      const fMLS = this.sourceSamplingRate / this._calibrateSoundBurstDownsample;
+
+      this.addTimeStamp('Compute spectrum of component IIR and component IIR no band pass');
+      if (this.isCalibrating) return null;
+      let component_iir_psd = await this.pyServerAPI
+        .getPSDWithRetry({
+          unconv_rec: this.componentInvertedImpulseResponseNoBandpass,
+          conv_rec: this.componentInvertedImpulseResponse,
+          sampleRate: fMLS,
+          downsample: this._calibrateSoundBurstDownsample,
+        })
+        .then(res => {
+          this.incrementStatusBar();
+          this.status = this.generateTemplate(
+            `All Hz Calibration: done computing the PSD graphs...`
+          ).toString();
+          this.emit('update', {message: this.status});
+          return res;
+        })
+        .catch(err => {
+          console.error(err);
+        });
+
+      this.addTimeStamp('Compute spectrum of speaker+mic IIR and speaker+mic IIR no band pass');
+      if (this.isCalibrating) return null;
+      let system_iir_psd = await this.pyServerAPI
+        .getPSDWithRetry({
+          unconv_rec: this.systemInvertedImpulseResponseNoBandpass,
+          conv_rec: this.systemInvertedImpulseResponse,
+          sampleRate: fMLS,
+          downsample: this._calibrateSoundBurstDownsample,
+        })
+        .then(res => {
+          this.incrementStatusBar();
+          this.status = this.generateTemplate(
+            `All Hz Calibration: done computing the PSD graphs...`
+          ).toString();
+          this.emit('update', {message: this.status});
+          return res;
+        })
+        .catch(err => {
+          console.error(err);
+        });
+
+      let gainValue = this.getGainDBSPL();
+
+      iir_ir_and_plots = {
+        unfiltered_recording: return_unconv_rec,
+        filtered_recording: return_conv_rec,
+
+        system: {
+          iir: this.systemInvertedImpulseResponse,
+          iir_no_bandpass: this.systemInvertedImpulseResponseNoBandpass,
+          ir: this.systemIR,
+          iir_psd: {
+            y: system_iir_psd['y_conv'],
+            x: system_iir_psd['x_conv'],
+            y_no_bandpass: system_iir_psd['y_unconv'],
+            x_no_bandpass: system_iir_psd['x_unconv'],
+          },
+
+          filtered_mls_psd: {},
+          filtered_no_bandpass_mls_psd: {},
+          convolution: this.systemConvolution,
+          convolutionNoBandpass: this.systemConvolutionNoBandpass,
+          psd: {
+            unconv: {x: [], y: []},
+            conv: {x: [], y: []},
+          },
         },
-       
-        filtered_mls_psd:         {},
-        filtered_no_bandpass_mls_psd: {},
-        convolution:              this.componentConvolution,
-        convolutionNoBandpass:    this.componentConvolutionNoBandpass,
-        psd: {
-          unconv: { x: [], y: [] },
-          conv:   { x: [], y: [] },
+
+        component: {
+          iir: this.componentInvertedImpulseResponse,
+          iir_no_bandpass: this.componentInvertedImpulseResponseNoBandpass,
+          ir: this.componentIR,
+          ir_origin: this.componentIROrigin,
+          ir_in_time_domain: this.componentIRInTimeDomain,
+          iir_psd: {
+            y: component_iir_psd['y_conv'],
+            x: component_iir_psd['x_conv'],
+            y_no_bandpass: component_iir_psd['y_unconv'],
+            x_no_bandpass: component_iir_psd['x_unconv'],
+          },
+
+          filtered_mls_psd: {},
+          filtered_no_bandpass_mls_psd: {},
+          convolution: this.componentConvolution,
+          convolutionNoBandpass: this.componentConvolutionNoBandpass,
+          psd: {
+            unconv: {x: [], y: []},
+            conv: {x: [], y: []},
+          },
+          gainDBSPL: gainValue,
         },
-        gainDBSPL:  gainValue,
-      },
-  
-      mls:               this.#mlsBufferView,
-      autocorrelations:  this.autocorrelations,
-      impulseResponses:  [], // filled below
-    };
-  
-    
-    if (this.isCalibrating) return null;
-    await Promise.all(this.impulseResponses).then(resArray => {
-      for (let i = 0; i < resArray.length; i++) {
-        if (resArray[i] != undefined) {
-          iir_ir_and_plots.impulseResponses.push(resArray[i]);
-        }
-      }
-    });
-  
-    
-    if (this.#download) {
-      saveToCSV(this.#mls, 'MLS.csv');
-      saveToCSV(this.componentConvolution, 'python_component_convolution_mls_iir.csv');
-      saveToCSV(this.systemConvolution, 'python_system_convolution_mls_iir.csv');
-      saveToCSV(this.componentInvertedImpulseResponse, 'componentIIR.csv');
-      saveToCSV(this.systemInvertedImpulseResponse, 'systemIIR.csv');
-      for (let i = 0; i < this.autocorrelations.length; i++) {
-        saveToCSV(this.autocorrelations[i], `autocorrelation_${i}`);
-      }
+
+        mls: this.#mlsBufferView,
+        autocorrelations: this.autocorrelations,
+        impulseResponses: [], // filled below
+      };
+
+      if (this.isCalibrating) return null;
       await Promise.all(this.impulseResponses).then(resArray => {
         for (let i = 0; i < resArray.length; i++) {
           if (resArray[i] != undefined) {
-            saveToCSV(resArray[i], `IR_${i}`);
+            iir_ir_and_plots.impulseResponses.push(resArray[i]);
           }
         }
       });
+
+      if (this.#download) {
+        saveToCSV(this.#mls, 'MLS.csv');
+        saveToCSV(this.componentConvolution, 'python_component_convolution_mls_iir.csv');
+        saveToCSV(this.systemConvolution, 'python_system_convolution_mls_iir.csv');
+        saveToCSV(this.componentInvertedImpulseResponse, 'componentIIR.csv');
+        saveToCSV(this.systemInvertedImpulseResponse, 'systemIIR.csv');
+        for (let i = 0; i < this.autocorrelations.length; i++) {
+          saveToCSV(this.autocorrelations[i], `autocorrelation_${i}`);
+        }
+        await Promise.all(this.impulseResponses).then(resArray => {
+          for (let i = 0; i < resArray.length; i++) {
+            if (resArray[i] != undefined) {
+              saveToCSV(resArray[i], `IR_${i}`);
+            }
+          }
+        });
+      }
     }
-  }
     if (this.isCalibrating) return null;
     this.percent_complete = 100;
     this.status = this.generateTemplate(`All Hz Calibration: Finished`.toString()).toString();
     this.addTimeStamp('Done');
     this.emit('update', {message: this.status});
 
-   
-    console.log("irr_ir_and_plots for none: ", iir_ir_and_plots);
+    console.log('irr_ir_and_plots for none: ', iir_ir_and_plots);
     return iir_ir_and_plots;
   };
 
@@ -3338,7 +3353,7 @@ class Combination extends AudioCalibrator {
         sampleRate: fMLS,
         binDesiredSec: this._calibrateSoundPowerBinDesiredSec,
         burstSec: this.desired_time_per_mls,
-        repeats: this.numMLSPerCapture - this.num_mls_to_skip,
+        repeats: this._calibrateSoundBurstRepeats,
         warmUp: this._calibrateSoundBurstPreSec,
         downsample: this._calibrateSoundBurstDownsample,
       })
@@ -3475,6 +3490,8 @@ class Combination extends AudioCalibrator {
     calibrateSoundSimulateLoudspeakerFrequencies = null,
     calibrateSoundSimulateMicrophoneType = 'impulseResponse',
     calibrateSoundSimulateLoudspeakerType = 'impulseResponse',
+    calibrateSoundSimulateMicrophoneFileName = null,
+    calibrateSoundSimulateLoudspeakerFileName = null,
     isLoudspeakerCalibration = true
   ) => {
     this._calibrateSoundBurstDownsample = calibrateSoundBurstDownsample;
@@ -3498,6 +3515,8 @@ class Combination extends AudioCalibrator {
     // Set simulation impulse responses
     this.calibrateSoundSimulateMicrophone = calibrateSoundSimulateMicrophone;
     this.calibrateSoundSimulateLoudspeaker = calibrateSoundSimulateLoudspeaker;
+    this.calibrateSoundSimulateMicrophoneFileName = calibrateSoundSimulateMicrophoneFileName;
+    this.calibrateSoundSimulateLoudspeakerFileName = calibrateSoundSimulateLoudspeakerFileName;
 
     const fMLS = this.sourceSamplingRate / this._calibrateSoundBurstDownsample;
     this.iirLength = Math.floor(_calibrateSoundIIRSec * fMLS);
@@ -3650,6 +3669,7 @@ class Combination extends AudioCalibrator {
           };
           this.componentGainDBSPL = frequencyResponse.gain_at_1000hz;
           lCalib = this.componentGainDBSPL;
+          micInfo['gainDBSPL'] = lCalib;
         }
       } else {
         const impulseResponse = await this.pyServerAPI.getImpulseResponseFromFrequencyResponse({
@@ -3668,6 +3688,7 @@ class Combination extends AudioCalibrator {
           };
           this.componentGainDBSPL = impulseResponse.gain_at_1000hz;
           lCalib = this.componentGainDBSPL;
+          micInfo['gainDBSPL'] = lCalib;
         }
         this.simulatedMicrophoneIR = {
           Freq: impulseResponse.frequencies,