Skip to content

Commit 284cef3

Browse files
committed
New Proposal for emitting objects. Added Distribution into common for e.g. radar antenna pattern and changed osi_object.proto accordingly.
Signed-off-by: @lukas.elster <lukas.elster@tu-darmstadt.de>
1 parent 9e3e7e2 commit 284cef3

File tree

2 files changed

+76
-4
lines changed

2 files changed

+76
-4
lines changed

osi_common.proto

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -518,3 +518,75 @@ message WavelengthData
518518
optional double samples_number = 3;
519519
}
520520

521+
//
522+
// \brief Distribution of data points and data values
523+
//
524+
// Defines the breakpoints of the corresponding distribution and the corresponding distribution values.
525+
//
526+
message DistributionData
527+
{
528+
// Defines the type of the breakpoints for the distribution function.
529+
//
530+
optional Breakpoints breakpoints = 1;
531+
532+
// Defines the value of breakpoints of the distribution function for continuous or not equally distributed cases.
533+
//
534+
repeated double points = 2;
535+
536+
// Defines the start value, end value and the sample number if distribution has equally discretized breakpoints.
537+
// In case of BREAKPOINTS_SPHERICAL the first one is azimuth and the second is elevation direction.
538+
// In case of BREAKPOINTS_RECTANGULAR the first one is x and the second is y direction
539+
//
540+
repeated double WaveLengthData = 3;
541+
542+
// Defines the type of the distribution.
543+
//
544+
optional Distribution distribution = 4;
545+
546+
// Defines the normalized value of the distribution.
547+
// In case of DISTRIBUTION_EQUAL the value of all points is equal to the double data.
548+
// In case of DISTRIBUTION_GAUSSIAN there has to be two values in the following order:
549+
// expected value, variance
550+
// If the type is DISTRIBUTION_CUSTOM data corresponds to a Lookup-Table with points
551+
// defined in the same message:
552+
// E.g. osi_object.proto: Spherical2d is defined before DistributionData and the number
553+
// of elements in data is equal to the discretization in Spheical2d.
554+
//
555+
// Unit: %
556+
//
557+
repeated double data = 5;
558+
559+
// Definition of distribution types. The values of the data distribution is defined in the field data.
560+
//
561+
enum Breakpoints
562+
{
563+
// The data points of the distribution is user-defined (e.g. breakpoints Lookup-Table).
564+
//
565+
BREAKPOINTS_CUSTOM = 0;
566+
567+
// The distribution corresponds to an equal distribution.
568+
//
569+
BREAKPOINTS_SPHERICAL = 1;
570+
571+
// The distribution corresponds to a Gaussian distribution.
572+
//
573+
BREAKPOINTS_RECTANGULAR = 2;
574+
}
575+
576+
// Definition of distribution types. The values of the data distribution is defined in the field data.
577+
//
578+
enum Distribution
579+
{
580+
// The distribution corresponds to a user-defined distribution (e.g. Lookup-Table).
581+
//
582+
DISTRIBUTION_CUSTOM = 0;
583+
584+
// The distribution corresponds to an equal distribution.
585+
//
586+
DISTRIBUTION_EQUAL = 1;
587+
588+
// The distribution corresponds to a Gaussian distribution.
589+
//
590+
DISTRIBUTION_GAUSSIAN = 2;
591+
}
592+
}

osi_object.proto

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -285,10 +285,10 @@ message StationaryObject
285285
//
286286
repeated WavelengthData wavelength_data = 1;
287287

288-
// Intensities of emitted electromagnetic wave referred to a discrete
289-
// wavelength defined in WavelengthData.
288+
// Original intensities of emitted electromagnetic wave referred to a discrete
289+
// wavelength defined in WavelengthData. This maximum value is weighted based on the DistributionData.
290290
//
291-
// Unit: %
291+
// Unit: W/m^2
292292
//
293293
// \note The size of the message has to be equal to the the size of WavelengthData samples_number
294294
//
@@ -306,7 +306,7 @@ message StationaryObject
306306
//
307307
// \note The size of the message has to be equal to the discretization in beam_angle.
308308
//
309-
repeated double intensity_per_beam = 4;
309+
repeated DistributionData EDF = 4;
310310
}
311311
}
312312
}

0 commit comments

Comments
 (0)