|
@@ -689,7 +689,6 @@ class ApplicationWindow(QtWidgets.QMainWindow):
|
689
|
689
|
qv = np.array(qv)
|
690
|
690
|
iQ = np.argsort(np.array(qq))
|
691
|
691
|
qq = np.array(qq)[iQ]
|
692
|
|
- print("qq", qq, iQ)
|
693
|
692
|
qv = np.array(qv)[iQ]
|
694
|
693
|
INFO["Pulses"][pulse] = {}
|
695
|
694
|
INFO["Pulses"][pulse]["units"] = "A"
|
|
@@ -708,7 +707,8 @@ class ApplicationWindow(QtWidgets.QMainWindow):
|
708
|
707
|
INFO["Gated"][pulse]["windows"] = VectorXr( self.RAWDataProc.GATEDWINDOW )
|
709
|
708
|
for ichan in self.RAWDataProc.DATADICT[pulse]["chan"]:
|
710
|
709
|
INFO["Gated"][pulse]["Chan. " + str(ichan)] = {}
|
711
|
|
- INFO["Gated"][pulse]["Chan. " + str(ichan)]["STD"] = VectorXr( np.std(self.RAWDataProc.GATED[ichan]["NR"], axis=0) )
|
|
710
|
+ #INFO["Gated"][pulse]["Chan. " + str(ichan)]["STD"] = VectorXr( np.std(self.RAWDataProc.GATED[ichan]["NR"], axis=0) )
|
|
711
|
+ INFO["Gated"][pulse]["Chan. " + str(ichan)]["STD"] = VectorXr( np.average(self.GATED[chan]["BN"], axis=0) )
|
712
|
712
|
for ipm in range(self.RAWDataProc.DATADICT["nPulseMoments"]):
|
713
|
713
|
INFO["Gated"][pulse]["Chan. " + str(ichan)]["Q-"+str(ipm) + " CA"] = VectorXr(self.RAWDataProc.GATED[ichan]["CA"][ipm])
|
714
|
714
|
INFO["Gated"][pulse]["Chan. " + str(ichan)]["Q-"+str(ipm) + " RE"] = VectorXr(self.RAWDataProc.GATED[ichan]["RE"][ipm])
|