Changes in osi_common reversed and new structure in osi_object to specify emitting objects.

Signed-off-by: @lukas.elster <lukas.elster@tu-darmstadt.de>

Author: LukasElster

osi_common.proto

@@ -516,77 +516,4 @@ message WavelengthData
     // \note This defines the number of wavelengths to be computed during simulation, not to be confused with samples_per_pixel.
     //
     optional double samples_number = 3;
-}
-
-//
-// \brief Distribution of data points and data values
-//
-// Defines the breakpoints of the corresponding distribution and the corresponding distribution values.
-//
-message DistributionData
-{
-    // Defines the type of the breakpoints for the distribution function.
-    //
-    optional Breakpoints breakpoints = 1;
-
-    // Defines the value of breakpoints of the distribution function for continuous or not equally distributed cases.
-    //
-    repeated double points = 2;
-
-    // Defines the start value, end value and the sample number if distribution has equally discretized breakpoints.
-    // In case of BREAKPOINTS_SPHERICAL the first one is azimuth and the second is elevation direction.
-    // In case of BREAKPOINTS_RECTANGULAR the first one is x- and the second is y-direction.
-    //
-    repeated double WaveLengthData = 3;
-
-    // Defines the type of the data distribution.
-    //
-    optional Distribution distribution = 4;
-
-    // Defines the normalized value of the distribution.
-    // In case of DISTRIBUTION_EQUAL the value of all points is equal to the double data.
-    // In case of DISTRIBUTION_GAUSSIAN there has to be two values in the following order:
-    // expected value, variance
-    // If the type is DISTRIBUTION_CUSTOM data corresponds to a Lookup-Table with points
-    // defined via the breakpoints.
-    // The maximum value of the distribution is defined in the osi message, in which this
-    // message is used.
-    //
-    // Unit: %
-    //
-    repeated double data = 5;
-
-    // Definition of distribution types. The values of the data distribution is defined in the field data.
-    //
-    enum Breakpoints
-    {
-        // The breakpoints of the distribution is user-defined (e.g. breakpoints Lookup-Table).
-        //
-        BREAKPOINTS_CUSTOM = 0;
-
-        // The breakpoints of the distribution are in azimuth and elevation (spherical shape).
-        //
-        BREAKPOINTS_SPHERICAL = 1;
-
-        // The breakpoints of the distribution are in x- and y-coordinates (rectangular shape).
-        //
-        BREAKPOINTS_RECTANGULAR = 2;
-    }
-
-    // Definition of distribution types. The values of the data distribution is defined in the field data.
-    //
-    enum Distribution
-    {
-        // The distribution corresponds to a user-defined distribution (e.g. Lookup-Table).
-        //
-        DISTRIBUTION_CUSTOM = 0;
-
-        // The distribution corresponds to an equal distribution.
-        //
-        DISTRIBUTION_EQUAL = 1;
-
-        // The distribution corresponds to a Gaussian distribution.
-        //
-        DISTRIBUTION_GAUSSIAN = 2;
-    }
 }

osi_object.proto

@@ -275,30 +275,54 @@ message StationaryObject
         }
 
         //
-        // Attributes of type emitting structure
+        // \brief Attributes of type emitting structure
         //
         message EmittingStructureAttribute
         {
-            // In use-cases where a spectral ray-tracer is used, this message
-            // determines the range of the wavelength and its desired number
-            // of samples.
+            // This message determines the range of the wavelength and its
+            // desired number of samples.
             //
             repeated WavelengthData wavelength_data = 1;
 
             // Original intensities of emitted electromagnetic wave referred to a discrete
-            // wavelength defined in WavelengthData. This maximum value is weighted based on the DistributionData.
+            // wavelength defined in WavelengthData. This maximum value is weighted based on the IntensityDistribution.
             //
             // Unit: W/m^2
             //
-            // \note The size of the message has to be equal to the the size of WavelengthData samples_number
+            // \note max_intensity_per_wavelength.size() = WavelengthData.samples_number.size()
             //
-            repeated double intensity_per_wavelength = 2;
+            repeated double max_intensity_per_wavelength = 2;
 
-            // Intensities of emitted electromagnetic wave.
+            // Distribution of the emitted electromagnetic wave's intensity based on the intensity_per_wavelength as
+            // maximum value.
             //
-            // Unit: %
+            repeated IntensityDistribution emitted_intensity_distribution = 3;
+
+            //
+            // \brief Definition of a intensity distribution with a horizontal and a vertical angle
+            // and the corresponding intensity
             //
-            repeated DistributionData EDF = 4;
+            message IntensityDistribution
+            {
+                // Horizontal deflection (azimuth) of emission in emitting object
+                // coordinates.
+                //
+                // Unit: rad
+                optional double horizontal_angle = 1;
+
+                // Vertical deflection (elevation) of emission in emitting object
+                // coordinates.
+                //
+                // Unit: rad
+                optional double vertical_angle = 2;
+
+                // Emitted intensity of emitting object at this point for one specific wavelength.
+                // The value corresponds to the intensity defined in max_intensity_per_wavelength.
+                //
+                // Unit: dB
+                //
+                optional double intensity = 3;
+            }
         }
     }
 }