Skip to content

Commit 75e73ea

Browse files
LukasElsterStefan Cyliax
authored andcommitted
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 da3cb7e commit 75e73ea

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
@@ -579,3 +579,37 @@ message WavelengthData
579579
//
580580
optional double samples_number = 3;
581581
}
582+
583+
//
584+
// \brief Definition of a spatial signal strength distribution
585+
// for an emitting / transmitting / receiving entity
586+
// with a horizontal and a vertical angle
587+
// and the corresponding signal strength in dBm (decibels per milliwatt).
588+
//
589+
message SpatialSignalStrength
590+
{
591+
// Horizontal angle (azimuth) of emission / transmission / reception
592+
// in the entity's coordinate system.
593+
//
594+
// Unit: rad
595+
//
596+
optional double horizontal_angle = 1;
597+
598+
// Vertical angle (elevation) of emission / transmission / reception
599+
// in the entity's coordinate system.
600+
//
601+
// Unit: rad
602+
//
603+
optional double vertical_angle = 2;
604+
605+
// Emitted / transmitted /received signal strength
606+
// of the emitting / transmitting / receiving entity
607+
// at the previously defined horizontal and
608+
// vertical angle for one specific wavelength.
609+
// The value for the signal strength
610+
// is given in dBm (decibels per milliwatt).
611+
//
612+
// Unit: dBm
613+
//
614+
optional double signal_strength = 3;
615+
}

osi_object.proto

Lines changed: 4 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -325,52 +325,12 @@ message StationaryObject
325325
//
326326
repeated WavelengthData wavelength_data = 1;
327327

328-
// Original intensities of emitted electromagnetic wave referred to a discrete
329-
// wavelength defined in WavelengthData. This maximum value is weighted based
330-
// on the emitted spatial intensity. The size of max_intensitiy_per_wavelength has to be
331-
// equal to the samples in wavelength_data.
328+
// Spatial signal strength distribution of the emitted electromagnetic wave.
329+
// For every sample in wavelength_data an emitted_spatial_signal_strength has to be defined.
332330
//
333-
// Unit: W/m^2
331+
// \note emitted_spatial_signal_strength.size() = WavelengthData.samples_number.size()
334332
//
335-
// \note max_intensity_per_wavelength.size() = WavelengthData.samples_number.size()
336-
//
337-
repeated double max_intensity_per_wavelength = 2;
338-
339-
// Spatial distribution of the emitted electromagnetic wave's intensity based on the intensity_per_wavelength as
340-
// maximum value. For every sample in wavelength_data an emitted_spatial_intensity has to be defined.
341-
//
342-
// \note emitted_spatial_intensity.size() = WavelengthData.samples_number.size()
343-
//
344-
repeated SpatialIntensity emitted_spatial_intensity = 3;
345-
346-
//
347-
// \brief Definition of a spatial intensity distribution with a horizontal and a vertical angle
348-
// and the corresponding intensity related to a maximum intensity.
349-
//
350-
message SpatialIntensity
351-
{
352-
// Horizontal deflection (azimuth) of emission in emitting object
353-
// coordinate system.
354-
//
355-
// Unit: rad
356-
//
357-
optional double horizontal_angle = 1;
358-
359-
// Vertical deflection (elevation) of emission in emitting object
360-
// coordinate system.
361-
//
362-
// Unit: rad
363-
//
364-
optional double vertical_angle = 2;
365-
366-
// Emitted intensity of emitting object at the previously defined horizontal_angle and
367-
// vertical angle for one specific wavelength. The value corresponds to the intensity
368-
// defined in max_intensity_per_wavelength.
369-
//
370-
// Unit: %
371-
//
372-
optional double relative_intensity = 3;
373-
}
333+
repeated SpatialSignalStrength emitted_spatial_signal_strength = 3;
374334
}
375335
}
376336
}

0 commit comments

Comments
 (0)