From 874735bc5f173820118b53795b26a25e185a7b4f Mon Sep 17 00:00:00 2001 From: Jiyong Kang Date: Thu, 16 May 2024 15:16:04 +0900 Subject: [PATCH 1/5] Apply scale to `_NoScan` --- iquip/apps/builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iquip/apps/builder.py b/iquip/apps/builder.py index 560a2b91..8c794ce6 100644 --- a/iquip/apps/builder.py +++ b/iquip/apps/builder.py @@ -513,7 +513,7 @@ def scanArguments(self) -> Dict[str, Any]: """Overridden.""" return { "ty": "NoScan", - "value": self.valueSpinBox.value(), + "value": self.valueSpinBox.value() * self.scale, "repetitions": self.repetitionsSpinBox.value() } From 57ed0ca351d7c3e9f2403e106cc9e1ddf1fa8f23 Mon Sep 17 00:00:00 2001 From: Jiyong Kang Date: Thu, 16 May 2024 15:32:23 +0900 Subject: [PATCH 2/5] Apply scale to `_RangeScan` --- iquip/apps/builder.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/iquip/apps/builder.py b/iquip/apps/builder.py index 8c794ce6..4fe1648d 100644 --- a/iquip/apps/builder.py +++ b/iquip/apps/builder.py @@ -569,8 +569,8 @@ def scanArguments(self) -> Dict[str, Any]: """Overridden.""" return { "ty": "RangeScan", - "start": self.startSpinBox.value(), - "stop": self.stopSpinBox.value(), + "start": self.startSpinBox.value() * self.scale, + "stop": self.stopSpinBox.value() * self.scale, "npoints": self.npointsSpinBox.value(), "randomize": self.randomizeCheckBox.isChecked(), "seed": None From 41fa46eba27905654ec8e260af0388b37417d255 Mon Sep 17 00:00:00 2001 From: Jiyong Kang Date: Thu, 16 May 2024 15:32:53 +0900 Subject: [PATCH 3/5] Apply scale to `_CenterScan` --- iquip/apps/builder.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/iquip/apps/builder.py b/iquip/apps/builder.py index 4fe1648d..cb303cc6 100644 --- a/iquip/apps/builder.py +++ b/iquip/apps/builder.py @@ -627,9 +627,9 @@ def scanArguments(self) -> Dict[str, Any]: """Overridden.""" return { "ty": "CenterScan", - "center": self.centerSpinBox.value(), - "step": self.stepSpinBox.value(), - "span": self.spanSpinBox.value(), + "center": self.centerSpinBox.value() * self.scale, + "step": self.stepSpinBox.value() * self.scale, + "span": self.spanSpinBox.value() * self.scale, "randomize": self.randomizeCheckBox.isChecked(), "seed": None } From a6c3fdba132674b607adbb1132fea9b84b23a760 Mon Sep 17 00:00:00 2001 From: Jiyong Kang Date: Thu, 16 May 2024 15:33:30 +0900 Subject: [PATCH 4/5] Apply scale to `_ExplicitScan` --- iquip/apps/builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iquip/apps/builder.py b/iquip/apps/builder.py index cb303cc6..2cf43413 100644 --- a/iquip/apps/builder.py +++ b/iquip/apps/builder.py @@ -664,7 +664,7 @@ def __init__( def scanArguments(self) -> Dict[str, Any]: """Overridden.""" sequenceText = self.sequenceEdit.text() - sequence = [float(x) for x in sequenceText.split()] + sequence = [float(x) * self.scale for x in sequenceText.split()] return { "ty": "ExplicitScan", "sequence": sequence From 1332bc77354c06791605e67876e3f979d4c6c552 Mon Sep 17 00:00:00 2001 From: Jiyong Kang Date: Wed, 30 Oct 2024 11:44:50 +0900 Subject: [PATCH 5/5] Remove scale from explicit scan Applied the review. --- iquip/apps/builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iquip/apps/builder.py b/iquip/apps/builder.py index 2cf43413..cb303cc6 100644 --- a/iquip/apps/builder.py +++ b/iquip/apps/builder.py @@ -664,7 +664,7 @@ def __init__( def scanArguments(self) -> Dict[str, Any]: """Overridden.""" sequenceText = self.sequenceEdit.text() - sequence = [float(x) * self.scale for x in sequenceText.split()] + sequence = [float(x) for x in sequenceText.split()] return { "ty": "ExplicitScan", "sequence": sequence