##// END OF EJS Templates
schain-jc
RSS
Udating from v2.3
George Yong -
r1174:0a82420b353b merge
parent child
Show More
Side by Side Unified
Context file:
r1174:0a82420b353b Loading diff...:
Show file before | Show file after | Hide comments
@@ -409,11 +409,15 class PlotData(Operation, Process):
409 409 i = 1 if numpy.where(abs(ymax-ymin) <= Y)[0][0] < 0 else numpy.where(abs(ymax-ymin) <= Y)[0][0]
410 410 ystep = Y[i] / 10.
411 411
412 if self.xaxis is not 'time':
413 X = numpy.array([1, 2, 5, 10, 20, 50, 100, 200, 500, 1000, 2000, 5000])/2.
414 i = 1 if numpy.where(abs(xmax-xmin) <= X)[0][0] < 0 else numpy.where(abs(xmax-xmin) <= X)[0][0]
415 xstep = X[i] / 10.
416
412 417 for n, ax in enumerate(self.axes):
413 418 if ax.firsttime:
414 419 ax.set_facecolor(self.bgcolor)
415 420 ax.yaxis.set_major_locator(MultipleLocator(ystep))
416 ax.xaxis.set_major_locator(MultipleLocator(ystep))
417 421 if self.xscale:
418 422 ax.xaxis.set_major_formatter(FuncFormatter(lambda x, pos: '{0:g}'.format(x*self.xscale)))
419 423 if self.xscale:
@@ -421,6 +425,8 class PlotData(Operation, Process):
421 425 if self.xaxis is 'time':
422 426 ax.xaxis.set_major_formatter(FuncFormatter(self.__fmtTime))
423 427 ax.xaxis.set_major_locator(LinearLocator(9))
428 else:
429 ax.xaxis.set_major_locator(MultipleLocator(xstep))
424 430 if self.xlabel is not None:
425 431 ax.set_xlabel(self.xlabel)
426 432 ax.set_ylabel(self.ylabel)
Show file before | Show file after | Hide comments
@@ -264,7 +264,7 class SpectraReader(JRODataReader, ProcessingUnit):
264 264 dc = dc.reshape( (self.systemHeaderObj.nChannels, self.processingHeaderObj.nHeights) ) #transforma a un arreglo 2D
265 265
266 266
267 if self.processingHeaderObj.shif_fft:
267 if not self.processingHeaderObj.shif_fft:
268 268 #desplaza a la derecha en el eje 2 determinadas posiciones
269 269 shift = int(self.processingHeaderObj.profilesPerBlock/2)
270 270 spc = numpy.roll( spc, shift , axis=2 )
@@ -511,7 +511,7 class SpectraWriter(JRODataWriter, Operation):
511 511 """
512 512
513 513 spc = numpy.transpose( self.data_spc, (0,2,1) )
514 if not( self.processingHeaderObj.shif_fft ):
514 if not self.processingHeaderObj.shif_fft:
515 515 spc = numpy.roll( spc, self.processingHeaderObj.profilesPerBlock/2, axis=2 ) #desplaza a la derecha en el eje 2 determinadas posiciones
516 516 data = spc.reshape((-1))
517 517 data = data.astype(self.dtype[0])
@@ -520,7 +520,7 class SpectraWriter(JRODataWriter, Operation):
520 520 if self.data_cspc is not None:
521 521 data = numpy.zeros( self.shape_cspc_Buffer, self.dtype )
522 522 cspc = numpy.transpose( self.data_cspc, (0,2,1) )
523 if not( self.processingHeaderObj.shif_fft ):
523 if not self.processingHeaderObj.shif_fft:
524 524 cspc = numpy.roll( cspc, self.processingHeaderObj.profilesPerBlock/2, axis=2 ) #desplaza a la derecha en el eje 2 determinadas posiciones
525 525 data['real'] = cspc.real
526 526 data['imag'] = cspc.imag
Show file before | Show file after | Hide comments
@@ -40,8 +40,8 static PyObject *correlateByBlock(PyObject *self, PyObject *args) {
40 40
41 41 if (!PyArg_ParseTuple(args, "OOi", &data_obj1, &data_obj2, &mode)) return NULL;
42 42
43 data_array1 = (PyArrayObject *) PyArray_FROM_OTF(data_obj1, NPY_COMPLEX128, NPY_ARRAY_DEFAULT);
44 data_array2 = (PyArrayObject *) PyArray_FROM_OTF(data_obj2, NPY_FLOAT64, NPY_ARRAY_DEFAULT);
43 data_array1 = (PyArrayObject *) PyArray_FROM_OTF(data_obj1, NPY_COMPLEX128, NPY_ARRAY_IN_ARRAY);
44 data_array2 = (PyArrayObject *) PyArray_FROM_OTF(data_obj2, NPY_FLOAT64, NPY_ARRAY_IN_ARRAY);
45 45
46 46 npy_intp dims[1];
47 47 dims[0] = 200;
@@ -100,7 +100,7 static PyObject *hildebrand_sekhon(PyObject *self, PyObject *args) {
100 100 PyObject *data_obj, *data_array;
101 101
102 102 if (!PyArg_ParseTuple(args, "Od", &data_obj, &navg)) return NULL;
103 data_array = PyArray_FROM_OTF(data_obj, NPY_FLOAT64, NPY_ARRAY_DEFAULT);
103 data_array = PyArray_FROM_OTF(data_obj, NPY_FLOAT64, NPY_ARRAY_IN_ARRAY);
104 104 if (data_array == NULL) {
105 105 Py_XDECREF(data_array);
106 106 Py_XDECREF(data_obj);
General Comments 0
You need to be logged in to leave comments. Login now