@@ -969,6 +969,8 class Reshaper(Operation): | |||||
969 | raise ValueError, "nProfiles= %d is not divisibled by (1./nTxs) = %f" %(dataOut.nProfiles, (1./nTxs)) |
|
969 | raise ValueError, "nProfiles= %d is not divisibled by (1./nTxs) = %f" %(dataOut.nProfiles, (1./nTxs)) | |
970 |
|
970 | |||
971 | shape = [dataOut.nChannels, dataOut.nProfiles*nTxs, dataOut.nHeights/nTxs] |
|
971 | shape = [dataOut.nChannels, dataOut.nProfiles*nTxs, dataOut.nHeights/nTxs] | |
|
972 | ||||
|
973 | return shape, nTxs | |||
972 |
|
974 | |||
973 | if len(shape) != 2 and len(shape) != 3: |
|
975 | if len(shape) != 2 and len(shape) != 3: | |
974 | raise ValueError, "shape dimension should be equal to 2 or 3. shape = (nProfiles, nHeis) or (nChannels, nProfiles, nHeis). Actually shape = (%d, %d, %d)" %(dataOut.nChannels, dataOut.nProfiles, dataOut.nHeights) |
|
976 | raise ValueError, "shape dimension should be equal to 2 or 3. shape = (nProfiles, nHeis) or (nChannels, nProfiles, nHeis). Actually shape = (%d, %d, %d)" %(dataOut.nChannels, dataOut.nProfiles, dataOut.nHeights) | |
@@ -979,8 +981,7 class Reshaper(Operation): | |||||
979 | else: |
|
981 | else: | |
980 | shape_tuple = list(shape) |
|
982 | shape_tuple = list(shape) | |
981 |
|
983 | |||
982 | if not nTxs: |
|
984 | nTxs = 1.0*shape_tuple[1]/dataOut.nProfiles | |
983 | nTxs = int(shape_tuple[1]/dataOut.nProfiles) |
|
|||
984 |
|
985 | |||
985 | return shape_tuple, nTxs |
|
986 | return shape_tuple, nTxs | |
986 |
|
987 | |||
@@ -996,7 +997,7 class Reshaper(Operation): | |||||
996 | dataOut.data = numpy.reshape(dataOut.data, shape_tuple) |
|
997 | dataOut.data = numpy.reshape(dataOut.data, shape_tuple) | |
997 | dataOut.flagNoData = False |
|
998 | dataOut.flagNoData = False | |
998 |
|
999 | |||
999 | profileIndex = int(dataOut.nProfiles*nTxs) - 1 |
|
1000 | profileIndex = int(dataOut.nProfiles*self.__nTxs) - 1 | |
1000 |
|
1001 | |||
1001 | else: |
|
1002 | else: | |
1002 |
|
1003 |
General Comments 0
You need to be logged in to leave comments.
Login now