Browse Source

Akvo now uses the full boostrap noise algorithm from GJI paper

tags/1.6.1
Trevor Irons 5 years ago
parent
commit
ae8aba151f
1 changed files with 2 additions and 2 deletions
  1. 2
    2
      akvo/gui/akvoGUI.py

+ 2
- 2
akvo/gui/akvoGUI.py View File

689
             qv = np.array(qv)
689
             qv = np.array(qv)
690
             iQ = np.argsort(np.array(qq))
690
             iQ = np.argsort(np.array(qq))
691
             qq = np.array(qq)[iQ]
691
             qq = np.array(qq)[iQ]
692
-            print("qq", qq, iQ)
693
             qv = np.array(qv)[iQ]
692
             qv = np.array(qv)[iQ]
694
             INFO["Pulses"][pulse] = {}
693
             INFO["Pulses"][pulse] = {}
695
             INFO["Pulses"][pulse]["units"] = "A"
694
             INFO["Pulses"][pulse]["units"] = "A"
708
                 INFO["Gated"][pulse]["windows"] = VectorXr( self.RAWDataProc.GATEDWINDOW ) 
707
                 INFO["Gated"][pulse]["windows"] = VectorXr( self.RAWDataProc.GATEDWINDOW ) 
709
                 for ichan in self.RAWDataProc.DATADICT[pulse]["chan"]:
708
                 for ichan in self.RAWDataProc.DATADICT[pulse]["chan"]:
710
                     INFO["Gated"][pulse]["Chan. " + str(ichan)] = {} 
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
                     for ipm in range(self.RAWDataProc.DATADICT["nPulseMoments"]):     
712
                     for ipm in range(self.RAWDataProc.DATADICT["nPulseMoments"]):     
713
                         INFO["Gated"][pulse]["Chan. " + str(ichan)]["Q-"+str(ipm) + " CA"] = VectorXr(self.RAWDataProc.GATED[ichan]["CA"][ipm])   
713
                         INFO["Gated"][pulse]["Chan. " + str(ichan)]["Q-"+str(ipm) + " CA"] = VectorXr(self.RAWDataProc.GATED[ichan]["CA"][ipm])   
714
                         INFO["Gated"][pulse]["Chan. " + str(ichan)]["Q-"+str(ipm) + " RE"] = VectorXr(self.RAWDataProc.GATED[ichan]["RE"][ipm])   
714
                         INFO["Gated"][pulse]["Chan. " + str(ichan)]["Q-"+str(ipm) + " RE"] = VectorXr(self.RAWDataProc.GATED[ichan]["RE"][ipm])   

Loading…
Cancel
Save