diff --git a/Core/Tools/src/PyGenVisitor.cpp b/Core/Tools/src/PyGenVisitor.cpp index 9529776af04ce8e8617c99739aecce0770019e5b..82e8bc67bcc1729074e8883bb04d649c97e8d437 100644 --- a/Core/Tools/src/PyGenVisitor.cpp +++ b/Core/Tools/src/PyGenVisitor.cpp @@ -1375,7 +1375,7 @@ std::string PyGenVisitor::definePlotting(const GISASSimulation *simulation) cons result << "def plotSimulation(simulation):\n"; result << "" << indent() << "result = simulation.getIntensityData().getArray()" << "+ 1 # +1 for log scale\n"; - result << "" << indent() << "im = pylab.imshow(numpy.rot90(result, 1), " + result << "" << indent() << "im = pylab.imshow(result, " << "norm=matplotlib.colors.LogNorm(), extent=["; size_t index = 0; size_t numberOfDetectorDimensions = simulation->getInstrument().getDetectorDimension(); diff --git a/Doc/UserManual/fig/ff2/bornplot.py b/Doc/UserManual/fig/ff2/bornplot.py index 4d43d57c3ec7ae2653f951acc3899d17464c966f..bc4fc096d205f2223faaf2b731d4a6e77fdea91c 100644 --- a/Doc/UserManual/fig/ff2/bornplot.py +++ b/Doc/UserManual/fig/ff2/bornplot.py @@ -70,7 +70,7 @@ def make_plot( results, det, name, nrow=1 ): # Plot the subfigures. for res in results: ax = axes[res.idx] - im = ax.imshow(numpy.rot90(res.data, 1), + im = ax.imshow(res.data, norm=norm, extent=det.rectangle(), aspect=1) diff --git a/Examples/Demos/FitCylindersPrisms_movie.py b/Examples/Demos/FitCylindersPrisms_movie.py index 9bbc5668dea3379dc7808a6cee02d5a3c5eb078f..77bfb0655216a9d3bd618fffa2aba7e5086ad297 100644 --- a/Examples/Demos/FitCylindersPrisms_movie.py +++ b/Examples/Demos/FitCylindersPrisms_movie.py @@ -123,12 +123,12 @@ class DrawObserver(IObserver): real_data = fit_suite.getFitObjects().getRealData().getArray() simulated_data = fit_suite.getFitObjects().getSimulationData().getArray() plt.subplot(2, 2, 1) - im = plt.imshow(numpy.rot90(real_data + 1, 1), norm=matplotlib.colors.LogNorm(),extent=[-1.0, 1.0, 0, 2.0]) + im = plt.imshow(real_data + 1, norm=matplotlib.colors.LogNorm(),extent=[-1.0, 1.0, 0, 2.0]) plt.colorbar(im) plt.title('\"Real\" data') # plotting real data plt.subplot(2, 2, 2) - im = plt.imshow(numpy.rot90(simulated_data + 1, 1), norm=matplotlib.colors.LogNorm(),extent=[-1.0, 1.0, 0, 2.0]) + im = plt.imshow(simulated_data + 1, norm=matplotlib.colors.LogNorm(),extent=[-1.0, 1.0, 0, 2.0]) plt.colorbar(im) plt.title('Simulated data') # plotting parameter space @@ -160,7 +160,7 @@ class DrawObserver(IObserver): # # plotting difference map # diff_map = (real_data - simulated_data)/numpy.sqrt(real_data + 1) # pylab.subplot(2, 2, 3) - # im = pylab.imshow(numpy.rot90(diff_map, 1), norm=matplotlib.colors.LogNorm(), extent=[-1.0, 1.0, 0, 2.0], vmin = 0.001, vmax = 1.0) + # im = pylab.imshow(diff_map, norm=matplotlib.colors.LogNorm(), extent=[-1.0, 1.0, 0, 2.0], vmin = 0.001, vmax = 1.0) # pylab.colorbar(im) # pylab.title('Difference map') # # plotting parameters info diff --git a/Examples/Demos/simul_demo_cyl_SSCA.py b/Examples/Demos/simul_demo_cyl_SSCA.py index aaa9d40497b84903da1eeee91978d4fac280d943..885c6f0948f925c454c23f6e91170ba445b7473e 100644 --- a/Examples/Demos/simul_demo_cyl_SSCA.py +++ b/Examples/Demos/simul_demo_cyl_SSCA.py @@ -60,8 +60,7 @@ def RunSimulation(): #------------------------------------------------------------- if __name__ == '__main__': result = RunSimulation() + 1 # for log scale - im = pylab.imshow(numpy.rot90(result, 1), - norm=matplotlib.colors.LogNorm(), + im = pylab.imshow(result, norm=matplotlib.colors.LogNorm(), extent=[-4.0, 4.0, 0, 8.0]) pylab.colorbar(im) pylab.xlabel(r'$\phi_f$', fontsize=20) diff --git a/Examples/Demos/simul_demo_cylsphere.py b/Examples/Demos/simul_demo_cylsphere.py index 4e0f3728f8fec04b01ccca5b602c1288d2455970..4952cb38dd0a5a62a93de9a84c67df3290efb046 100644 --- a/Examples/Demos/simul_demo_cylsphere.py +++ b/Examples/Demos/simul_demo_cylsphere.py @@ -51,7 +51,7 @@ def RunSimulation(): #------------------------------------------------------------- if __name__ == '__main__': result = RunSimulation() + 1 # for log scale - im = pylab.imshow(numpy.rot90(result, 1), + im = pylab.imshow(result, norm=matplotlib.colors.LogNorm(), extent=[-4.0, 4.0, 0, 8.0]) pylab.colorbar(im) diff --git a/Examples/Demos/simul_demo_lattice1.py b/Examples/Demos/simul_demo_lattice1.py index e7af7203a8817706eeb2fe5629519eba0674bc96..6aa15b7aabd5b52a84049a5496ff6be1775f4bcb 100644 --- a/Examples/Demos/simul_demo_lattice1.py +++ b/Examples/Demos/simul_demo_lattice1.py @@ -59,7 +59,7 @@ def RunSimulation(): #------------------------------------------------------------- if __name__ == '__main__': result = RunSimulation() - im = pylab.imshow(numpy.rot90(result+1, 1), + im = pylab.imshow(result+1, norm=matplotlib.colors.LogNorm(), extent=[-2.0, 2.0, 0, 4.0]) pylab.colorbar(im) diff --git a/Examples/Demos/simul_demo_lattice2.py b/Examples/Demos/simul_demo_lattice2.py index 4f84e603148059c60046c1939cf8d44ce23a8111..30553659e46047b79696d0010b929ceb27d39787 100644 --- a/Examples/Demos/simul_demo_lattice2.py +++ b/Examples/Demos/simul_demo_lattice2.py @@ -66,7 +66,7 @@ def RunSimulation(): #------------------------------------------------------------- if __name__ == '__main__': result = RunSimulation() - im = pylab.imshow(numpy.rot90(result+1, 1), + im = pylab.imshow(result+1, norm=matplotlib.colors.LogNorm(), extent=[-2.0, 2.0, 0, 4.0]) pylab.colorbar(im) diff --git a/Examples/Demos/simul_demo_movie.py b/Examples/Demos/simul_demo_movie.py index 7020e8fbb03be674311a263288f93083e0dfb94a..eb0bfff833614a8c4122559633a71dc463026f53 100644 --- a/Examples/Demos/simul_demo_movie.py +++ b/Examples/Demos/simul_demo_movie.py @@ -67,9 +67,9 @@ if __name__ == '__main__': ax = fig.add_subplot(111) for i in range(Nframes): SetParameters(i) - result = RunSimulation() + 1 # for log scale + result = RunSimulation() + 1 # for log scale ax.cla() - im = ax.imshow(numpy.rot90(result, 1), vmax=1e3, + im = ax.imshow(result, vmax=1e3, norm=matplotlib.colors.LogNorm(), extent=[-4.0, 4.0, 0, 8.0]) pylab.xlabel(r'$\phi_f$', fontsize=20) diff --git a/Examples/Demos/simul_demo_movie2.py b/Examples/Demos/simul_demo_movie2.py index d48dd1c6196ca095569498547bacf4b72d8cb2eb..45433cb90a8374421b4844afde79485a005fb96e 100644 --- a/Examples/Demos/simul_demo_movie2.py +++ b/Examples/Demos/simul_demo_movie2.py @@ -73,7 +73,7 @@ if __name__ == '__main__': SetParameters(i) result = RunSimulation() + 1 # for log scale ax.cla() - im = ax.imshow(numpy.rot90(result, 1), vmax=1e3, + im = ax.imshow(result, vmax=1e3, norm=matplotlib.colors.LogNorm(), extent=[-4.0, 4.0, 0, 8.0]) pylab.xlabel(r'$\phi_f$', fontsize=20) diff --git a/Examples/Demos/simul_demo_movie3.py b/Examples/Demos/simul_demo_movie3.py index 75a3a7f7380f6d0f640a303f590ff28f6bdef375..870c1ead1607edbeee725b725a73b0e12773bcdc 100644 --- a/Examples/Demos/simul_demo_movie3.py +++ b/Examples/Demos/simul_demo_movie3.py @@ -71,9 +71,9 @@ if __name__ == '__main__': ax = fig.add_subplot(111) for i in range(Nframes): SetParameters(i) - result = RunSimulation() + 1 # for log scale + result = RunSimulation() + 1 # for log scale ax.cla() - im = ax.imshow(numpy.rot90(result, 1), vmax=1e3, + im = ax.imshow(result, vmax=1e3, norm=matplotlib.colors.LogNorm(), extent=[-4.0, 4.0, 0, 8.0]) pylab.xlabel(r'$\phi_f$', fontsize=20) diff --git a/Examples/Demos/simul_demo_polarization.py b/Examples/Demos/simul_demo_polarization.py index 0798084d1025127d3676b6a668e6b396717cecab..e6c17261c4807b73cc7332cd5cd1f299fe02467a 100644 --- a/Examples/Demos/simul_demo_polarization.py +++ b/Examples/Demos/simul_demo_polarization.py @@ -64,7 +64,7 @@ if __name__ == '__main__': intensity_pp, intensity_pm, intensity_mp, intensity_mm = RunSimulation() pylab.subplot(2, 2, 1) pylab.title('Intensity ++') - im = pylab.imshow(numpy.rot90(intensity_pp+1, 1), + im = pylab.imshow(intensity_pp+1, norm=matplotlib.colors.LogNorm(), extent=[-4.0, 4.0, 0, 8.0]) pylab.colorbar(im) @@ -72,7 +72,7 @@ if __name__ == '__main__': pylab.ylabel(r'$\alpha_f$', fontsize=20) pylab.subplot(2, 2, 2) pylab.title('Intensity +-') - im = pylab.imshow(numpy.rot90(intensity_pm+1, 1), + im = pylab.imshow(intensity_pm+1, norm=matplotlib.colors.LogNorm(), extent=[-4.0, 4.0, 0, 8.0]) pylab.colorbar(im) @@ -80,7 +80,7 @@ if __name__ == '__main__': pylab.ylabel(r'$\alpha_f$', fontsize=20) pylab.subplot(2, 2, 3) pylab.title('Intensity -+') - im = pylab.imshow(numpy.rot90(intensity_mp+1, 1), + im = pylab.imshow(intensity_mp+1, norm=matplotlib.colors.LogNorm(), extent=[-4.0, 4.0, 0, 8.0]) pylab.colorbar(im) @@ -88,7 +88,7 @@ if __name__ == '__main__': pylab.ylabel(r'$\alpha_f$', fontsize=20) pylab.subplot(2, 2, 4) pylab.title('Intensity --') - im = pylab.imshow(numpy.rot90(intensity_mm+1, 1), + im = pylab.imshow(intensity_mm+1, norm=matplotlib.colors.LogNorm(), extent=[-4.0, 4.0, 0, 8.0]) pylab.colorbar(im) diff --git a/Examples/python/fitting/ex01_SampleParametersIntro/SampleParametersIntro.py b/Examples/python/fitting/ex01_SampleParametersIntro/SampleParametersIntro.py index fcc56a71381d1411daa7fb1149135f8d40ee32b9..24e791b65b4f229b19dce311de5a60a78fa605c6 100644 --- a/Examples/python/fitting/ex01_SampleParametersIntro/SampleParametersIntro.py +++ b/Examples/python/fitting/ex01_SampleParametersIntro/SampleParametersIntro.py @@ -111,7 +111,7 @@ def draw_results(results): pylab.figure(1) for i in range(0, len(results)): pylab.subplot(2, 2, i+1) - pylab.imshow(numpy.rot90(results[i] + 1, 1),norm=matplotlib.colors.LogNorm(),extent=[-1.0, 1.0, 0, 2.0]) + pylab.imshow(results[i] + 1,norm=matplotlib.colors.LogNorm(),extent=[-1.0, 1.0, 0, 2.0]) pylab.show() diff --git a/Examples/python/fitting/ex02_FitCylindersAndPrisms/FitCylindersPrisms_detailed.py b/Examples/python/fitting/ex02_FitCylindersAndPrisms/FitCylindersPrisms_detailed.py index 2d3ab2f5cb28d43903594b915777fff1951e7087..9f03280e501c4d0f32ff9b7f14dea949c0e6de8c 100644 --- a/Examples/python/fitting/ex02_FitCylindersAndPrisms/FitCylindersPrisms_detailed.py +++ b/Examples/python/fitting/ex02_FitCylindersAndPrisms/FitCylindersPrisms_detailed.py @@ -119,18 +119,18 @@ class DrawObserver(IObserver): real_data = fit_suite.getFitObjects().getRealData().getArray() simulated_data = fit_suite.getFitObjects().getSimulationData().getArray() pylab.subplot(2, 2, 1) - im = pylab.imshow(numpy.rot90(real_data + 1, 1), norm=matplotlib.colors.LogNorm(),extent=[-1.0, 1.0, 0, 2.0]) + im = pylab.imshow(real_data + 1, norm=matplotlib.colors.LogNorm(),extent=[-1.0, 1.0, 0, 2.0]) pylab.colorbar(im) pylab.title('\"Real\" data') # plotting real data pylab.subplot(2, 2, 2) - im = pylab.imshow(numpy.rot90(simulated_data + 1, 1), norm=matplotlib.colors.LogNorm(),extent=[-1.0, 1.0, 0, 2.0]) + im = pylab.imshow(simulated_data + 1, norm=matplotlib.colors.LogNorm(),extent=[-1.0, 1.0, 0, 2.0]) pylab.colorbar(im) pylab.title('Simulated data') # plotting difference map diff_map = (real_data - simulated_data)/numpy.sqrt(real_data + 1) pylab.subplot(2, 2, 3) - im = pylab.imshow(numpy.rot90(diff_map, 1), norm=matplotlib.colors.LogNorm(), extent=[-1.0, 1.0, 0, 2.0], vmin = 0.001, vmax = 1.0) + im = pylab.imshow(diff_map, norm=matplotlib.colors.LogNorm(), extent=[-1.0, 1.0, 0, 2.0], vmin = 0.001, vmax = 1.0) pylab.colorbar(im) pylab.title('Difference map') # plotting parameters info diff --git a/Examples/python/fitting/ex03_FitSpheresInHexLattice/FitSpheresInHexLattice.py b/Examples/python/fitting/ex03_FitSpheresInHexLattice/FitSpheresInHexLattice.py index e5c869620cd87d3e58127be276332f5a578c65d9..f32a05624398cea255353e5c2455acefd66dc35e 100644 --- a/Examples/python/fitting/ex03_FitSpheresInHexLattice/FitSpheresInHexLattice.py +++ b/Examples/python/fitting/ex03_FitSpheresInHexLattice/FitSpheresInHexLattice.py @@ -95,18 +95,18 @@ class DrawObserver(IObserver): real_data = fit_suite.getFitObjects().getRealData().getArray() simulated_data = fit_suite.getFitObjects().getSimulationData().getArray() pylab.subplot(2, 2, 1) - im = pylab.imshow(numpy.rot90(real_data + 1, 1), norm=matplotlib.colors.LogNorm(),extent=[-1.0, 1.0, 0, 2.0]) + im = pylab.imshow(real_data + 1, norm=matplotlib.colors.LogNorm(),extent=[-1.0, 1.0, 0, 2.0]) pylab.colorbar(im) pylab.title('\"Real\" data') # plotting real data pylab.subplot(2, 2, 2) - im = pylab.imshow(numpy.rot90(simulated_data + 1, 1), norm=matplotlib.colors.LogNorm(),extent=[-1.0, 1.0, 0, 2.0]) + im = pylab.imshow(simulated_data + 1, norm=matplotlib.colors.LogNorm(),extent=[-1.0, 1.0, 0, 2.0]) pylab.colorbar(im) pylab.title('Simulated data') # plotting difference map diff_map = (real_data - simulated_data)/(real_data + 1) pylab.subplot(2, 2, 3) - im = pylab.imshow(numpy.rot90(diff_map, 1), norm=matplotlib.colors.LogNorm(), extent=[-1.0, 1.0, 0, 2.0], vmin = 0.001, vmax = 1.0) + im = pylab.imshow(diff_map, norm=matplotlib.colors.LogNorm(), extent=[-1.0, 1.0, 0, 2.0], vmin = 0.001, vmax = 1.0) pylab.colorbar(im) pylab.title('Difference map') # plotting parameters info diff --git a/Examples/python/fitting/ex03_FitSpheresInHexLattice/FitSpheresInHexLattice_builder.py b/Examples/python/fitting/ex03_FitSpheresInHexLattice/FitSpheresInHexLattice_builder.py index caf58caada46c1297078eecbc95a5228783288b3..f08070dd4450b7e4267138762571fe54beaf5d99 100644 --- a/Examples/python/fitting/ex03_FitSpheresInHexLattice/FitSpheresInHexLattice_builder.py +++ b/Examples/python/fitting/ex03_FitSpheresInHexLattice/FitSpheresInHexLattice_builder.py @@ -115,18 +115,18 @@ class DrawObserver(IObserver): real_data = fit_suite.getFitObjects().getRealData().getArray() simulated_data = fit_suite.getFitObjects().getSimulationData().getArray() pylab.subplot(2, 2, 1) - im = pylab.imshow(numpy.rot90(real_data + 1, 1), norm=matplotlib.colors.LogNorm(),extent=[-1.0, 1.0, 0, 2.0]) + im = pylab.imshow(real_data + 1, norm=matplotlib.colors.LogNorm(),extent=[-1.0, 1.0, 0, 2.0]) pylab.colorbar(im) pylab.title('\"Real\" data') # plotting real data pylab.subplot(2, 2, 2) - im = pylab.imshow(numpy.rot90(simulated_data + 1, 1), norm=matplotlib.colors.LogNorm(),extent=[-1.0, 1.0, 0, 2.0]) + im = pylab.imshow(simulated_data + 1, norm=matplotlib.colors.LogNorm(),extent=[-1.0, 1.0, 0, 2.0]) pylab.colorbar(im) pylab.title('Simulated data') # plotting difference map diff_map = (real_data - simulated_data)/(real_data + 1) pylab.subplot(2, 2, 3) - im = pylab.imshow(numpy.rot90(diff_map, 1), norm=matplotlib.colors.LogNorm(), extent=[-1.0, 1.0, 0, 2.0], vmin = 0.001, vmax = 1.0) + im = pylab.imshow(diff_map, norm=matplotlib.colors.LogNorm(), extent=[-1.0, 1.0, 0, 2.0], vmin = 0.001, vmax = 1.0) pylab.colorbar(im) pylab.title('Difference map') # plotting parameters info diff --git a/Examples/python/fitting/ex04_FitScaleAndShift/FitScaleAndShift.py b/Examples/python/fitting/ex04_FitScaleAndShift/FitScaleAndShift.py index d4cf644ede9ac49c933e9503336e780c1d76662b..dce9ebc94275fbdb1aba48587182bdc9ad25f4bc 100644 --- a/Examples/python/fitting/ex04_FitScaleAndShift/FitScaleAndShift.py +++ b/Examples/python/fitting/ex04_FitScaleAndShift/FitScaleAndShift.py @@ -97,18 +97,18 @@ class DrawObserver(IObserver): real_data = fit_suite.getFitObjects().getRealData().getArray() simulated_data = fit_suite.getFitObjects().getSimulationData().getArray() pylab.subplot(2, 2, 1) - im = pylab.imshow(numpy.rot90(real_data + 1, 1), norm=matplotlib.colors.LogNorm(),extent=[-1.0, 1.0, 0, 2.0]) + im = pylab.imshow(real_data + 1, norm=matplotlib.colors.LogNorm(),extent=[-1.0, 1.0, 0, 2.0]) pylab.colorbar(im) pylab.title('\"Real\" data') # plotting simulation data pylab.subplot(2, 2, 2) - im = pylab.imshow(numpy.rot90(simulated_data + 1, 1), norm=matplotlib.colors.LogNorm(),extent=[-1.0, 1.0, 0, 2.0]) + im = pylab.imshow(simulated_data + 1, norm=matplotlib.colors.LogNorm(),extent=[-1.0, 1.0, 0, 2.0]) pylab.colorbar(im) pylab.title('Simulated data') # plotting difference map diff_map = (real_data - simulated_data)/(real_data + 1) pylab.subplot(2, 2, 3) - im = pylab.imshow(numpy.rot90(diff_map, 1), norm=matplotlib.colors.LogNorm(), extent=[-1.0, 1.0, 0, 2.0], vmin = 0.001, vmax = 1.0) + im = pylab.imshow(diff_map, norm=matplotlib.colors.LogNorm(), extent=[-1.0, 1.0, 0, 2.0], vmin = 0.001, vmax = 1.0) pylab.colorbar(im) pylab.title('Difference map') # plotting parameters info diff --git a/Examples/python/fitting/ex05_FitWithMasks/FitWithMasks.py b/Examples/python/fitting/ex05_FitWithMasks/FitWithMasks.py index 5e5b8284acb6e94e9ca9ba0e09692e5cca2c1592..83543d03fbb2791d23e0fc5834a31659077c8a46 100644 --- a/Examples/python/fitting/ex05_FitWithMasks/FitWithMasks.py +++ b/Examples/python/fitting/ex05_FitWithMasks/FitWithMasks.py @@ -92,19 +92,19 @@ class DrawObserver(IObserver): real_data = fit_suite.getFitObjects().getRealData().getArray() simulated_data = fit_suite.getFitObjects().getSimulationData().getArray() pylab.subplot(2, 2, 1) - im = pylab.imshow(numpy.rot90(real_data + 1, 1), norm=matplotlib.colors.LogNorm(),extent=[-1.0, 1.0, 0, 2.0]) + im = pylab.imshow(real_data + 1, norm=matplotlib.colors.LogNorm(),extent=[-1.0, 1.0, 0, 2.0]) pylab.colorbar(im) pylab.title('\"Real\" data') # plotting simulation data pylab.subplot(2, 2, 2) - im = pylab.imshow(numpy.rot90(simulated_data + 1, 1), norm=matplotlib.colors.LogNorm(),extent=[-1.0, 1.0, 0, 2.0]) + im = pylab.imshow(simulated_data + 1, norm=matplotlib.colors.LogNorm(),extent=[-1.0, 1.0, 0, 2.0]) pylab.colorbar(im) pylab.title('Simulated data') # plotting difference map #diff_map = (real_data - simulated_data)/(real_data + 1) diff_map= fit_suite.getFitObjects().getChiSquaredMap().getArray() pylab.subplot(2, 2, 3) - im = pylab.imshow(numpy.rot90(diff_map, 1), norm=matplotlib.colors.LogNorm(), extent=[-1.0, 1.0, 0, 2.0], vmin = 0.001, vmax = 1.0) + im = pylab.imshow(diff_map, norm=matplotlib.colors.LogNorm(), extent=[-1.0, 1.0, 0, 2.0], vmin = 0.001, vmax = 1.0) pylab.colorbar(im) pylab.title('Difference map') # plotting parameters info diff --git a/Examples/python/fitting/ex06_FitStrategies/FitStrategyAdjustMinimizer.py b/Examples/python/fitting/ex06_FitStrategies/FitStrategyAdjustMinimizer.py index 8cb845ab82777eb7845ba1fe90abdf7259ad1660..390a792a7afcb3c66171f8e13dd8a3343d99c20f 100644 --- a/Examples/python/fitting/ex06_FitStrategies/FitStrategyAdjustMinimizer.py +++ b/Examples/python/fitting/ex06_FitStrategies/FitStrategyAdjustMinimizer.py @@ -96,18 +96,18 @@ class DrawObserver(IObserver): real_data = fit_suite.getFitObjects().getRealData().getArray() simulated_data = fit_suite.getFitObjects().getSimulationData().getArray() pylab.subplot(2, 2, 1) - im = pylab.imshow(numpy.rot90(real_data + 1, 1), norm=matplotlib.colors.LogNorm(),extent=[-1.0, 1.0, 0, 2.0]) + im = pylab.imshow(real_data + 1, norm=matplotlib.colors.LogNorm(),extent=[-1.0, 1.0, 0, 2.0]) pylab.colorbar(im) pylab.title('\"Real\" data') # plotting real data pylab.subplot(2, 2, 2) - im = pylab.imshow(numpy.rot90(simulated_data + 1, 1), norm=matplotlib.colors.LogNorm(),extent=[-1.0, 1.0, 0, 2.0]) + im = pylab.imshow(simulated_data + 1, norm=matplotlib.colors.LogNorm(),extent=[-1.0, 1.0, 0, 2.0]) pylab.colorbar(im) pylab.title('Simulated data') # plotting difference map diff_map = (real_data - simulated_data)/(real_data + 1) pylab.subplot(2, 2, 3) - im = pylab.imshow(numpy.rot90(diff_map, 1), norm=matplotlib.colors.LogNorm(), extent=[-1.0, 1.0, 0, 2.0], vmin = 0.001, vmax = 1.0) + im = pylab.imshow(diff_map, norm=matplotlib.colors.LogNorm(), extent=[-1.0, 1.0, 0, 2.0], vmin = 0.001, vmax = 1.0) pylab.colorbar(im) pylab.title('Difference map') # plotting parameters info diff --git a/Examples/python/fitting/ex07_ImportUserData/ImportGALAXIData.py b/Examples/python/fitting/ex07_ImportUserData/ImportGALAXIData.py index a1e3bd222ceb54eac23a2d488a8d1e67323508f5..56b77e94e128730d81a30a15c83c87e73e2a9659 100644 --- a/Examples/python/fitting/ex07_ImportUserData/ImportGALAXIData.py +++ b/Examples/python/fitting/ex07_ImportUserData/ImportGALAXIData.py @@ -135,7 +135,7 @@ def plot_intensity_data(idata, fname=None): pylab.cla() pylab.clf() - pylab.imshow(np.rot90(result, 1), norm=matplotlib.colors.LogNorm(), + pylab.imshow(result, norm=matplotlib.colors.LogNorm(), extent=[degrees(axisphi.getMin()), degrees(axisphi.getMax()), degrees(axisalpha.getMin()), degrees(axisalpha.getMax())], aspect='auto') pylab.xlabel(r'$\phi_f$ [$^{\circ}$]', fontsize=18) diff --git a/Examples/python/fitting/ex07_ImportUserData/ImportMariaData.py b/Examples/python/fitting/ex07_ImportUserData/ImportMariaData.py index a6d226dd7997083f21016eb4bad89ad7320fb2fd..d2b3b41b09b00fe199a500dc5b22ec023d6ed73f 100644 --- a/Examples/python/fitting/ex07_ImportUserData/ImportMariaData.py +++ b/Examples/python/fitting/ex07_ImportUserData/ImportMariaData.py @@ -88,7 +88,7 @@ if __name__ == '__main__': # plotting intensity data object pylab.figure("Imported data in phi_f, alpha_f space") - im = pylab.imshow(numpy.rot90(intensity.getArray(), 1), norm=matplotlib.colors.LogNorm(), + im = pylab.imshow(intensity.getArray(), norm=matplotlib.colors.LogNorm(), extent=[intensity.getAxis(0).getMin(), intensity.getAxis(0).getMax(), intensity.getAxis(1).getMin(), intensity.getAxis(1).getMax()]) pylab.colorbar(im) pylab.xlabel(r'$\phi_f, rad$', fontsize=16) @@ -97,7 +97,7 @@ if __name__ == '__main__': # clipping the dataset clip = IntensityDataFunctions.createClippedDataSet(intensity, -5.0*degree, 0.0*degree, 5.0*degree, 5.0*degree) pylab.figure("Clipped dataset in phi_f, alpha_f space") - im = pylab.imshow(numpy.rot90(clip.getArray(), 1), norm=matplotlib.colors.LogNorm(), aspect='auto', + im = pylab.imshow(clip.getArray(), norm=matplotlib.colors.LogNorm(), aspect='auto', extent=[clip.getAxis(0).getMin(), clip.getAxis(0).getMax(), clip.getAxis(1).getMin(), clip.getAxis(1).getMax()]) pylab.colorbar(im) pylab.xlabel(r'$\phi_f, rad$', fontsize=16) diff --git a/Examples/python/simulation/ex01_BasicParticles/AllFormFactorsAvailable.py b/Examples/python/simulation/ex01_BasicParticles/AllFormFactorsAvailable.py index 181862e7521ed979d14a912e34be6c80ea72863e..a8cb5d166b1b8c05e70605bb85e478b9a0edd376 100644 --- a/Examples/python/simulation/ex01_BasicParticles/AllFormFactorsAvailable.py +++ b/Examples/python/simulation/ex01_BasicParticles/AllFormFactorsAvailable.py @@ -91,7 +91,7 @@ def run_simulation(): pylab.subplots_adjust(wspace=0.3, hspace=0.3) nplot = nplot + 1 - im = pylab.imshow(numpy.rot90(result, 1), norm=matplotlib.colors.LogNorm(), + im = pylab.imshow(result, norm=matplotlib.colors.LogNorm(), extent=[phi_min, phi_max, alpha_min, alpha_max], aspect='auto') pylab.tick_params(axis='both', which='major', labelsize=8) pylab.tick_params(axis='both', which='minor', labelsize=6) diff --git a/Examples/python/simulation/ex01_BasicParticles/CylindersAndPrisms.py b/Examples/python/simulation/ex01_BasicParticles/CylindersAndPrisms.py index 99916fe72583d1fc3db84682451c936346b3c15b..3352ac01d81a29d9bf12b58fda613ad9381b24a3 100644 --- a/Examples/python/simulation/ex01_BasicParticles/CylindersAndPrisms.py +++ b/Examples/python/simulation/ex01_BasicParticles/CylindersAndPrisms.py @@ -64,7 +64,7 @@ def run_simulation(): # showing the result (+1 is added to all intensities for log scale) data = result.getArray() + 1 - im = pylab.imshow(numpy.rot90(data, 1), norm=matplotlib.colors.LogNorm(), + im = pylab.imshow(data, norm=matplotlib.colors.LogNorm(), extent=[phi_min, phi_max, alpha_min, alpha_max]) cb = pylab.colorbar(im) cb.set_label(r'Intensity (arb. u.)', size=16) diff --git a/Examples/python/simulation/ex01_BasicParticles/CylindersInBA.py b/Examples/python/simulation/ex01_BasicParticles/CylindersInBA.py index b7f57d205ea5bdbea5ea5f3d3521da76cf691114..b22b50ec14d7fe8b63ae3c93d38ab82f0d142953 100644 --- a/Examples/python/simulation/ex01_BasicParticles/CylindersInBA.py +++ b/Examples/python/simulation/ex01_BasicParticles/CylindersInBA.py @@ -53,7 +53,7 @@ def run_simulation(): result = simulation.getIntensityData().getArray() + 1 # for log scale # showing the result - im = pylab.imshow(numpy.rot90(result, 1), norm=matplotlib.colors.LogNorm(), + im = pylab.imshow(result, norm=matplotlib.colors.LogNorm(), extent=[phi_min, phi_max, alpha_min, alpha_max], aspect='auto') cb = pylab.colorbar(im) cb.set_label(r'Intensity (arb. u.)', size=16) diff --git a/Examples/python/simulation/ex01_BasicParticles/CylindersInDWBA.py b/Examples/python/simulation/ex01_BasicParticles/CylindersInDWBA.py index 5caad4999504af4e5d47ed13ef4ded5942ae1970..b1104a1a84cbf0cf7e1bf18e1c3932bee4f362e6 100644 --- a/Examples/python/simulation/ex01_BasicParticles/CylindersInDWBA.py +++ b/Examples/python/simulation/ex01_BasicParticles/CylindersInDWBA.py @@ -56,7 +56,7 @@ def run_simulation(): result = simulation.getIntensityData().getArray() + 1 # for log scale # showing the result - im = pylab.imshow(numpy.rot90(result, 1), norm=matplotlib.colors.LogNorm(), + im = pylab.imshow(result, norm=matplotlib.colors.LogNorm(), extent=[phi_min, phi_max, alpha_min, alpha_max], aspect='auto') cb = pylab.colorbar(im) cb.set_label(r'Intensity (arb. u.)', size=16) diff --git a/Examples/python/simulation/ex01_BasicParticles/CylindersWithSizeDistribution.py b/Examples/python/simulation/ex01_BasicParticles/CylindersWithSizeDistribution.py index 06f790f4c257d5df55cbb4857f1f821b0f363b47..4952b9c3c2e86d0b76480d3d2e5aacf796352f5e 100644 --- a/Examples/python/simulation/ex01_BasicParticles/CylindersWithSizeDistribution.py +++ b/Examples/python/simulation/ex01_BasicParticles/CylindersWithSizeDistribution.py @@ -68,7 +68,7 @@ def run_simulation(): result = simulation.getIntensityData().getArray() + 1 # for log scale # showing the result - im = pylab.imshow(numpy.rot90(result, 1), norm=matplotlib.colors.LogNorm(), + im = pylab.imshow(result, norm=matplotlib.colors.LogNorm(), extent=[phi_min, phi_max, alpha_min, alpha_max], aspect='auto') cb = pylab.colorbar(im) cb.set_label(r'Intensity (arb. u.)', size=16) diff --git a/Examples/python/simulation/ex01_BasicParticles/RotatedPyramids.py b/Examples/python/simulation/ex01_BasicParticles/RotatedPyramids.py index 642a421ceb881c22f6980ad65cc94d41ed22d1a1..b16b98ebafbe0bab7b70f16cd1e409ddf65e8f26 100644 --- a/Examples/python/simulation/ex01_BasicParticles/RotatedPyramids.py +++ b/Examples/python/simulation/ex01_BasicParticles/RotatedPyramids.py @@ -57,7 +57,7 @@ def run_simulation(): result = simulation.getIntensityData().getArray() + 1 # for log scale # showing the result - im = pylab.imshow(numpy.rot90(result, 1), norm=matplotlib.colors.LogNorm(), + im = pylab.imshow(result, norm=matplotlib.colors.LogNorm(), extent=[phi_min, phi_max, alpha_min, alpha_max], aspect='auto') cb = pylab.colorbar(im) cb.set_label(r'Intensity (arb. u.)', fontsize=16) diff --git a/Examples/python/simulation/ex01_BasicParticles/TwoTypesOfCylindersWithSizeDistribution.py b/Examples/python/simulation/ex01_BasicParticles/TwoTypesOfCylindersWithSizeDistribution.py index d9df1c7ae57f28ebde5c6bb71f526a7cc01510e1..cd3c7680424201604ab7a8bfdcfc6688dcc62e2d 100644 --- a/Examples/python/simulation/ex01_BasicParticles/TwoTypesOfCylindersWithSizeDistribution.py +++ b/Examples/python/simulation/ex01_BasicParticles/TwoTypesOfCylindersWithSizeDistribution.py @@ -81,7 +81,7 @@ def run_simulation(): result = simulation.getIntensityData().getArray() + 1 # for log scale # showing the result - im = pylab.imshow(numpy.rot90(result, 1), norm=matplotlib.colors.LogNorm(), + im = pylab.imshow(result, norm=matplotlib.colors.LogNorm(), extent=[phi_min, phi_max, alpha_min, alpha_max], aspect='auto') cb = pylab.colorbar(im) cb.set_label(r'Intensity (arb. u.)', size=16) diff --git a/Examples/python/simulation/ex02_LayeredStructures/BuriedParticles.py b/Examples/python/simulation/ex02_LayeredStructures/BuriedParticles.py index ff9b7f2c7b9344f768b4fcb5001c2b084e32bfa1..19304b5fc8cae5a317f38e1f7234a3339cdf649e 100644 --- a/Examples/python/simulation/ex02_LayeredStructures/BuriedParticles.py +++ b/Examples/python/simulation/ex02_LayeredStructures/BuriedParticles.py @@ -61,7 +61,7 @@ def run_simulation(): result = simulation.getIntensityData().getArray() + 1 # for log scale # showing the result - im = pylab.imshow(numpy.rot90(result, 1), norm=matplotlib.colors.LogNorm(), + im = pylab.imshow(result, norm=matplotlib.colors.LogNorm(), extent=[phi_min, phi_max, alpha_min, alpha_max], aspect='auto') cb = pylab.colorbar(im) cb.set_label(r'Intensity (arb. u.)', fontsize=16) diff --git a/Examples/python/simulation/ex02_LayeredStructures/CorrelatedRoughness.py b/Examples/python/simulation/ex02_LayeredStructures/CorrelatedRoughness.py index ab3811bd2bd21b231e45edcbe2214bdaf2f21ad2..f5e004a9bfa052be650059ee9a0b7d80d4adc640 100644 --- a/Examples/python/simulation/ex02_LayeredStructures/CorrelatedRoughness.py +++ b/Examples/python/simulation/ex02_LayeredStructures/CorrelatedRoughness.py @@ -68,7 +68,7 @@ def run_simulation(): result = simulation.getIntensityData().getArray() + 1 # for log scale # showing the result - im = pylab.imshow(numpy.rot90(result, 1), norm=matplotlib.colors.LogNorm(), + im = pylab.imshow(result, norm=matplotlib.colors.LogNorm(), extent=[phi_min, phi_max, alpha_min, alpha_max], aspect='auto') cb = pylab.colorbar(im) cb.set_label(r'Intensity (arb. u.)', fontsize=16) diff --git a/Examples/python/simulation/ex03_InterferenceFunctions/ApproximationDA.py b/Examples/python/simulation/ex03_InterferenceFunctions/ApproximationDA.py index 49326b406c84813a79cb21e1007a0ece736e05d6..57d025ff64d927ed10f710635c8168a6fa311c40 100644 --- a/Examples/python/simulation/ex03_InterferenceFunctions/ApproximationDA.py +++ b/Examples/python/simulation/ex03_InterferenceFunctions/ApproximationDA.py @@ -72,7 +72,7 @@ def run_simulation(): result = simulation.getIntensityData().getArray() + 1 # for log scale # showing the result - im = pylab.imshow(numpy.rot90(result, 1), norm=matplotlib.colors.LogNorm(), + im = pylab.imshow(result, norm=matplotlib.colors.LogNorm(), extent=[phi_min, phi_max, alpha_min, alpha_max], aspect='auto') cb = pylab.colorbar(im) cb.set_label(r'Intensity (arb. u.)', size=16) diff --git a/Examples/python/simulation/ex03_InterferenceFunctions/ApproximationLMA.py b/Examples/python/simulation/ex03_InterferenceFunctions/ApproximationLMA.py index 2c4c32a93240f1f70311ecea96ec6800bcf33990..9d603eabd9a17db23c330c0445e00316bd07ca9a 100644 --- a/Examples/python/simulation/ex03_InterferenceFunctions/ApproximationLMA.py +++ b/Examples/python/simulation/ex03_InterferenceFunctions/ApproximationLMA.py @@ -80,7 +80,7 @@ def run_simulation(): result = simulation.getIntensityData().getArray() + 1 # for log scale # showing the result - im = pylab.imshow(numpy.rot90(result, 1), norm=matplotlib.colors.LogNorm(), + im = pylab.imshow(result, norm=matplotlib.colors.LogNorm(), extent=[phi_min, phi_max, alpha_min, alpha_max], aspect='auto') cb = pylab.colorbar(im) cb.set_label(r'Intensity (arb. u.)', size=16) diff --git a/Examples/python/simulation/ex03_InterferenceFunctions/ApproximationSSCA.py b/Examples/python/simulation/ex03_InterferenceFunctions/ApproximationSSCA.py index 550b62c6a6863dfd2edd3ed360c1c0584f1aaff2..dd582e502d49cd40f29ff9e49a3300d7a4daaa3b 100644 --- a/Examples/python/simulation/ex03_InterferenceFunctions/ApproximationSSCA.py +++ b/Examples/python/simulation/ex03_InterferenceFunctions/ApproximationSSCA.py @@ -74,7 +74,7 @@ def run_simulation(): result = simulation.getIntensityData().getArray() + 1 # for log scale # showing the result - im = pylab.imshow(numpy.rot90(result, 1), norm=matplotlib.colors.LogNorm(), + im = pylab.imshow(result, norm=matplotlib.colors.LogNorm(), extent=[phi_min, phi_max, alpha_min, alpha_max], aspect='auto') cb = pylab.colorbar(im) cb.set_label(r'Intensity (arb. u.)', size=16) diff --git a/Examples/python/simulation/ex03_InterferenceFunctions/CosineRipplesAtRectLattice.py b/Examples/python/simulation/ex03_InterferenceFunctions/CosineRipplesAtRectLattice.py index c25cd7739edcca6d805d3e3c2c89ffaabd843047..ca422e879700bf16e5935781f135aca48373f70f 100644 --- a/Examples/python/simulation/ex03_InterferenceFunctions/CosineRipplesAtRectLattice.py +++ b/Examples/python/simulation/ex03_InterferenceFunctions/CosineRipplesAtRectLattice.py @@ -63,7 +63,7 @@ def run_simulation(): result = simulation.getIntensityData().getArray() + 1 # for log scale # showing the result - im = pylab.imshow(numpy.rot90(result, 1), norm=matplotlib.colors.LogNorm(), + im = pylab.imshow(result, norm=matplotlib.colors.LogNorm(), extent=[phi_min, phi_max, alpha_min, alpha_max], aspect='auto') cb = pylab.colorbar(im) cb.set_label(r'Intensity (arb. u.)', fontsize=16) diff --git a/Examples/python/simulation/ex03_InterferenceFunctions/Interference1DLattice.py b/Examples/python/simulation/ex03_InterferenceFunctions/Interference1DLattice.py index 59ed52d4ecc30f5a0239ec1dddb47861361c4779..b82a85cd269afca3459fc8675f2859a95b715646 100644 --- a/Examples/python/simulation/ex03_InterferenceFunctions/Interference1DLattice.py +++ b/Examples/python/simulation/ex03_InterferenceFunctions/Interference1DLattice.py @@ -65,7 +65,7 @@ def run_simulation(): result = simulation.getIntensityData().getArray() + 1 # for log scale # showing the result - im = pylab.imshow(numpy.rot90(result, 1), norm=matplotlib.colors.LogNorm(), + im = pylab.imshow(result, norm=matplotlib.colors.LogNorm(), extent=[phi_min, phi_max, alpha_min, alpha_max], aspect='auto') cb = pylab.colorbar(im) cb.set_label(r'Intensity (arb. u.)', fontsize=16) diff --git a/Examples/python/simulation/ex03_InterferenceFunctions/Interference1DRadialParaCrystal.py b/Examples/python/simulation/ex03_InterferenceFunctions/Interference1DRadialParaCrystal.py index 91ac516d3c332aa3701bae529c75ceebd0c3e3a5..2a3779302ef709c31ad8c77f2876ee40ab5ee957 100644 --- a/Examples/python/simulation/ex03_InterferenceFunctions/Interference1DRadialParaCrystal.py +++ b/Examples/python/simulation/ex03_InterferenceFunctions/Interference1DRadialParaCrystal.py @@ -63,7 +63,7 @@ def run_simulation(): result = simulation.getIntensityData().getArray() + 1 # for log scale # showing the result - im = pylab.imshow(numpy.rot90(result, 1), norm=matplotlib.colors.LogNorm(), + im = pylab.imshow(result, norm=matplotlib.colors.LogNorm(), extent=[phi_min, phi_max, alpha_min, alpha_max], aspect='auto') cb = pylab.colorbar(im) cb.set_label(r'Intensity (arb. u.)', fontsize=16) diff --git a/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DCenteredSquareLattice.py b/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DCenteredSquareLattice.py index ae82d848279edaf0166396a02321690837e20bb2..b3a2db38f16f961feebbe8311c5c67dfdd8b3872 100644 --- a/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DCenteredSquareLattice.py +++ b/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DCenteredSquareLattice.py @@ -67,7 +67,7 @@ def run_simulation(): result = simulation.getIntensityData().getArray() + 1 # for log scale # showing the result - im = pylab.imshow(numpy.rot90(result, 1), norm=matplotlib.colors.LogNorm(), + im = pylab.imshow(result, norm=matplotlib.colors.LogNorm(), extent=[phi_min, phi_max, alpha_min, alpha_max], aspect='auto') cb = pylab.colorbar(im) cb.set_label(r'Intensity (arb. u.)', fontsize=16) diff --git a/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DLatticeSumOfRotated.py b/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DLatticeSumOfRotated.py index 2ecc10fd4cac173a5f92e777340eeab239ffcf32..6acb05c5fe2138077f823a345c1b07427b35b2fa 100644 --- a/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DLatticeSumOfRotated.py +++ b/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DLatticeSumOfRotated.py @@ -79,7 +79,7 @@ def run_simulation(): OutputData_total.scaleAll(1.0/total_weight) result = OutputData_total.getArray() + 1 # for log scale - pylab.imshow(numpy.rot90(result, 1), norm=matplotlib.colors.LogNorm(), extent=[0.0, 2.0, 0, 2.0]) + pylab.imshow(result, norm=matplotlib.colors.LogNorm(), extent=[0.0, 2.0, 0, 2.0]) pylab.show() diff --git a/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DParaCrystal.py b/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DParaCrystal.py index 4e82530daf4e2d443fc56371a77231cf7f60d1f2..5411f2eb5d67498e608351e92c9b2176ed20ef41 100644 --- a/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DParaCrystal.py +++ b/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DParaCrystal.py @@ -65,7 +65,7 @@ def run_simulation(): result = simulation.getIntensityData().getArray() + 1 # for log scale # showing the result - im = pylab.imshow(numpy.rot90(result, 1), norm=matplotlib.colors.LogNorm(), + im = pylab.imshow(result, norm=matplotlib.colors.LogNorm(), extent=[phi_min, phi_max, alpha_min, alpha_max], aspect='auto') cb = pylab.colorbar(im) cb.set_label(r'Intensity (arb. u.)', fontsize=16) diff --git a/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DRotatedSquareLattice.py b/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DRotatedSquareLattice.py index 2c61bed265bf32b9b82f0d14ea40ce750538cc14..039e20c39e3592b460db29c30ce79e0775e147cb 100644 --- a/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DRotatedSquareLattice.py +++ b/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DRotatedSquareLattice.py @@ -64,7 +64,7 @@ def run_simulation(): result = simulation.getIntensityData().getArray() + 1 # for log scale # showing the result - im = pylab.imshow(numpy.rot90(result, 1), norm=matplotlib.colors.LogNorm(), + im = pylab.imshow(result, norm=matplotlib.colors.LogNorm(), extent=[phi_min, phi_max, alpha_min, alpha_max], aspect='auto') cb = pylab.colorbar(im) cb.set_label(r'Intensity (arb. u.)', fontsize=16) diff --git a/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DSquareLattice.py b/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DSquareLattice.py index 284bcd0f96de1f404c4b76f62ea763a77d1cb322..2dd38cbad72aeec0f373ea1c2222cb8872274484 100644 --- a/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DSquareLattice.py +++ b/Examples/python/simulation/ex03_InterferenceFunctions/Interference2DSquareLattice.py @@ -62,7 +62,7 @@ def run_simulation(): result = simulation.getIntensityData().getArray() + 1 # for log scale # showing the result - im = pylab.imshow(numpy.rot90(result, 1), norm=matplotlib.colors.LogNorm(), + im = pylab.imshow(result, norm=matplotlib.colors.LogNorm(), extent=[phi_min, phi_max, alpha_min, alpha_max], aspect='auto') cb = pylab.colorbar(im) cb.set_label(r'Intensity (arb. u.)', fontsize=16) diff --git a/Examples/python/simulation/ex03_InterferenceFunctions/SpheresAtHexLattice.py b/Examples/python/simulation/ex03_InterferenceFunctions/SpheresAtHexLattice.py index 70736e0bd8f5a9386dcffd76a5bf8c9d975645a7..3c6aca4f8727d253f4b7f6be2c0322eaa787f0ea 100644 --- a/Examples/python/simulation/ex03_InterferenceFunctions/SpheresAtHexLattice.py +++ b/Examples/python/simulation/ex03_InterferenceFunctions/SpheresAtHexLattice.py @@ -59,7 +59,7 @@ def run_simulation(): result = simulation.getIntensityData().getArray() + 1 # for log scale # showing the result - im = pylab.imshow(numpy.rot90(result, 1), norm=matplotlib.colors.LogNorm(), + im = pylab.imshow(result, norm=matplotlib.colors.LogNorm(), extent=[phi_min, phi_max, alpha_min, alpha_max], aspect='auto') cb = pylab.colorbar(im) cb.set_label(r'Intensity (arb. u.)', fontsize=16) diff --git a/Examples/python/simulation/ex03_InterferenceFunctions/TriangularRipple.py b/Examples/python/simulation/ex03_InterferenceFunctions/TriangularRipple.py index c3bb6e0cff611cc09e9c4d5ec555617db329cc35..664659ca06dde39c086396d038da9842735e5084 100644 --- a/Examples/python/simulation/ex03_InterferenceFunctions/TriangularRipple.py +++ b/Examples/python/simulation/ex03_InterferenceFunctions/TriangularRipple.py @@ -63,7 +63,7 @@ def run_simulation(): result = simulation.getIntensityData().getArray() + 1 # for log scale # showing the result - im = pylab.imshow(numpy.rot90(result, 1), norm=matplotlib.colors.LogNorm(), + im = pylab.imshow(result, norm=matplotlib.colors.LogNorm(), extent=[phi_min, phi_max, alpha_min, alpha_max], aspect='auto') cb = pylab.colorbar(im) cb.set_label(r'Intensity (arb. u.)', fontsize=16) diff --git a/Examples/python/simulation/ex04_ComplexShapes/CoreShellNanoparticles.py b/Examples/python/simulation/ex04_ComplexShapes/CoreShellNanoparticles.py index e6a13d3647b458bcd850a5e6c64855765e57f791..a3a203462dd9995e4f253081207492a7761074ae 100644 --- a/Examples/python/simulation/ex04_ComplexShapes/CoreShellNanoparticles.py +++ b/Examples/python/simulation/ex04_ComplexShapes/CoreShellNanoparticles.py @@ -62,7 +62,7 @@ def run_simulation(): result = simulation.getIntensityData().getArray() + 1 # for log scale # showing the result - im = pylab.imshow(numpy.rot90(result, 1), norm=matplotlib.colors.LogNorm(), + im = pylab.imshow(result, norm=matplotlib.colors.LogNorm(), extent=[phi_min, phi_max, alpha_min, alpha_max], aspect='auto') cb = pylab.colorbar(im) cb.set_label(r'Intensity (arb. u.)', fontsize=16) diff --git a/Examples/python/simulation/ex04_ComplexShapes/CustomFormFactor.py b/Examples/python/simulation/ex04_ComplexShapes/CustomFormFactor.py index 918234b766818c105670036afe997631bae9d17f..bd7da895beaf777ff7d66e5a4e092ecda6da2783 100644 --- a/Examples/python/simulation/ex04_ComplexShapes/CustomFormFactor.py +++ b/Examples/python/simulation/ex04_ComplexShapes/CustomFormFactor.py @@ -99,7 +99,7 @@ def run_simulation(): result = simulation.getIntensityData().getArray() # showing the result - im = pylab.imshow(numpy.rot90(result + 1, 1), norm=matplotlib.colors.LogNorm(), + im = pylab.imshow(result, norm=matplotlib.colors.LogNorm(), extent=[phi_min, phi_max, alpha_min, alpha_max], aspect='auto') cb = pylab.colorbar(im) cb.set_label(r'Intensity (arb. u.)', fontsize=16) diff --git a/Examples/python/simulation/ex04_ComplexShapes/HexagonalLatticesWithBasis.py b/Examples/python/simulation/ex04_ComplexShapes/HexagonalLatticesWithBasis.py index f2c7c653dc5d876de044ec79cbaa18fee50c06ab..9c7a0b155df9b0124c91c62245f7a51bb0461ef0 100644 --- a/Examples/python/simulation/ex04_ComplexShapes/HexagonalLatticesWithBasis.py +++ b/Examples/python/simulation/ex04_ComplexShapes/HexagonalLatticesWithBasis.py @@ -65,7 +65,7 @@ def run_simulation(): result = simulation.getIntensityData().getArray() + 1 # for log scale # showing the result - im = pylab.imshow(numpy.rot90(result, 1), norm=matplotlib.colors.LogNorm(), + im = pylab.imshow(result, norm=matplotlib.colors.LogNorm(), extent=[phi_min, phi_max, alpha_min, alpha_max], aspect='auto') cb = pylab.colorbar(im) cb.set_label(r'Intensity (arb. u.)', fontsize=16) diff --git a/Examples/python/simulation/ex04_ComplexShapes/LargeParticlesFormFactor.py b/Examples/python/simulation/ex04_ComplexShapes/LargeParticlesFormFactor.py index 15483bed15410dd39cb4f3fb3276f8597366d95f..5be25bcba53c7511900df44c04298d1d72db265f 100644 --- a/Examples/python/simulation/ex04_ComplexShapes/LargeParticlesFormFactor.py +++ b/Examples/python/simulation/ex04_ComplexShapes/LargeParticlesFormFactor.py @@ -92,7 +92,7 @@ def run_simulation(): # plotting results pylab.subplot(2, 2, i_plot+1) pylab.subplots_adjust(wspace=0.3, hspace=0.3) - im = pylab.imshow(numpy.rot90(result, 1), norm=matplotlib.colors.LogNorm(10, conditions[i_plot]['max']), + im = pylab.imshow(result, norm=matplotlib.colors.LogNorm(10, conditions[i_plot]['max']), extent=[phi_min, phi_max, alpha_min, alpha_max], aspect='auto') pylab.colorbar(im) pylab.xlabel(r'$\phi_f$', fontsize=16) diff --git a/Examples/python/simulation/ex05_BeamAndDetector/BeamDivergence.py b/Examples/python/simulation/ex05_BeamAndDetector/BeamDivergence.py index 0c0b1a4c28e588df332f49d8996dbf0f218cb334..7b75da257e92b661926db0fb44d99b3b83a9c42b 100644 --- a/Examples/python/simulation/ex05_BeamAndDetector/BeamDivergence.py +++ b/Examples/python/simulation/ex05_BeamAndDetector/BeamDivergence.py @@ -65,7 +65,7 @@ def run_simulation(): result = simulation.getIntensityData().getArray() + 1 # for log scale # showing the result - im = pylab.imshow(numpy.rot90(result, 1), norm=matplotlib.colors.LogNorm(), + im = pylab.imshow(result, norm=matplotlib.colors.LogNorm(), extent=[phi_min, phi_max, alpha_min, alpha_max], aspect='auto') cb = pylab.colorbar(im) cb.set_label(r'Intensity (arb. u.)', fontsize=16) diff --git a/Examples/python/simulation/ex05_BeamAndDetector/DetectorResolutionFunction.py b/Examples/python/simulation/ex05_BeamAndDetector/DetectorResolutionFunction.py index f34760585396935421395d45e8aa4327399a8ba4..2e32d9a94d2ed4dc8d59212b12fad5cd6649a6cd 100644 --- a/Examples/python/simulation/ex05_BeamAndDetector/DetectorResolutionFunction.py +++ b/Examples/python/simulation/ex05_BeamAndDetector/DetectorResolutionFunction.py @@ -59,7 +59,7 @@ def run_simulation(): result = simulation.getIntensityData().getArray() + 1 # for log scale # showing the result - im = pylab.imshow(numpy.rot90(result, 1), norm=matplotlib.colors.LogNorm(), + im = pylab.imshow(result, norm=matplotlib.colors.LogNorm(), extent=[phi_min, phi_max, alpha_min, alpha_max], aspect='auto') cb = pylab.colorbar(im) cb.set_label(r'Intensity (arb. u.)', fontsize=16) diff --git a/Examples/python/simulation/ex05_BeamAndDetector/OffSpecularSimulation.py b/Examples/python/simulation/ex05_BeamAndDetector/OffSpecularSimulation.py index bf606daf4751deb60eb5bc76395087acdf4c4673..528bfc56617516110e4bf58e5401cbc4da8524bc 100644 --- a/Examples/python/simulation/ex05_BeamAndDetector/OffSpecularSimulation.py +++ b/Examples/python/simulation/ex05_BeamAndDetector/OffSpecularSimulation.py @@ -70,7 +70,7 @@ def run_simulation(): result = simulation.getIntensityData().getArray() + 1 # for log scale # showing the result - im = pylab.imshow(numpy.rot90(result, 1), norm=matplotlib.colors.LogNorm(), + im = pylab.imshow(result, norm=matplotlib.colors.LogNorm(), extent=[alpha_i_min, alpha_i_max, alpha_f_min, alpha_f_max], aspect='auto') cb = pylab.colorbar(im) cb.set_label(r'Intensity (arb. u.)', fontsize=16) diff --git a/Examples/python/utils/plot_intensity_data.py b/Examples/python/utils/plot_intensity_data.py index d13f65304ff347421c33daca6a35bbfc003385de..a4f8ce135f91c56354d68496b6d791497ef766ec 100644 --- a/Examples/python/utils/plot_intensity_data.py +++ b/Examples/python/utils/plot_intensity_data.py @@ -15,7 +15,7 @@ def plot_intensity_data(file_name): phi_max = rad2deg(intensity.getAxis(0).getMax()) alpha_min = rad2deg(intensity.getAxis(1).getMin()) alpha_max = rad2deg(intensity.getAxis(1).getMax()) - im = pylab.imshow(numpy.rot90(data, 1), norm=matplotlib.colors.LogNorm(), + im = pylab.imshow(data, norm=matplotlib.colors.LogNorm(), extent=[phi_min, phi_max, alpha_min, alpha_max]) cb = pylab.colorbar(im) cb.set_label(r'Intensity (arb. u.)', size=16) diff --git a/Tests/FunctionalTests/TestPyCore/utils.py b/Tests/FunctionalTests/TestPyCore/utils.py index 279d2cd22d7ea9cdfb9604af4156db29517c3f29..2ffebca9fc478e1d412d5203e8a9d97316ef19e5 100644 --- a/Tests/FunctionalTests/TestPyCore/utils.py +++ b/Tests/FunctionalTests/TestPyCore/utils.py @@ -77,7 +77,7 @@ def plot_intensity_data(intensity): phi_max = rad2deg(intensity.getAxis(0).getMax()) alpha_min = rad2deg(intensity.getAxis(1).getMin()) alpha_max = rad2deg(intensity.getAxis(1).getMax()) - im = pylab.imshow(numpy.rot90(data, 1), norm=matplotlib.colors.LogNorm(), + im = pylab.imshow(data, norm=matplotlib.colors.LogNorm(), extent=[phi_min, phi_max, alpha_min, alpha_max]) cb = pylab.colorbar(im) cb.set_label(r'Intensity (arb. u.)', size=16) diff --git a/dev-tools/openmpi/pytests/ompi_isgisaxs01.py b/dev-tools/openmpi/pytests/ompi_isgisaxs01.py index f1193ce1119ca7d22525077c4725383761d6c7ff..08a498ec5be8c68f3a82e2417084fa5102ca115b 100644 --- a/dev-tools/openmpi/pytests/ompi_isgisaxs01.py +++ b/dev-tools/openmpi/pytests/ompi_isgisaxs01.py @@ -93,7 +93,7 @@ def run_simulation(): if(world_rank == 0): print sumresult - #pylab.imshow(numpy.rot90(sumresult + 1, 1), norm=matplotlib.colors.LogNorm(), extent=[-1.0, 1.0, 0, 2.0]) + #pylab.imshow(sumresult + 1, norm=matplotlib.colors.LogNorm(), extent=[-1.0, 1.0, 0, 2.0]) #pylab.show() diff --git a/dev-tools/openmpi/pytests/ompi_isgisaxs01_cpp.py b/dev-tools/openmpi/pytests/ompi_isgisaxs01_cpp.py index dfc84b3651bc1cea539f525412bf5ed8855057cd..9f8fce8542bdffda8d58935b6e51847dbe45faa9 100644 --- a/dev-tools/openmpi/pytests/ompi_isgisaxs01_cpp.py +++ b/dev-tools/openmpi/pytests/ompi_isgisaxs01_cpp.py @@ -72,7 +72,7 @@ def run_simulation(): if(world_rank == 0): sumresult = simulation.getIntensityData().getArray() print sumresult - #pylab.imshow(numpy.rot90(sumresult + 1, 1), norm=matplotlib.colors.LogNorm(), extent=[-1.0, 1.0, 0, 2.0]) + #pylab.imshow(sumresult + 1, norm=matplotlib.colors.LogNorm(), extent=[-1.0, 1.0, 0, 2.0]) #pylab.show() diff --git a/dev-tools/openmpi/pytests/ompi_meso.py b/dev-tools/openmpi/pytests/ompi_meso.py index 588463740f5c2ba780482078fee531e9c5fefe7a..22449e5befb447352254170f1fee8cf6eae9214b 100644 --- a/dev-tools/openmpi/pytests/ompi_meso.py +++ b/dev-tools/openmpi/pytests/ompi_meso.py @@ -213,7 +213,7 @@ def run_simulation(): print result.getArray() axis_phi = result.getAxis(0) axis_alpha = result.getAxis(1) - im = pylab.imshow(numpy.rot90(result.getArray()+1, 1), norm=matplotlib.colors.LogNorm(), + im = pylab.imshow(result.getArray()+1, norm=matplotlib.colors.LogNorm(), extent=[axis_phi.getMin(), axis_phi.getMax(), axis_alpha.getMin(), axis_alpha.getMax()]) pylab.colorbar(im) pylab.xlabel(r'$\phi_f$', fontsize=20) diff --git a/dev-tools/openmpi/pytests/ompi_meso_cpp.py b/dev-tools/openmpi/pytests/ompi_meso_cpp.py index 177464a8d4d1e6df9b19d1f9fc09b59d1f2c0f2c..97810b162b46c103145a2e37cb34b282295a0207 100644 --- a/dev-tools/openmpi/pytests/ompi_meso_cpp.py +++ b/dev-tools/openmpi/pytests/ompi_meso_cpp.py @@ -191,7 +191,7 @@ def run_simulation(): print result.getArray() axis_phi = result.getAxis(0) axis_alpha = result.getAxis(1) - im = pylab.imshow(numpy.rot90(result.getArray()+1, 1), norm=matplotlib.colors.LogNorm(), + im = pylab.imshow(result.getArray()+1, norm=matplotlib.colors.LogNorm(), extent=[axis_phi.getMin(), axis_phi.getMax(), axis_alpha.getMin(), axis_alpha.getMax()]) pylab.colorbar(im) pylab.xlabel(r'$\phi_f$', fontsize=20) diff --git a/dev-tools/openmpi/pytests/round1_sim3_ompi.py b/dev-tools/openmpi/pytests/round1_sim3_ompi.py index dd0266367cf57fd4620454f27edbd8b2f0e023b7..766c163d83d99cc0277b4fb3f90334634cd2e216 100644 --- a/dev-tools/openmpi/pytests/round1_sim3_ompi.py +++ b/dev-tools/openmpi/pytests/round1_sim3_ompi.py @@ -210,7 +210,7 @@ def run_simulation(): print result.getArray() axis_phi = result.getAxis(0) axis_alpha = result.getAxis(1) - im = pylab.imshow(numpy.rot90(result.getArray()+1, 1), norm=matplotlib.colors.LogNorm(vmin=100, vmax=1e7), + im = pylab.imshow(result.getArray()+1, norm=matplotlib.colors.LogNorm(vmin=100, vmax=1e7), extent=[axis_phi.getMin(), axis_phi.getMax(), axis_alpha.getMin(), axis_alpha.getMax()]) pylab.colorbar(im) pylab.xlabel(r'$\phi_f$', fontsize=20)