schain Commit - r819:c63b6bff3798 · Jicamarca Repository

Changes to meteor detection and phase correction because of relocation of antenna

Julio Valdez -

r819:c63b6bff3798

parent child

Context file:

r819:c63b6bff3798

Collapse all files

schainpy/model/proc/jroproc_parameters.py +38 -34

                     #-------------------    Detect Meteors  ------------------------------
                 def MeteorDetection(self, hei_ref = None, tauindex = 0,
-                                  predefinedPhaseShifts = None, centerReceiverIndex = 2,
+                                  phaseOffsets = None,
                                   cohDetection = False, cohDet_timeStep = 1, cohDet_thresh = 25,
                                   noise_timeStep = 4, noise_multiple = 4,
                                   multDet_timeLimit = 1, multDet_rangeLimit = 3,
                                   phaseThresh = 20, SNRThresh = 8,
-                                  hmin = 50, hmax=150, azimuth = 0) :
+                                  hmin = 50, hmax=150, azimuth = 0,
+                                  channel25X = 0, channel20X = 4, channelCentX = 2,
+                                  channel25Y = 1, channel20Y = 3, channelCentY = 2) :
                     '''
                     Function DetectMeteors()
                     '''
                     Cambiar este pairslist
                     '''
-                    pairslist = []
+                    pairslist = [(channelCentX, channel25X),(channelCentX, channel20X),(channelCentY,channel25Y),(channelCentY, channel20Y)]
-                    nChannel = self.dataOut.nChannels
-                    for i in range(nChannel):
+            #         nChannel = self.dataOut.nChannels
-                        if i != centerReceiverIndex:
+            #         for i in range(nChannel):
-                            pairslist.append((centerReceiverIndex,i))
+            #             if i != centerReceiverIndex:
+            #                 pairslist.append((centerReceiverIndex,i))
                     #****************REMOVING HARDWARE PHASE DIFFERENCES***************
                     # see if the user put in pre defined phase shifts
                     voltsPShift = self.dataOut.data_pre.copy()
-                    if predefinedPhaseShifts != None:
+            #         if predefinedPhaseShifts != None:
-                        hardwarePhaseShifts = numpy.array(predefinedPhaseShifts)*numpy.pi/180
+            #             hardwarePhaseShifts = numpy.array(predefinedPhaseShifts)*numpy.pi/180
+            #
-            #         elif beaconPhaseShifts:
+            # #         elif beaconPhaseShifts:
-            #             #get hardware phase shifts using beacon signal
+            # #             #get hardware phase shifts using beacon signal
-            #             hardwarePhaseShifts = self.__getHardwarePhaseDiff(self.dataOut.data_pre, pairslist, newheis, 10)
+            # #             hardwarePhaseShifts = self.__getHardwarePhaseDiff(self.dataOut.data_pre, pairslist, newheis, 10)
-            #             hardwarePhaseShifts = numpy.insert(hardwarePhaseShifts,centerReceiverIndex,0)
+            # #             hardwarePhaseShifts = numpy.insert(hardwarePhaseShifts,centerReceiverIndex,0)
+            #
-                    else:
+            #         else:
-                        hardwarePhaseShifts = numpy.zeros(5)
+            #             hardwarePhaseShifts = numpy.zeros(5)
+            #
+            #         voltsPShift = numpy.zeros((self.dataOut.data_pre.shape[0],self.dataOut.data_pre.shape[1],self.dataOut.data_pre.shape[2]), dtype = 'complex')
-                    voltsPShift = numpy.zeros((self.dataOut.data_pre.shape[0],self.dataOut.data_pre.shape[1],self.dataOut.data_pre.shape[2]), dtype = 'complex')
+            #         for i in range(self.dataOut.data_pre.shape[0]):
-                    for i in range(self.dataOut.data_pre.shape[0]):
+            #             voltsPShift[i,:,:] = self.__shiftPhase(self.dataOut.data_pre[i,:,:], hardwarePhaseShifts[i])
-                        voltsPShift[i,:,:] = self.__shiftPhase(self.dataOut.data_pre[i,:,:], hardwarePhaseShifts[i])
                     #******************END OF REMOVING HARDWARE PHASE DIFFERENCES*********
                         date = self.dataOut.utctime
                         arrayParameters = self.__setNewArrays(listMeteors4, date, heiRang)
+                        #Correcting phase offset
+                        if phaseOffsets != None:
+                            phaseOffsets = numpy.array(phaseOffsets)*numpy.pi/180
+                            arrayParameters[:,8:12] = numpy.unwrap(arrayParameters[:,8:12] + phaseOffsets)
+                        #Second Pairslist
                         pairsList = []
-                        pairx = (0,3)
+                        pairx = (0,1)
-                        pairy = (1,2)
+                        pairy = (2,3)
                         pairsList.append(pairx)
                         pairsList.append(pairy)
                     return phOffset
-                def run(self, dataOut, pairs, distances, hmin, hmax, nHours = None):
+                def run(self, dataOut, hmin, hmax, direction_25X=-1, direction_20X=1, direction_25Y=-1, direction_20Y=1, nHours = 1):
                     dataOut.flagNoData = True
                     self.__dataReady = False
-                    if nHours == None:
-                        nHours = 1
                     dataOut.outputInterval = nHours*3600
                     if self.__isConfig == False:
                         self.__buffer = dataOut.data_param.copy()
                     else:
-                        self.__buffer = numpy.hstack((self.__buffer, dataOut.data_param))
+                        self.__buffer = numpy.vstack((self.__buffer, dataOut.data_param))
                     self.__dataReady = self.__checkTime(dataOut.utctime, self.__initime, dataOut.paramInterval, dataOut.outputInterval) #Check if the buffer is ready
                         k = 2*numpy.pi/lamb
                         azimuth = 0
                         h = (hmin, hmax)
-                        pairsList = ((0,3),(1,2))
+                        pairs = ((0,1),(2,3))
+                        distances = [direction_25X*2.5*lamb, direction_20X*2*lamb, direction_25Y*2.5*lamb, direction_20Y*2*lamb]
                         meteorsArray = self.__buffer
                         error = meteorsArray[:,-1]
                         gammas = self.__getGammas(pairs, k, distances, phases)
             #             gammas = numpy.array([-21.70409463,45.76935864])*numpy.pi/180
                         #Calculate Phases
-                        phasesOff = self.__getPhases(azimuth, h, pairsList, distances, gammas, meteorsArray)
+                        phasesOff = self.__getPhases(azimuth, h, pairs, distances, gammas, meteorsArray)
                         phasesOff = phasesOff.reshape((1,phasesOff.size))
                         dataOut.data_output = -phasesOff
                         dataOut.flagNoData = False

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages