Commit f0dca81a authored by Caillat Michel's avatar Caillat Michel
Browse files

Replaced getFreq with getSpectrum. To be checked

parent 4b88b37c
......@@ -663,8 +663,8 @@ class DataBlock:
self.__logger.debug("getSlice: exiting")
return result
def getFreq(self, iRA=None, iDEC=None, iFREQ0=None, iFREQ1=None):
self.__logger.debug( "getFreq: entering")
def getSpectrum(self, iRA=None, iDEC=None, iFREQ0=None, iFREQ1=None):
self.__logger.debug( "getSpectrum: entering")
if iRA == None:
iRA = 0
if iDEC == None:
......@@ -676,7 +676,7 @@ class DataBlock:
nonanArray = np.nan_to_num(self.__data[iFREQ0:iFREQ1, iDEC, iRA].compute())
result = nonanArray.tolist()
self.__logger.debug( "getFreq: exiting")
self.__logger.debug( "getSpectrum: exiting")
return {"status": True, "message": "", "result": result}
......
......@@ -144,12 +144,12 @@ class DataManagerImpl :
self.__logger.debug("getSlice : exiting")
return result
def getFreq(self, relFITSFilePath, iRA=None, iDEC=None, iFREQ0=None, iFREQ1=None):
self.__logger.debug( "getFreq : entering")
def getSpectrum(self, relFITSFilePath, iRA=None, iDEC=None, iFREQ0=None, iFREQ1=None):
self.__logger.debug( "getSpectrum : entering")
result = self.__checkPresence(relFITSFilePath)
if result["status"]:
result = self.__dataBlocks[relFITSFilePath].getFreq(iRA, iDEC, iFREQ0, iFREQ1)
self.__logger.debug( "getFreq : exiting")
result = self.__dataBlocks[relFITSFilePath].getSpectrum(iRA, iDEC, iFREQ0, iFREQ1)
self.__logger.debug( "getSpectrum : exiting")
return result
def getAverageSpectrum(self, relFITSFilePath, iDEC0=None, iDEC1=None, iRA0=None, iRA1=None, retFITS=False):
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment