Merge remote-tracking branch 'origin/dev/RT_mode' into EIS_10test

cutoff freq
Merge branch 'release/v1.6.9/fix_phase_90ToN90' into EIS_10test
2022-11-07 16:54:28 +08:00 · 2022-11-07 16:44:54 +08:00 · 2022-10-13 15:28:39 +08:00 · 2022-10-13 15:13:00 +08:00
1 changed files with 11 additions and 6 deletions
@@ -1429,25 +1429,25 @@ class EISZeroOneDataDecoder(RecDataDecoder):
            index = 60
            hsrtia_a.append(struct.unpack('>i', cali_coeff[index+1:index+5])[0]/1e8)
            hsrtia_b.append(struct.unpack('>i', cali_coeff[index+5:index+9])[0]/1e8)
-            hsrtia_c.append(struct.unpack('>i', cali_coeff[index+9:index+13])[0]/1e4)
+            hsrtia_c.append(struct.unpack('>i', cali_coeff[index+9:index+13])[0])

            #Lv[1] 20k
            index = 80
            hsrtia_a.append(struct.unpack('>i', cali_coeff[index+1:index+5])[0]/1e8)
            hsrtia_b.append(struct.unpack('>i', cali_coeff[index+5:index+9])[0]/1e8)
-            hsrtia_c.append(struct.unpack('>i', cali_coeff[index+9:index+13])[0]/1e4)
+            hsrtia_c.append(struct.unpack('>i', cali_coeff[index+9:index+13])[0])

            #Lv[2] 5k
            index = 100
            hsrtia_a.append(struct.unpack('>i', cali_coeff[index+1:index+5])[0]/1e8)
            hsrtia_b.append(struct.unpack('>i', cali_coeff[index+5:index+9])[0]/1e8)
-            hsrtia_c.append(struct.unpack('>i', cali_coeff[index+9:index+13])[0]/1e4)
+            hsrtia_c.append(struct.unpack('>i', cali_coeff[index+9:index+13])[0])

            #Lv[3] 200R
            index = 120
            hsrtia_a.append(struct.unpack('>i', cali_coeff[index+1:index+5])[0]/1e8)
            hsrtia_b.append(struct.unpack('>i', cali_coeff[index+5:index+9])[0]/1e8)
-            hsrtia_c.append(struct.unpack('>i', cali_coeff[index+9:index+13])[0]/1e4)
+            hsrtia_c.append(struct.unpack('>i', cali_coeff[index+9:index+13])[0])

            index = 140
            g = 1
@@ -1568,12 +1568,17 @@ class EISZeroOneDataDecoder(RecDataDecoder):
                    freq = ch3
                    fre_idx = 0

-                    voltage_mag = math.sqrt(img ** 2 + real ** 2) * (1 + freq ** 2 / cutoff_freq ** 2)
+                    rolloff_cali = cutoff_freq/1e5
+                    voltage_mag = math.sqrt(img ** 2 + real ** 2) * (1 + freq ** 2 /  rolloff_cali ** 2 / 1e4)

                    # if (gain == 3):
                    #     current = hsrtia_a[gain] * math.exp(hsrtia_b[gain] * voltage_mag) + hsrtia_c[gain] * math.exp(hsrtia_d[gain] * voltage_mag)
                    # else:
-                    current = voltage_mag ** 2 * hsrtia_a[gain] + voltage_mag * hsrtia_b[gain] + hsrtia_c[gain]
+                    
+                    current = voltage_mag ** 2 * hsrtia_a[gain] + voltage_mag * hsrtia_b[gain]
+                    # current = voltage_mag ** 2 * hsrtia_a[gain] + voltage_mag * hsrtia_b[gain] + hsrtia_c[gain]
+                    
+
                    # print(current)
                    # print(voltage_mag)
                    # print(hsrtia_a[gain])
Author	SHA1	Message	Date
10	06c36aa737	Merge remote-tracking branch 'origin/dev/RT_mode' into EIS_10test	2022-11-07 16:54:28 +08:00
10	402022c451	cutoff freq	2022-11-07 16:44:54 +08:00
10	fcc39dbfed	Merge branch 'release/v1.6.9/fix_phase_90ToN90' into EIS_10test	2022-10-13 15:28:39 +08:00
10	1174d54bc0	fix phase in PEIS mode	2022-10-13 15:13:00 +08:00