Skip to content

Commit 1d9e91c

Browse files
committed
Moved the distribution definition to osi_common and deleted the max_intensity based on the recommendations of Philipp Rosenberger
Signed-off-by: @lukas.elster <lukas.elster@tu-darmstadt.de>
1 parent 7a54ed5 commit 1d9e91c

File tree

2 files changed

+38
-44
lines changed

2 files changed

+38
-44
lines changed

osi_common.proto

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -517,3 +517,37 @@ message WavelengthData
517517
//
518518
optional double samples_number = 3;
519519
}
520+
521+
//
522+
// \brief Definition of a spatial signal strength distribution
523+
// for an emitting / transmitting / receiving entity
524+
// with a horizontal and a vertical angle
525+
// and the corresponding signal strength in dBm (decibels per milliwatt).
526+
//
527+
message SpatialSignalStrength
528+
{
529+
// Horizontal angle (azimuth) of emission / transmission / reception
530+
// in the entity's coordinate system.
531+
//
532+
// Unit: rad
533+
//
534+
optional double horizontal_angle = 1;
535+
536+
// Vertical angle (elevation) of emission / transmission / reception
537+
// in the entity's coordinate system.
538+
//
539+
// Unit: rad
540+
//
541+
optional double vertical_angle = 2;
542+
543+
// Emitted / transmitted /received signal strength
544+
// of the emitting / transmitting / receiving entity
545+
// at the previously defined horizontal and
546+
// vertical angle for one specific wavelength.
547+
// The value for the signal strength
548+
// is given in dBm (decibels per milliwatt).
549+
//
550+
// Unit: dBm
551+
//
552+
optional double signal_strength = 3;
553+
}

osi_object.proto

Lines changed: 4 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -286,52 +286,12 @@ message StationaryObject
286286
//
287287
repeated WavelengthData wavelength_data = 1;
288288

289-
// Original intensities of emitted electromagnetic wave referred to a discrete
290-
// wavelength defined in WavelengthData. This maximum value is weighted based
291-
// on the emitted spatial intensity. The size of max_intensitiy_per_wavelength has to be
292-
// equal to the samples in wavelength_data.
289+
// Spatial signal strength distribution of the emitted electromagnetic wave.
290+
// For every sample in wavelength_data an emitted_spatial_signal_strength has to be defined.
293291
//
294-
// Unit: W/m^2
292+
// \note emitted_spatial_signal_strength.size() = WavelengthData.samples_number.size()
295293
//
296-
// \note max_intensity_per_wavelength.size() = WavelengthData.samples_number.size()
297-
//
298-
repeated double max_intensity_per_wavelength = 2;
299-
300-
// Spatial distribution of the emitted electromagnetic wave's intensity based on the intensity_per_wavelength as
301-
// maximum value. For every sample in wavelength_data an emitted_spatial_intensity has to be defined.
302-
//
303-
// \note emitted_spatial_intensity.size() = WavelengthData.samples_number.size()
304-
//
305-
repeated SpatialIntensity emitted_spatial_intensity = 3;
306-
307-
//
308-
// \brief Definition of a spatial intensity distribution with a horizontal and a vertical angle
309-
// and the corresponding intensity related to a maximum intensity.
310-
//
311-
message SpatialIntensity
312-
{
313-
// Horizontal deflection (azimuth) of emission in emitting object
314-
// coordinate system.
315-
//
316-
// Unit: rad
317-
//
318-
optional double horizontal_angle = 1;
319-
320-
// Vertical deflection (elevation) of emission in emitting object
321-
// coordinate system.
322-
//
323-
// Unit: rad
324-
//
325-
optional double vertical_angle = 2;
326-
327-
// Emitted intensity of emitting object at the previously defined horizontal_angle and
328-
// vertical angle for one specific wavelength. The value corresponds to the intensity
329-
// defined in max_intensity_per_wavelength.
330-
//
331-
// Unit: %
332-
//
333-
optional double relative_intensity = 3;
334-
}
294+
repeated SpatialSignalStrength emitted_spatial_signal_strength = 3;
335295
}
336296
}
337297
}

0 commit comments

Comments
 (0)