From 3ed45714a3a5df0fac96d2dbd6bb5c5e7d02349b Mon Sep 17 00:00:00 2001
From: Pascal <engelerp@phys.ethz.ch>
Date: Mon, 2 Sep 2024 11:28:36 +0200
Subject: [PATCH] Fixed output units
---
stitch_project/api/Stitch/Stitchtility.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/stitch_project/api/Stitch/Stitchtility.py b/stitch_project/api/Stitch/Stitchtility.py
index 94cc0dd..65f3635 100644
--- a/stitch_project/api/Stitch/Stitchtility.py
+++ b/stitch_project/api/Stitch/Stitchtility.py
@@ -41,10 +41,13 @@ def dataToAmpsPhase(data):
if sindata[i]&(2**63) != 0:
sindata[i] = sindata[i]-2**64
- amps = [2**-15*np.sqrt(2.*cosdata[i]**2+2.*sindata[i]**2)/numdata[i] for i in range(len(numdata))] #probably pm
+ #do 2**-18 to bring sin,cos to [-1,1]
+ #a 2**-6 already done by LockInAccumulator output, so do additional 2**6 to get to pm
+ #now do 10**-3 to get to nm
+ amps = [2**-12*10**-3*np.sqrt(2.*cosdata[i]**2+2.*sindata[i]**2)/numdata[i] for i in range(len(numdata))] #nm
angles = [2.*np.arctan(sindata[i]/cosdata[i]) for i in range(len(numdata))]
angles = np.angle(np.array(cosdata)+1j*np.array(sindata))
angles_unwr = np.unwrap(angles)
- cosportion = [2**-15*np.abs(np.sqrt(2)*cosdata[i])/numdata[i] for i in range(len(amps))]
- sinportion = [2**-15*np.abs(np.sqrt(2)*sindata[i])/numdata[i] for i in range(len(amps))]
+ cosportion = [2**-12*10**-3*np.abs(np.sqrt(2)*cosdata[i])/numdata[i] for i in range(len(amps))]
+ sinportion = [2**-12*10**-3*np.abs(np.sqrt(2)*sindata[i])/numdata[i] for i in range(len(amps))]
return np.array(amps), [np.array(angles), np.array(angles_unwr)], np.array(cosportion), np.array(sinportion), np.array(numdata)
\ No newline at end of file
--
GitLab