Commit 49e15f49 authored by SRT Operator's avatar SRT Operator
Browse files

Holography digitalXcorrelator: added power and normalized correlation to outputfile

parent 13f6580d

Common/Servers/HolographyBackend/src/DigitalXCorrelatorImpl/DigitalXCorrelator.py

+2 −2
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ import corr2serial # The Giovanni's module defines an high level API to communic 
__docformat__ = 'restructuredtext'



# A list of ordered keys of full_res dictionary in save_coeff method

ordered_key_list = ['x_2', 'y_2', 'y90_2', 'xy', 'xy90']#, 'real', 'imm', 'module', 'phase']

ordered_key_list = ['x_2', 'y_2', 'y90_2', 'xy', 'xy90','modNrm','PwrInX2','PwrInY2']#, 'real', 'imm', 'module', 'phase']



class DigitalXCorrelator(DXC__POA.DigitalXCorrelator, ACSComponent, ContainerServices, ComponentLifecycle):

    """The DigitalXCorrelator ACS component uses the serial port to communicate with
@@ -240,7 +240,7 @@ class DigitalXCorrelator(DXC__POA.DigitalXCorrelator, ACSComponent, ContainerSer 


            print self.out_file_name

            dt = datetime.datetime.now()

            file_id = "_%04d%02d%02d_%02d%02d%02d" %(dt.year, dt.month, dt.day, dt.hour, dt.seconds)

            file_id = "_%04d%02d%02d_%02d%02d%02d" %(dt.year, dt.month, dt.day, dt.hour, dt.minute,dt.second)

            self.out_file = open(self.out_file_name + file_id, 'a', 0)

            self.out_file.write("Azimuth".ljust(15) + "Elevation".ljust(15))

            for item in ordered_key_list:

Common/Servers/HolographyBackend/src/corr2serial.py

+5 −4
Original line number Diff line number Diff line
@@ -18,10 +18,9 @@ from math import log10 
####################

# CORRELATOR CLASS #

####################



class Correlator:

    def __init__(self):

        self.results = { 'x_2' : 0, 'y_2' : 0, 'xy' : 0, 'xy90' : 0, 'y90_2' : 0, 'y_y90' : 0 }

        self.results = { 'x_2' : 0, 'y_2' : 0, 'xy' : 0, 'xy90' : 0, 'y90_2' : 0, 'y_y90' : 0,'modNrm':0.,'PwrInX2':0.,'PwrInY2':0.}

        self.coeff   = { 'real' : 0.00, 'imm' : 0.00 }

        self.buffer  = ""

        self.ser     = serial.Serial()
@@ -123,6 +122,7 @@ class Correlator: 
        self.results['xy90'] = self.fixed2float(sum_xy90, 64, 30)

        self.results['y90_2'] = self.fixed2float(sum_y90_2, 64, 30)

        self.results['y_y90'] = self.fixed2float(sum_y_y90, 64, 30)



        self.results['t'] = datetime.datetime.now()

            

        self.coeff['real'] = self.results['xy'] / sqrt(self.results['y_2'])
@@ -142,8 +142,9 @@ class Correlator: 


        self.coeff['modNrm'] = sqrt(self.coeff['realNrm']**2 + self.coeff['immNrm']**2) 



        self.coeff['PwrInX2'] = 10 * log10 ( (1000/100) * ( sqrt ( self.results['x_2'] * (2**30) / (5000000) ) * (39.0625/1000000))**2)

        self.coeff['PwrInY2'] = 10 * log10 ( (1000/100) * ( sqrt ( self.results['y_2'] * (2**30) / (5000000) ) * (39.0625/1000000))**2)

        self.results['PwrInX2'] = 10 * log10 ( (1000/100) * ( sqrt ( self.results['x_2'] * (2**30) / (5000000) ) * (39.0625/1000000))**2)

        self.results['PwrInY2'] = 10 * log10 ( (1000/100) * ( sqrt ( self.results['y_2'] * (2**30) / (5000000) ) * (39.0625/1000000))**2)

	self.results['modNrm'] = sqrt(self.coeff['realNrm']**2 + self.coeff['immNrm']**2) 



    def get_real(self):

        return self.coeff['real']