fixes #69

hephy-dd · Sep 14, 2020 · e350110 · e350110
1 parent 8936016
commit e350110
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/comet_pqc/measurements/iv_ramp.py b/comet_pqc/measurements/iv_ramp.py
@@ -207,8 +207,8 @@ def measure(self, hvsrc):
             # Create formatter
             fmt = PQCFormatter(f)
             fmt.add_column("timestamp", ".3f", unit="s")
-            fmt.add_column("hvsrc_voltage", "E", unit="V")
-            fmt.add_column("hvsrc_current", "E", unit="A")
+            fmt.add_column("voltage", "E", unit="V")
+            fmt.add_column("current_hvsrc", "E", unit="A")
             fmt.add_column("temperature_box", "E", unit="degC")
             fmt.add_column("temperature_chuck", "E", unit="degC")
             fmt.add_column("humidity_box", "E", unit="%")
@@ -274,8 +274,8 @@ def measure(self, hvsrc):
                 # Write reading
                 fmt.write_row(dict(
                     timestamp=td,
-                    hvsrc_voltage=voltage,
-                    hvsrc_current=reading_current,
+                    voltage=voltage,
+                    current_hvsrc=reading_current,
                     temperature_box=self.environment_temperature_box,
                     temperature_chuck=self.environment_temperature_chuck,
                     humidity_box=self.environment_humidity_box

diff --git a/comet_pqc/measurements/iv_ramp_bias.py b/comet_pqc/measurements/iv_ramp_bias.py
@@ -277,7 +277,7 @@ def measure(self, hvsrc, vsrc):
             fmt = PQCFormatter(f)
             fmt.add_column("timestamp", ".3f", unit="s")
             fmt.add_column("voltage", "E", unit="V")
-            fmt.add_column("current", "E", unit="A")
+            fmt.add_column("current_vsrc", "E", unit="A")
             fmt.add_column("bias_voltage", "E", unit="V")
             fmt.add_column("temperature_box", "E", unit="degC")
             fmt.add_column("temperature_chuck", "E", unit="degC")
@@ -376,7 +376,7 @@ def measure(self, hvsrc, vsrc):
                 fmt.write_row(dict(
                     timestamp=dt,
                     voltage=voltage,
-                    current=vsrc_reading,
+                    current_vsrc=vsrc_reading,
                     bias_voltage=bias_voltage,
                     temperature_box=self.environment_temperature_box,
                     temperature_chuck=self.environment_temperature_chuck,

diff --git a/comet_pqc/measurements/iv_ramp_bias_elm.py b/comet_pqc/measurements/iv_ramp_bias_elm.py
@@ -347,9 +347,9 @@ def measure(self, hvsrc, vsrc, elm):
             fmt = PQCFormatter(f)
             fmt.add_column("timestamp", ".3f", unit="s")
             fmt.add_column("voltage", "E", unit="V")
-            fmt.add_column("elm_current", "E", unit="A")
-            fmt.add_column("vsrc_current", "E", unit="A")
-            fmt.add_column("hvsrc_current", "E", unit="A")
+            fmt.add_column("current_elm", "E", unit="A")
+            fmt.add_column("current_vsrc", "E", unit="A")
+            fmt.add_column("current_hvsrc", "E", unit="A")
             fmt.add_column("bias_voltage", "E", unit="V")
             fmt.add_column("temperature_box", "E", unit="degC")
             fmt.add_column("temperature_chuck", "E", unit="degC")
@@ -480,9 +480,9 @@ def measure(self, hvsrc, vsrc, elm):
                     fmt.write_row(dict(
                         timestamp=dt,
                         voltage=voltage,
-                        elm_current=elm_reading,
-                        vsrc_current=vsrc_reading,
-                        hvsrc_current=hvsrc_reading,
+                        current_elm=elm_reading,
+                        current_vsrc=vsrc_reading,
+                        current_hvsrc=hvsrc_reading,
                         bias_voltage=bias_voltage,
                         temperature_box=self.environment_temperature_box,
                         temperature_chuck=self.environment_temperature_chuck,