Merge branch 'master' of git.astron.nl:ro/lofar

CAL/CalibrationProcessing/lib/processing/inspect.py

@@ -435,7 +435,7 @@ def _plot_gains_as_frequency(data_table: __DATATABLE_TYPE, target_station, anten
             gains = numpy.stack(gains, axis=1)
             for antenna_idx, gains_per_antenna in enumerate(gains):
                 antenna_id = antenna_list[antenna_idx]
-                figure_name = 'gains_{:}_antenna_{:}_{:}.{}'.format(target_station,
+                figure_name = 'GAINS_{:}_ANTENNA_{:}_{:}.{}'.format(target_station,
                                                                     antenna_id,
                                                                     polarization,
                                                                     DEFAULT_FORMAT)
@@ -452,9 +452,10 @@ def _plot_gains_as_frequency(data_table: __DATATABLE_TYPE, target_station, anten
                 canvas.plot(frequencies / __MHZ_IN_HZ, numpy.angle(gains_per_antenna), '+-')
 
             for freq_id, frequency in enumerate(frequencies):
-                figure_name = 'gains_map_{}_frequency_{:}_{}.{}'.format(target_station,
-                                                                     frequency, polarization, DEFAULT_FORMAT)
-                figure_title = 'gains map {} Freq={:.2f}Mhz'.format(target_station, float(frequency) / __MHZ_IN_HZ)
+                figure_name = 'GAINS_MAP_{}_{:}_{:.2f}_MHz.{}'.format(target_station,
+                                                              polarization,
+                                                              frequency / __MHZ_IN_HZ, DEFAULT_FORMAT)
+                figure_title = 'GAINS MAP {} Freq={:.2f}MHz'.format(target_station, float(frequency) / __MHZ_IN_HZ)
 
                 figure = plt.figure(figure_name)
                 figure.suptitle(figure_title)
@@ -468,10 +469,11 @@ def _plot_gains_as_frequency(data_table: __DATATABLE_TYPE, target_station, anten
                 plt.scatter(antenna_field[:, 0], antenna_field[:, 1], c=numpy.angle(gains[:, freq_id]), vmax=numpy.pi,
                             vmin=-numpy.pi)
 
-                figure_name = 'BEAM_RECONSTRUCTION_{}_frequency_{:}_{:}.{:}'.format(target_station,
-                                                                                    frequency, polarization,
-                                                                                    DEFAULT_FORMAT)
-                figure_title = 'BEAM SHAPE_{}_Freq={:.2f}Mhz_Pol_{:}'.format(target_station,
+                figure_name = 'BEAM_RECONSTRUCTION_{}_{:}_{:.2f}_MHz.{}'.format(target_station,
+                                                                                polarization,
+                                                                                frequency / __MHZ_IN_HZ, 
+                                                                                DEFAULT_FORMAT)
+                figure_title = 'BEAM_SHAPE_{}_Freq={:.2f}MHz_Pol_{:}'.format(target_station,
                                                                              float(frequency) / __MHZ_IN_HZ,
                                                                              polarization)