Merge branch 'main' into fix/validate_bias_source_limit

Author: pavannarayana

kic-script-gen/src/back_end/client_server.rs

@@ -368,6 +368,32 @@ pub async fn start(mut script_model: ScriptModel) -> anyhow::Result<()> {
                 if let Some(session) = session.as_mut() {
                     session.text(response).await.unwrap();
                 }
+            } else if trimmed_line.contains("lineFrequency") {
+                println!("line frequency received {}", trimmed_line);
+                match serde_json::from_str::<serde_json::Value>(trimmed_line) {
+                    Ok(json_obj) => {
+                        if let Some(freq) = json_obj.get("lineFrequency").and_then(|v| v.as_f64()) {
+                            let mut data_model = app_state.data_model.lock().await;
+                            data_model
+                                .sweep_model
+                                .sweep_config
+                                .global_parameters
+                                .set_line_frequency(freq);
+                            println!("Set line frequency to {}", freq);
+                        } else {
+                            println!(
+                                "'lineFrequency' key not found or not a number in JSON: {}",
+                                trimmed_line
+                            );
+                        }
+                    }
+                    Err(e) => {
+                        println!(
+                            "Failed to parse line frequency JSON: {} | Error: {}",
+                            trimmed_line, e
+                        );
+                    }
+                }
             } else if trimmed_line.contains("refresh") {
                 println!("instrument data requested"); // refreshing by initiating session again does not affect the JSON state
             } else if trimmed_line.contains("reset") {

script-gen-manager/src/model/sweep_data/global_parameters.rs

@@ -2,19 +2,37 @@ use serde::{Deserialize, Serialize};
 
 use super::sweep_timing_config::SweepTimingConfig;
 
+fn default_overhead_time() -> f64 {
+    78e-6
+}
+
 #[derive(Serialize, Deserialize, Debug, Clone)]
+#[serde(default)]
 pub struct GlobalParameters {
     pub sweep_timing_config: SweepTimingConfig,
+    pub line_frequency: f64,
+    #[serde(default = "default_overhead_time")]
+    pub overhead_time: f64,
 }
 
-impl GlobalParameters {
-    pub fn new() -> Self {
+impl Default for GlobalParameters {
+    fn default() -> Self {
         GlobalParameters {
             sweep_timing_config: SweepTimingConfig::new(),
+            line_frequency: 60.0,
+            overhead_time: 78e-6,
         }
     }
+}
 
+impl GlobalParameters {
+    pub fn new() -> Self {
+        GlobalParameters::default()
+    }
     pub fn evaluate(&mut self) {
         self.sweep_timing_config.evaluate();
     }
+    pub fn set_line_frequency(&mut self, frequency: f64) {
+        self.line_frequency = frequency;
+    }
 }

script-gen-manager/src/model/sweep_data/sweep_timing_config.rs

@@ -139,12 +139,16 @@ impl SmuTiming {
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct PsuTiming {
     rate: ParameterString,
+    rate_normal: f64,
+    rate_fast: f64,
 }
 
 impl PsuTiming {
     pub fn new() -> Self {
         let mut psu_timing = PsuTiming {
             rate: ParameterString::new("rate"),
+            rate_normal: 0.066667,
+            rate_fast: 0.016667,
         };
         psu_timing.set_defaults();
         psu_timing

script-gen-ui/src/app/components/main-sweep/main-sweep.component.html

@@ -362,6 +362,8 @@ <h3>Sweep</h3>
       [sweepChannels]="sweepChannels"
       [stepGlobalParameters]="stepGlobalParameters"
       [sweepGlobalParameters]="sweepGlobalParameters"
+      [sweepTimingConfig]="sweepTimingConfig"
+      [globalParameters]="globalParameters"
       [colorMap]="colorMap"
       [activeComponent]="activeComponent"
       [activeIndex]="activeIndex"

script-gen-ui/src/app/components/main-sweep/main-sweep.component.ts

@@ -12,7 +12,7 @@ import { BiasComponent } from './bias/bias.component';
 import { StepComponent } from './step/step.component';
 import { SweepComponent } from './sweep/sweep.component';
 import { WebSocketService } from '../../websocket.service';
-import { SweepConfig } from '../../model/sweep_data/sweepConfig';
+import { GlobalParameters, SweepConfig } from '../../model/sweep_data/sweepConfig';
 import {
   ParameterFloat,
   ParameterInt,
@@ -109,6 +109,7 @@ export class MainSweepComponent implements OnChanges {
   showPopupBox = false;
   showTiming = false;
   sweepTimingConfig: SweepTimingConfig | undefined;
+  globalParameters: GlobalParameters | undefined;
   showList = false; //Sweep list popup box
   deviceList: Device[] = [];
   showBiasTooltip = false;
@@ -223,12 +224,14 @@ export class MainSweepComponent implements OnChanges {
     if (this.sweepConfig) {
       this.sweepTimingConfig =
         this.sweepConfig.global_parameters.sweep_timing_config;
+
       this.deviceList = this.sweepConfig.device_list;
       this.biasChannels = this.sweepConfig.bias_channels;
       this.stepChannels = this.sweepConfig.step_channels;
       this.sweepChannels = this.sweepConfig.sweep_channels;
       this.stepGlobalParameters = this.sweepConfig.step_global_parameters;
       this.sweepGlobalParameters = this.sweepConfig.sweep_global_parameters;
+      this.globalParameters = this.sweepConfig.global_parameters;
 
       this.sweepPoints = this.sweepGlobalParameters.sweep_points;
       this.isListSweep = this.sweepGlobalParameters.list_sweep;

script-gen-ui/src/app/components/main-sweep/plot-container/plot-bias/plot-bias.component.ts

@@ -32,13 +32,13 @@ import { StepGlobalParameters } from '../../../../model/sweep_data/stepSweepConf
   styleUrl: './plot-bias.component.scss',
 })
 export class PlotBiasComponent
-  implements AfterViewInit, OnInit, OnDestroy, OnChanges
-{
+  implements AfterViewInit, OnInit, OnDestroy, OnChanges {
   @Input() biasChannel: BiasChannel | undefined;
   // @Input() plotData: any;
   // @Input() plotLayout: any;
   @Input() plotDataX: number[] = [];
   @Input() plotConfig: { staticPlot: boolean } | undefined;
+  @Input() tickDifference: number | undefined;
   @Input() stepGlobalParameters: StepGlobalParameters | undefined;
   plotDivID = '';
 
@@ -83,6 +83,7 @@ export class PlotBiasComponent
       type: 'linear',
       position: 20,
       linewidth: 1,
+      range: [0,1],
     },
     xaxis2: {
       visible: true,
@@ -190,7 +191,7 @@ export class PlotBiasComponent
   measRange: ChannelRange | undefined;
   bias: ParameterFloat | undefined;
 
-  constructor(public elementRef: ElementRef) {}
+  constructor(public elementRef: ElementRef) { }
 
   ngOnInit(): void {
     if (this.biasChannel) {
@@ -205,8 +206,12 @@ export class PlotBiasComponent
       this.bias = this.biasChannel.bias;
 
       this.plotDivID = `plotDiv${this.biasChannel.common_chan_attributes.chan_name}`;
+
     }
 
+    this.plotData1.x = this.plotDataX;
+    console.log("biasplotdata x", this.plotDataX, this.plotData1.x);
+
     // Generate x-axis data if stepGlobalParameters are available
     if (this.stepGlobalParameters) {
       this.generateXAxisData();
@@ -218,6 +223,7 @@ export class PlotBiasComponent
     // Set constant y-values for bias
     const biasValue = this.bias?.value ?? 0;
     this.plotData1.y = new Array(this.plotData1.x.length).fill(biasValue);
+    // this.generateXAxisData();
 
     this.updatePlotLayout();
     this.plotData1.line.color = this.color;
@@ -239,6 +245,7 @@ export class PlotBiasComponent
     }
 
     this.observeThemeChanges();
+    this.plotData1.x = this.plotDataX;
   }
 
   // the plots are rendered only after the DOM is created, so we need to render them after the DOM is loaded
@@ -273,23 +280,12 @@ export class PlotBiasComponent
   }
 
   private generateXAxisData(): void {
-    if (!this.stepGlobalParameters) return;
-
-    const numSteps = this.stepGlobalParameters.step_points?.value ?? 1;
-    const delayTime = this.stepGlobalParameters.step_to_sweep_delay?.value ?? 0;
-
-    // Generate x-axis data using the same formula as step and sweep components
-    const xData: number[] = [];
-    for (let i = 0; i <= numSteps; i++) {
-      xData.push(i * (1 + delayTime));
+    this.plotData1.x = this.plotDataX;
+    if (this.tickDifference) {
+      this.plotLayout.xaxis.dtick = this.tickDifference;
+      this.plotLayout.xaxis2.dtick = this.tickDifference;
+      this.plotLayout.xaxis.range = [0, this.tickDifference * 10];
     }
-
-    this.plotData1.x = xData;
-
-    // Calculate total time and dtick (same as step/sweep components)
-    const totalTime = numSteps * (1 + delayTime);
-    this.plotLayout.xaxis.dtick = totalTime / 10;
-    this.plotLayout.xaxis2.dtick = totalTime / 10;
   }
 
   private updatePlotLayout(): void {
@@ -308,7 +304,7 @@ export class PlotBiasComponent
           max = Math.max(...range);
         }
       } else {
-        max = parseToDecimal(this.sourceRange.value,(this.plotLayout.yaxis2.ticksuffix).trim());
+        max = parseToDecimal(this.sourceRange.value, (this.plotLayout.yaxis2.ticksuffix).trim());
       }
       if (typeof max === 'number' && !isNaN(max)) {
         const maxRange = PlotUtils.computeMaxRange(-max, max);

script-gen-ui/src/app/components/main-sweep/plot-container/plot-container.component.html

@@ -4,6 +4,7 @@
       [biasChannel]="biasChannel"
       [plotDataX]="plotDataX"
       [plotConfig]="plotConfig"
+      [tickDifference]="tickDifference"
       [stepGlobalParameters]="stepGlobalParameters"
       [isActive]="activeComponent === 'bias' && activeIndex === i"
       [activeStyle]="getActiveStyle(biasChannel.common_chan_attributes.uuid, 'bias', i)"
@@ -17,9 +18,9 @@
     <app-plot-step
       [stepChannel]="stepChannel"
       [stepGlobalParameters]="stepGlobalParameters"
-      [stepPointsList]="listofStepPoints"
       [plotDataX]="plotDataX"
       [plotConfig]="plotConfig"
+      [tickDifference]="tickDifference"
       [isActive]="activeComponent === 'step' && activeIndex === i"
       [activeStyle]="getActiveStyle(stepChannel.start_stop_channel.common_chan_attributes.uuid, 'step', i)"
       [color]="getColor(stepChannel.start_stop_channel.common_chan_attributes.uuid)"
@@ -33,9 +34,10 @@
       [sweepChannel]="sweepChannel"
       [sweepGlobalParameters]="sweepGlobalParameters"
       [stepGlobalParameters]="stepGlobalParameters"
-      [sweepPointsList]="listofSweepPoints"
       [plotDataX]="plotDataX"
       [plotConfig]="plotConfig"
+      [tickDifference]="tickDifference"
+      [totalTimePerStep]="totalTimePerStep"
       [isActive]="activeComponent === 'sweep' && activeIndex === i"
       [activeStyle]="getActiveStyle(sweepChannel.start_stop_channel.common_chan_attributes.uuid, 'sweep', i)"
       [color]="getColor(sweepChannel.start_stop_channel.common_chan_attributes.uuid)"