--- a/artifacts/doc/conf/artifacts/bundu.xml	Mon Aug 20 09:42:32 2018 +0200
+++ b/artifacts/doc/conf/artifacts/bundu.xml	Mon Aug 20 09:46:02 2018 +0200
@@ -2,305 +2,305 @@
 <artifact name="bundu">
   <states>
     <state id="state.bundu.river" description="state.bundu.river" helpText="help.state.bundu.river" state="org.dive4elements.river.artifacts.states.RiverSelect">
-      <data name="river" type="String" />
+      <data name="river" type="String"/>
     </state>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
-      <from state="state.bundu.river" />
-      <to state="state.bundu.calculation.mode" />
+      <from state="state.bundu.river"/>
+      <to state="state.bundu.calculation.mode"/>
     </transition>
 
     <state id="state.bundu.calculation.mode" helpText="help.state.bundu.calculation_mode" description="state.bundu.calculation.mode" state="org.dive4elements.river.artifacts.bundu.CalculationSelectBundu">
-      <data name="calculation_mode" type="String" />
+      <data name="calculation_mode" type="String"/>
     </state>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.bundu.calculation.mode" />
-      <to state="state.bundu.location" />
-      <condition data="calculation_mode" value="bundu_analysis" operator="equal" />
+      <from state="state.bundu.calculation.mode"/>
+      <to state="state.bundu.location"/>
+      <condition data="calculation_mode" value="bundu_analysis" operator="equal"/>
     </transition>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.bundu.calculation.mode" />
-      <to state="state.bundu.location" />
-      <condition data="calculation_mode" value="bundu_vollmer" operator="equal" />
+      <from state="state.bundu.calculation.mode"/>
+      <to state="state.bundu.location"/>
+      <condition data="calculation_mode" value="bundu_vollmer" operator="equal"/>
     </transition>
 
     <state id="state.bundu.location" description="state.bundu.location" helpText="help.state.fix.location" state="org.dive4elements.river.artifacts.states.fixation.LocationSelect">
-      <data name="ld_from" type="Double" />
-      <data name="ld_to" type="Double" />
-      <data name="ld_step" type="Double" />
+      <data name="ld_from" type="Double"/>
+      <data name="ld_to" type="Double"/>
+      <data name="ld_step" type="Double"/>
     </state>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.bundu.location" />
-      <to state="state.bundu.period" />
-      <condition data="calculation_mode" value="bundu_vollmer" operator="equal" />
+      <from state="state.bundu.location"/>
+      <to state="state.bundu.period"/>
+      <condition data="calculation_mode" value="bundu_vollmer" operator="equal"/>
     </transition>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.bundu.location" />
-      <to state="state.bundu.period" />
-      <condition data="calculation_mode" value="bundu_analysis" operator="equal" />
+      <from state="state.bundu.location"/>
+      <to state="state.bundu.period"/>
+      <condition data="calculation_mode" value="bundu_analysis" operator="equal"/>
     </transition>
 
     <state id="state.bundu.period" description="state.bundu.period" helpText="help.state.fix.period" state="org.dive4elements.river.artifacts.states.fixation.FixationPeriod">
-      <data name="start" type="Long" />
-      <data name="end" type="Long" />
+      <data name="start" type="Long"/>
+      <data name="end" type="Long"/>
     </state>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
-      <from state="state.bundu.period" />
-      <to state="state.bundu.gaugerange" />
+      <from state="state.bundu.period"/>
+      <to state="state.bundu.gaugerange"/>
     </transition>
 
     <state id="state.bundu.gaugerange" description="state.bundu.gaugerange" helpText="help.state.fix.gaugerange" state="org.dive4elements.river.artifacts.states.fixation.GaugeRange">
-      <data name="q1" type="Integer" />
-      <data name="q2" type="Integer" />
+      <data name="q1" type="Integer"/>
+      <data name="q2" type="Integer"/>
     </state>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
-      <from state="state.bundu.gaugerange" />
-      <to state="state.bundu.eventselect" />
+      <from state="state.bundu.gaugerange"/>
+      <to state="state.bundu.eventselect"/>
     </transition>
 
     <state id="state.bundu.eventselect" description="state.bundu.eventselect" helpText="help.state.fix.eventselect" state="org.dive4elements.river.artifacts.states.fixation.EventSelect">
-      <data name="events" type="intarray" />
+      <data name="events" type="intarray"/>
     </state>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.bundu.eventselect" />
-      <to state="state.bundu.analysis.referenceperiod" />
-      <condition data="calculation_mode" value="bundu_analysis" operator="equal" />
+      <from state="state.bundu.eventselect"/>
+      <to state="state.bundu.analysis.referenceperiod"/>
+      <condition data="calculation_mode" value="bundu_analysis" operator="equal"/>
     </transition>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.bundu.eventselect" />
-      <to state="state.bundu.vollmer.function" />
-      <condition data="calculation_mode" value="bundu_vollmer" operator="equal" />
+      <from state="state.bundu.eventselect"/>
+      <to state="state.bundu.vollmer.function"/>
+      <condition data="calculation_mode" value="bundu_vollmer" operator="equal"/>
     </transition>
 
     <state id="state.bundu.analysis.referenceperiod" helpText="help.state.fix.analysis.referenceperiod" description="state.bundu.analysis.referenceperiod" state="org.dive4elements.river.artifacts.states.fixation.ReferencePeriod">
-      <data name="ref_start" type="Long" />
-      <data name="ref_end" type="Long" />
-    </state>
-
-    <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
-      <from state="state.bundu.analysis.referenceperiod" />
-      <to state="state.bundu.analysis.analysisperiods" />
-    </transition>
-
-    <state id="state.bundu.analysis.analysisperiods" helpText="help.state.fix.analysis.analysisperiods" description="state.bundu.analysis.analysisperiods" state="org.dive4elements.river.artifacts.states.fixation.AnalysisPeriods">
-      <data name="ana_data" type="String" />
+      <data name="ref_start" type="Long"/>
+      <data name="ref_end" type="Long"/>
     </state>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
-      <from state="state.bundu.analysis.analysisperiods" />
-      <to state="state.bundu.analysis.function" />
+      <from state="state.bundu.analysis.referenceperiod"/>
+      <to state="state.bundu.analysis.analysisperiods"/>
     </transition>
 
-    <state id="state.bundu.analysis.function" helpText="help.state.fix.analysis.function" description="state.bundu.analysis.function" state="org.dive4elements.river.artifacts.states.fixation.FunctionSelect">
-      <data name="function" type="String" />
+    <state id="state.bundu.analysis.analysisperiods" helpText="help.state.fix.analysis.analysisperiods" description="state.bundu.analysis.analysisperiods" state="org.dive4elements.river.artifacts.states.fixation.AnalysisPeriods">
+      <data name="ana_data" type="String"/>
     </state>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
-      <from state="state.bundu.analysis.function" />
-      <to state="state.bundu.analysis.preprocessing" />
+      <from state="state.bundu.analysis.analysisperiods"/>
+      <to state="state.bundu.analysis.function"/>
+    </transition>
+
+    <state id="state.bundu.analysis.function" helpText="help.state.fix.analysis.function" description="state.bundu.analysis.function" state="org.dive4elements.river.artifacts.states.fixation.FunctionSelect">
+      <data name="function" type="String"/>
+    </state>
+
+    <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
+      <from state="state.bundu.analysis.function"/>
+      <to state="state.bundu.analysis.preprocessing"/>
     </transition>
 
     <state id="state.bundu.analysis.preprocessing" helpText="help.state.fix.analysis.preprocessing" description="state.bundu.analysis.preprocessing" state="org.dive4elements.river.artifacts.states.fixation.PreprocessingSelect">
-      <data name="preprocessing" type="Boolean" />
+      <data name="preprocessing" type="Boolean"/>
     </state>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
-      <from state="state.bundu.analysis.preprocessing" />
-      <to state="state.bundu.analysis.compute" />
+      <from state="state.bundu.analysis.preprocessing"/>
+      <to state="state.bundu.analysis.compute"/>
     </transition>
 
     <state id="state.bundu.analysis.compute" helpText="help.state.fix.analysis.compute" description="state.bundu.analysis.compute" state="org.dive4elements.river.artifacts.states.fixation.FixAnalysisCompute">
       <outputmodes>
         <outputmode name="fix_deltawt_export" description="output.fix_deltawt_export" mine-type="text/plain" type="export">
           <facets>
-            <facet name="csv" description="facet.fix_deltawt.csv" />
-            <facet name="pdf" description="facet.waterlevel_export.pdf" />
+            <facet name="csv" description="facet.fix_deltawt.csv"/>
+            <facet name="pdf" description="facet.waterlevel_export.pdf"/>
           </facets>
         </outputmode>
         <outputmode name="fix_parameters_export" description="output.fix_parameters_export" mine-type="text/plain" type="export">
           <facets>
-            <facet name="fix_parameters" description="facet.fix_parameters.csv" />
+            <facet name="fix_parameters" description="facet.fix_parameters.csv"/>
           </facets>
         </outputmode>
         <outputmode name="fix_wq_curve_at_export" description="output.fix_wq_curve_at_export" mime-type="text/plain" type="export">
           <facets>
-            <facet name="at" description="facet.fix_wq_curve_export.at" />
+            <facet name="at" description="facet.fix_wq_curve_export.at"/>
           </facets>
         </outputmode>
         <outputmode name="fix_wq_curve" description="output.fix_wq_curve" mine-type="image/png" type="chart">
           <facets>
-            <facet name="fix_sector_average_wq_0" description="Average values for Ws in Q sectors." />
-            <facet name="fix_sector_average_wq_1" description="Average values for Ws in Q sectors." />
-            <facet name="fix_sector_average_wq_2" description="Average values for Ws in Q sectors." />
-            <facet name="fix_sector_average_wq_3" description="Average values for Ws in Q sectors." />
-            <facet name="fix_analysis_events_wq" description="Raw event values used in the calculation" />
-            <facet name="fix_reference_events_wq" description="Raw event values used in the calculation" />
-            <facet name="fix_wq_curve" description="WQ curve" />
-            <facet name="qsectors" description="qsectors." />
-            <facet name="other.wqkms.q" description="W-Type of data" />
-            <facet name="other.wqkms.w" description="W-Type of data" />
-            <facet name="other.wkms" description="facet.other.wkms" />
-            <facet name="other.wkms.marks" description="facet.other.wkms.makrs" />
-            <facet name="other.wqkms" description="facet.other.wqkms" />
-            <facet name="longitudinal_section.w" description="facet.longitudinal_section.w" />
-            <facet name="other.wq" description="Point-like data like fixations" />
-            <facet name="heightmarks_points" description="facet.other.wkms.heightmarks_points" />
-            <facet name="discharge_curve.curve" description="facet.discharge_curve.curve" />
-            <facet name="fix_wq_curve.manualpoints" description="Manual points" />
-            <facet name="mainvalues.q" description="mainvalues.q" />
-            <facet name="mainvalues.w" description="mainvalues.w" />
+            <facet name="fix_sector_average_wq_0" description="Average values for Ws in Q sectors."/>
+            <facet name="fix_sector_average_wq_1" description="Average values for Ws in Q sectors."/>
+            <facet name="fix_sector_average_wq_2" description="Average values for Ws in Q sectors."/>
+            <facet name="fix_sector_average_wq_3" description="Average values for Ws in Q sectors."/>
+            <facet name="fix_analysis_events_wq" description="Raw event values used in the calculation"/>
+            <facet name="fix_reference_events_wq" description="Raw event values used in the calculation"/>
+            <facet name="fix_wq_curve" description="WQ curve"/>
+            <facet name="qsectors" description="qsectors."/>
+            <facet name="other.wqkms.q" description="W-Type of data"/>
+            <facet name="other.wqkms.w" description="W-Type of data"/>
+            <facet name="other.wkms" description="facet.other.wkms"/>
+            <facet name="other.wkms.marks" description="facet.other.wkms.makrs"/>
+            <facet name="other.wqkms" description="facet.other.wqkms"/>
+            <facet name="longitudinal_section.w" description="facet.longitudinal_section.w"/>
+            <facet name="other.wq" description="Point-like data like fixations"/>
+            <facet name="heightmarks_points" description="facet.other.wkms.heightmarks_points"/>
+            <facet name="discharge_curve.curve" description="facet.discharge_curve.curve"/>
+            <facet name="fix_wq_curve.manualpoints" description="Manual points"/>
+            <facet name="mainvalues.q" description="mainvalues.q"/>
+            <facet name="mainvalues.w" description="mainvalues.w"/>
           </facets>
         </outputmode>
         <outputmode name="fix_deltawt_curve" description="output.fix_deltawt_curve" mine-type="image/png" type="chart">
           <facets>
-            <facet name="fix_sector_average_dwt_0" description="Average values for Ws in Q sectors." />
-            <facet name="fix_sector_average_dwt_1" description="Average values for Ws in Q sectors." />
-            <facet name="fix_sector_average_dwt_2" description="Average values for Ws in Q sectors." />
-            <facet name="fix_sector_average_dwt_3" description="Average values for Ws in Q sectors." />
-            <facet name="fix_analysis_events_dwt" description="Raw event values used in the calculation" />
-            <facet name="fix_reference_events_dwt" description="Raw event values used in the calculation" />
-            <facet name="fix_analysis_periods_dwt" description="Dateranges of analysis periods." />
-            <facet name="fix_deviation_dwt" description="The standard variance" />
-            <facet name="fix_deltawt_curve.manualpoints" description="Manual points" />
-            <facet name="fix_reference_period_dwt" description="Reference period" />
+            <facet name="fix_sector_average_dwt_0" description="Average values for Ws in Q sectors."/>
+            <facet name="fix_sector_average_dwt_1" description="Average values for Ws in Q sectors."/>
+            <facet name="fix_sector_average_dwt_2" description="Average values for Ws in Q sectors."/>
+            <facet name="fix_sector_average_dwt_3" description="Average values for Ws in Q sectors."/>
+            <facet name="fix_analysis_events_dwt" description="Raw event values used in the calculation"/>
+            <facet name="fix_reference_events_dwt" description="Raw event values used in the calculation"/>
+            <facet name="fix_analysis_periods_dwt" description="Dateranges of analysis periods."/>
+            <facet name="fix_deviation_dwt" description="The standard variance"/>
+            <facet name="fix_deltawt_curve.manualpoints" description="Manual points"/>
+            <facet name="fix_reference_period_dwt" description="Reference period"/>
           </facets>
         </outputmode>
         <outputmode name="fix_longitudinal_section_curve" description="output.fix_longitudinal_section_curve" mine-type="image/png" type="chart">
           <facets>
-            <facet name="fix_sector_average_ls_0" description="Average values for Ws in Q sectors." />
-            <facet name="fix_sector_average_ls_1" description="Average values for Ws in Q sectors." />
-            <facet name="fix_sector_average_ls_2" description="Average values for Ws in Q sectors." />
-            <facet name="fix_sector_average_ls_3" description="Average values for Ws in Q sectors." />
-            <facet name="fix_sector_average_ls_deviation_0" description="Average values for Ws in Q sectors." />
-            <facet name="fix_sector_average_ls_deviation_1" description="Average values for Ws in Q sectors." />
-            <facet name="fix_sector_average_ls_deviation_2" description="Average values for Ws in Q sectors." />
-            <facet name="fix_sector_average_ls_deviation_3" description="Average values for Ws in Q sectors." />
-            <facet name="longitudinal_section.annotations" description="facet.longitudinal_section.annotations" />
-            <facet name="fix_deviation_ls" description="The standard variance" />
-            <facet name="fix_analysis_events_ls" description="Average values for Ws in Q sectors." />
-            <facet name="fix_reference_events_ls" description="Average values for Ws in Q sectors." />
-            <facet name="fix_longitudinal_section_curve.manualpoints" description="Manual points" />
-            <facet name="other.wqkms.q" description="W-Type of data" />
-            <facet name="other.wqkms.w" description="W-Type of data" />
+            <facet name="fix_sector_average_ls_0" description="Average values for Ws in Q sectors."/>
+            <facet name="fix_sector_average_ls_1" description="Average values for Ws in Q sectors."/>
+            <facet name="fix_sector_average_ls_2" description="Average values for Ws in Q sectors."/>
+            <facet name="fix_sector_average_ls_3" description="Average values for Ws in Q sectors."/>
+            <facet name="fix_sector_average_ls_deviation_0" description="Average values for Ws in Q sectors."/>
+            <facet name="fix_sector_average_ls_deviation_1" description="Average values for Ws in Q sectors."/>
+            <facet name="fix_sector_average_ls_deviation_2" description="Average values for Ws in Q sectors."/>
+            <facet name="fix_sector_average_ls_deviation_3" description="Average values for Ws in Q sectors."/>
+            <facet name="longitudinal_section.annotations" description="facet.longitudinal_section.annotations"/>
+            <facet name="fix_deviation_ls" description="The standard variance"/>
+            <facet name="fix_analysis_events_ls" description="Average values for Ws in Q sectors."/>
+            <facet name="fix_reference_events_ls" description="Average values for Ws in Q sectors."/>
+            <facet name="fix_longitudinal_section_curve.manualpoints" description="Manual points"/>
+            <facet name="other.wqkms.q" description="W-Type of data"/>
+            <facet name="other.wqkms.w" description="W-Type of data"/>
           </facets>
         </outputmode>
         <outputmode name="fix_derivate_curve" description="output.fix_derivate_curve" mine-type="image/png" type="chart">
           <facets>
-            <facet name="fix_derivate_curve" description="Derivate curve" />
-            <facet name="fix_derivate_curve.manualpoints" description="Manual points" />
+            <facet name="fix_derivate_curve" description="Derivate curve"/>
+            <facet name="fix_derivate_curve.manualpoints" description="Manual points"/>
           </facets>
         </outputmode>
         <outputmode name="fix_report" description="output.fix_report.report" mime-type="text/plain" type="report">
           <facets>
-            <facet name="report" description="facet.fix.report" />
+            <facet name="report" description="facet.fix.report"/>
           </facets>
         </outputmode>
       </outputmodes>
     </state>
 
     <state id="state.bundu.vollmer.function" helpText="help.state.fix.vollmer.function" description="state.bundu.vollmer.function" state="org.dive4elements.river.artifacts.states.fixation.FunctionSelect">
-      <data name="function" type="String" />
+      <data name="function" type="String"/>
     </state>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
-      <from state="state.bundu.vollmer.function" />
-      <to state="state.bundu.vollmer.preprocessing" />
+      <from state="state.bundu.vollmer.function"/>
+      <to state="state.bundu.vollmer.preprocessing"/>
     </transition>
 
     <state id="state.bundu.vollmer.preprocessing" helpText="help.state.fix.vollmer.preprocessing" description="state.bundu.vollmer.preprocessing" state="org.dive4elements.river.artifacts.states.fixation.PreprocessingSelect">
-      <data name="preprocessing" type="Boolean" />
+      <data name="preprocessing" type="Boolean"/>
     </state>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
-      <from state="state.bundu.vollmer.preprocessing" />
-      <to state="state.bundu.vollmer.qs" />
+      <from state="state.bundu.vollmer.preprocessing"/>
+      <to state="state.bundu.vollmer.qs"/>
     </transition>
 
     <state id="state.bundu.vollmer.qs" description="state.bundu.vollmer.qs" helpText="help.state.fix.vollmer.qs" state="org.dive4elements.river.artifacts.states.WQFixing">
-      <data name="wq_isq" type="String" />
-      <data name="wq_values" type="WQTriple" />
+      <data name="wq_isq" type="String"/>
+      <data name="wq_values" type="WQTriple"/>
     </state>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
-      <from state="state.bundu.vollmer.qs" />
-      <to state="state.bundu.vollmer.compute" />
+      <from state="state.bundu.vollmer.qs"/>
+      <to state="state.bundu.vollmer.compute"/>
     </transition>
 
     <state id="state.bundu.vollmer.compute" helpText="help.state.fix.vollmer.compute" description="state.bundu.vollmer.compute" state="org.dive4elements.river.artifacts.states.fixation.FixRealizingCompute">
       <outputmodes>
         <outputmode name="longitudinal_section" description="output.longitudinal_section" mime-type="image/png" type="chart">
           <facets>
-            <facet name="longitudinal_section.w" description="facet.longitudinal_section.w" />
-            <facet name="longitudinal_section.q" description="facet.longitudinal_section.q" />
-            <facet name="w_differences" description="facet.w_differences" />
-            <facet name="other.wkms" description="facet.other.wkms" />
-            <facet name="other.wq" description="WQ-Type of data" />
-            <facet name="other.wqkms" description="facet.other.wqkms" />
-            <facet name="other.wqkms.q" description="W-Type of data" />
-            <facet name="other.wqkms.w" description="W-Type of data" />
-            <facet name="heightmarks_points" description="facet.other.wkms.heightmarks_points" />
-            <facet name="longitudinal_section.annotations" description="facet.longitudinal_section.annotations" />
-            <facet name="longitudinal_section.area" description="facet.longitudinal_section.area" />
-            <facet name="longitudinal_section.manualpoints" description="Manuelle Punkte" />
+            <facet name="longitudinal_section.w" description="facet.longitudinal_section.w"/>
+            <facet name="longitudinal_section.q" description="facet.longitudinal_section.q"/>
+            <facet name="w_differences" description="facet.w_differences"/>
+            <facet name="other.wkms" description="facet.other.wkms"/>
+            <facet name="other.wq" description="WQ-Type of data"/>
+            <facet name="other.wqkms" description="facet.other.wqkms"/>
+            <facet name="other.wqkms.q" description="W-Type of data"/>
+            <facet name="other.wqkms.w" description="W-Type of data"/>
+            <facet name="heightmarks_points" description="facet.other.wkms.heightmarks_points"/>
+            <facet name="longitudinal_section.annotations" description="facet.longitudinal_section.annotations"/>
+            <facet name="longitudinal_section.area" description="facet.longitudinal_section.area"/>
+            <facet name="longitudinal_section.manualpoints" description="Manuelle Punkte"/>
           </facets>
         </outputmode>
         <outputmode name="fix_wq_curve" description="output.fix_wq_curve" mine-type="image/png" type="chart">
           <facets>
-            <facet name="fix_sector_average_wq_0" description="Average values for Ws in Q sectors." />
-            <facet name="fix_sector_average_wq_1" description="Average values for Ws in Q sectors." />
-            <facet name="fix_sector_average_wq_2" description="Average values for Ws in Q sectors." />
-            <facet name="fix_sector_average_wq_3" description="Average values for Ws in Q sectors." />
-            <facet name="fix_analysis_events_wq" description="Raw event values used in the calculation" />
-            <facet name="fix_wq_curve" description="WQ curve" />
-            <facet name="fix_wq_ls" description="WQ LS curve" />
-            <facet name="qsectors" description="qsectors." />
-            <facet name="fix_events_wqkms" description="WQKMS-Type of data" />
-            <facet name="other.wqkms.q" description="W-Type of data" />
-            <facet name="other.wqkms.w" description="W-Type of data" />
-            <facet name="other.wkms" description="facet.other.wqkms" />
-            <facet name="other.wqkms" description="facet.other.wqkms" />
+            <facet name="fix_sector_average_wq_0" description="Average values for Ws in Q sectors."/>
+            <facet name="fix_sector_average_wq_1" description="Average values for Ws in Q sectors."/>
+            <facet name="fix_sector_average_wq_2" description="Average values for Ws in Q sectors."/>
+            <facet name="fix_sector_average_wq_3" description="Average values for Ws in Q sectors."/>
+            <facet name="fix_analysis_events_wq" description="Raw event values used in the calculation"/>
+            <facet name="fix_wq_curve" description="WQ curve"/>
+            <facet name="fix_wq_ls" description="WQ LS curve"/>
+            <facet name="qsectors" description="qsectors."/>
+            <facet name="fix_events_wqkms" description="WQKMS-Type of data"/>
+            <facet name="other.wqkms.q" description="W-Type of data"/>
+            <facet name="other.wqkms.w" description="W-Type of data"/>
+            <facet name="other.wkms" description="facet.other.wqkms"/>
+            <facet name="other.wqkms" description="facet.other.wqkms"/>
             <!--issue1383: facet name="longitudinal_section.w" description="facet.longitudinal_section.w"/ -->
-            <facet name="other.wq" description="Point-like data like fixations" />
-            <facet name="heightmarks_points" description="facet.other.wkms.heightmarks_points" />
-            <facet name="discharge_curve.curve" description="facet.discharge_curve.curve" />
-            <facet name="mainvalues.w" description="facet.fix_wq.mainvalues.w" />
-            <facet name="mainvalues.q" description="facet.fix_wq.mainvalues.q" />
+            <facet name="other.wq" description="Point-like data like fixations"/>
+            <facet name="heightmarks_points" description="facet.other.wkms.heightmarks_points"/>
+            <facet name="discharge_curve.curve" description="facet.discharge_curve.curve"/>
+            <facet name="mainvalues.w" description="facet.fix_wq.mainvalues.w"/>
+            <facet name="mainvalues.q" description="facet.fix_wq.mainvalues.q"/>
           </facets>
         </outputmode>
         <outputmode name="cross_section" description="output.cross_section" mime-type="image/png" type="chart">
           <facets>
-            <facet name="cross_section_water_line" description="facet.cross_section_water_line" />
-            <facet name="cross_section" description="facet.cross_section" />
-            <facet name="area" description="an area" />
-            <facet name="cross_section.area" description="an area" />
-            <facet name="cross_section.manualpoints" description="points" />
-            <facet name="cross_section.manualline" description="line" />
-            <facet name="hyk" description="hyks" />
+            <facet name="cross_section_water_line" description="facet.cross_section_water_line"/>
+            <facet name="cross_section" description="facet.cross_section"/>
+            <facet name="area" description="an area"/>
+            <facet name="cross_section.area" description="an area"/>
+            <facet name="cross_section.manualpoints" description="points"/>
+            <facet name="cross_section.manualline" description="line"/>
+            <facet name="hyk" description="hyks"/>
           </facets>
         </outputmode>
         <outputmode name="fix_wq_curve_at_export" description="output.fix_wq_curve_at_export" mime-type="text/plain" type="export">
           <facets>
-            <facet name="at" description="facet.fix_wq_curve_export.at" />
+            <facet name="at" description="facet.fix_wq_curve_export.at"/>
           </facets>
         </outputmode>
         <outputmode name="fix_waterlevel_export" description="output.fix_waterlevel_export" mine-type="text/plain" type="export">
           <facets>
-            <facet name="csv" description="facet.waterlevel_export.csv" />
-            <facet name="wst" description="facet.waterlevel_export.wst" />
-            <facet name="pdf" description="facet.waterlevel_export.pdf" />
+            <facet name="csv" description="facet.waterlevel_export.csv"/>
+            <facet name="wst" description="facet.waterlevel_export.wst"/>
+            <facet name="pdf" description="facet.waterlevel_export.pdf"/>
           </facets>
         </outputmode>
         <outputmode name="fix_report" description="output.fix_report.report" mime-type="text/plain" type="report">
           <facets>
-            <facet name="report" description="facet.fix.report" />
+            <facet name="report" description="facet.fix.report"/>
           </facets>
         </outputmode>
       </outputmodes>
@@ -320,200 +320,222 @@
     <!-- Bezugswasserstände bezugswst -->
     <!-- clone, otherwise conditions won't work -->
     <state id="state.bundu.wst.location" description="state.bundu.wst.location" helpText="help.state.bundu.wst.location" state="org.dive4elements.river.artifacts.states.fixation.LocationSelect">
-      <data name="ld_from" type="Double" />
-      <data name="ld_to" type="Double" />
-      <data name="ld_step" type="Double" />
+      <data name="ld_from" type="Double"/>
+      <data name="ld_to" type="Double"/>
+      <data name="ld_step" type="Double"/>
     </state>
 
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.bundu.calculation.mode" />
-      <to state="state.bundu.wst.location" />
-      <condition data="calculation_mode" value="bundu_bezugswst" operator="equal" />
+      <from state="state.bundu.calculation.mode"/>
+      <to state="state.bundu.wst.location"/>
+      <condition data="calculation_mode" value="bundu_bezugswst" operator="equal"/>
     </transition>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.bundu.wst.location" />
-      <to state="state.bundu.wst.yearselect" />
-      <condition data="calculation_mode" value="bundu_bezugswst" operator="equal" />
+      <from state="state.bundu.wst.location"/>
+      <to state="state.bundu.wst.yearselect"/>
+      <condition data="calculation_mode" value="bundu_bezugswst" operator="equal"/>
     </transition>
 
 
     <state id="state.bundu.wst.yearselect" helpText="help.state.bundu.wst.yearselect" description="state.bundu.wst.yearselect" state="org.dive4elements.river.artifacts.bundu.bezugswst.FixationPeriod">
-      <data name="singleyear" type="String" />
-      <data name="events_temp" type="String" /> <!-- String. -->
+      <data name="singleyear" type="String"/>
+      <data name="events_temp" type="String"/> <!-- String. -->
     </state>
 
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.bundu.wst.yearselect" />
-      <to state="state.bundu.wst.fixationchoice" />
-      <condition data="calculation_mode" value="bundu_bezugswst" operator="equal" />
+      <from state="state.bundu.wst.yearselect"/>
+      <to state="state.bundu.wst.fixationchoice"/>
+      <condition data="calculation_mode" value="bundu_bezugswst" operator="equal"/>
     </transition>
 
     <state id="state.bundu.wst.fixationchoice" helpText="help.state.bundu.wst.fixationchoice" description="state.bundu.wst.fixationchoice" state="org.dive4elements.river.artifacts.bundu.bezugswst.FixationChoice">
-      <data name="fix_choice" type="String" />
-      <data name="q1" type="Integer" />
-      <data name="q2" type="Integer" /> <!-- necessary, because they will be set automatically -->
-      <data name="start" type="Long" /> <!--copy from Period, to fill it in LoadQSeriesSelectState (necessary for auto-select events) -->
-      <data name="end" type="Long" />
-      <data name="events" type="intarray" />
+      <data name="fix_choice" type="String"/>
+      <data name="q1" type="Integer"/>
+      <data name="q2" type="Integer"/> <!-- necessary, because they will be set automatically -->
+      <data name="start" type="Long"/> <!--copy from Period, to fill it in LoadQSeriesSelectState (necessary for auto-select events) -->
+      <data name="end" type="Long"/>
+      <data name="events" type="intarray"/>
     </state>
 
 
 
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.bundu.wst.fixationchoice" />
-      <to state="state.bundu.wst.fix.load.year_length" />
-      <condition data="fix_choice" value="state.bundu.wst.fix.auto" operator="equal" />
+      <from state="state.bundu.wst.fixationchoice"/>
+      <to state="state.bundu.wst.fix.load.year_length"/>
+      <condition data="fix_choice" value="state.bundu.wst.fix.auto" operator="equal"/>
     </transition>
 
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.bundu.wst.fixationchoice" />
-      <to state="state.bundu.wst.gaugerange" />
-      <condition data="fix_choice" value="state.bundu.wst.fix.manual" operator="equal" />
+      <from state="state.bundu.wst.fixationchoice"/>
+      <to state="state.bundu.wst.gaugerange"/>
+      <condition data="fix_choice" value="state.bundu.wst.fix.manual" operator="equal"/>
     </transition>
 
     <state id="state.bundu.wst.gaugerange" description="state.bundu.wst.gaugerange" helpText="help.state.bundu.wst.gaugerange" state="org.dive4elements.river.artifacts.states.fixation.GaugeRange">
-      <data name="q1" type="Integer" />
-      <data name="q2" type="Integer" />
+      <data name="q1" type="Integer"/>
+      <data name="q2" type="Integer"/>
     </state>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.bundu.wst.gaugerange" />
-      <to state="state.bundu.wst.eventselect" />
-      <condition data="calculation_mode" value="bundu_bezugswst" operator="equal" />
+      <from state="state.bundu.wst.gaugerange"/>
+      <to state="state.bundu.wst.eventselect"/>
+      <condition data="calculation_mode" value="bundu_bezugswst" operator="equal"/>
     </transition>
 
     <!-- clone; conditions... -->
     <state id="state.bundu.wst.eventselect" description="state.bundu.wst.eventselect" helpText="help.state.bundu.wst.eventselect" state="org.dive4elements.river.artifacts.states.fixation.EventSelect">
-      <data name="events" type="intarray" />
+      <data name="events" type="intarray"/>
     </state>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.bundu.wst.eventselect" />
-      <to state="state.bundu.wst.fix.load.year_length" />
-      <condition data="calculation_mode" value="bundu_bezugswst" operator="equal" />
+      <from state="state.bundu.wst.eventselect"/>
+      <to state="state.bundu.wst.fix.load.year_length"/>
+      <condition data="calculation_mode" value="bundu_bezugswst" operator="equal"/>
     </transition>
 
 
     <state id="state.bundu.wst.fix.load.year_length" helpText="help.state.bundu.wst.fix.load.year_length" description="state.bundu.wst.fix.load.year_length" state="org.dive4elements.river.artifacts.bundu.bezugswst.LoadQSeriesSelectState">
-      <data name="year_input_q_series" type="String" />
+      <data name="year_input_q_series" type="String"/>
     </state>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.bundu.wst.fix.load.year_length" />
-      <to state="state.bundu.wst.qs" />
-      <condition data="calculation_mode" value="bundu_bezugswst" operator="equal" />
+      <from state="state.bundu.wst.fix.load.year_length"/>
+      <to state="state.bundu.wst.qs"/>
+      <condition data="calculation_mode" value="bundu_bezugswst" operator="equal"/>
     </transition>
 
     <state id="state.bundu.wst.qs" description="state.bundu.wst.qs" helpText="help.state.bundu.wst.qs" state="org.dive4elements.river.artifacts.bundu.bezugswst.BunduWstWQFixing">
-      <data name="bundu.wst.mode" type="String" />
-      <data name="wq_values" type="WQTriple" />
-      <data name="bundu.wst.ud_value" type="Integer" />
+      <data name="bundu.wst.mode" type="String"/>
+      <data name="wq_values" type="WQTriple"/>
+      <data name="bundu.wst.ud_value" type="Integer"/>
     </state>
 
 
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.bundu.wst.qs" />
-      <to state="state.bundu.wst.load.calc_choice" />
-      <condition data="calculation_mode" value="bundu_bezugswst" operator="equal" />
+      <from state="state.bundu.wst.qs"/>
+      <to state="state.bundu.wst.load.calc_choice"/>
+      <condition data="calculation_mode" value="bundu_bezugswst" operator="equal"/>
     </transition>
 
     <state id="state.bundu.wst.load.calc_choice" helpText="help.state.bundu.wst.load.calc_choice" description="state.bundu.wst.load.calc_choice" state="org.dive4elements.river.artifacts.bundu.bezugswst.CalcChoice">
-      <data name="calc_choice" type="String" />
-      <data name="function" type="String" /> <!-- function, preprocessing will be set, if auto is selected -->
-      <data name="preprocessing" type="Boolean" />
+      <data name="calc_choice" type="String"/>
+      <data name="function" type="String"/> <!-- function, preprocessing will be set, if auto is selected -->
+      <data name="preprocessing" type="Boolean"/>
     </state>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.bundu.wst.load.calc_choice" />
-      <to state="state.bundu.wst.load.function" />
-      <condition data="calc_choice" value="state.bundu.wst.calc.manual" operator="equal" />
+      <from state="state.bundu.wst.load.calc_choice"/>
+      <to state="state.bundu.wst.load.function"/>
+      <condition data="calc_choice" value="state.bundu.wst.calc.manual" operator="equal"/>
     </transition>
 
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.bundu.wst.load.calc_choice" />
-      <to state="state.bundu.wst.load.missing_volume" />
-      <condition data="calc_choice" value="state.bundu.wst.calc.auto" operator="equal" />
+      <from state="state.bundu.wst.load.calc_choice"/>
+      <to state="state.bundu.wst.load.missing_volume"/>
+      <condition data="calc_choice" value="state.bundu.wst.calc.auto" operator="equal"/>
     </transition>
 
     <state id="state.bundu.wst.load.function" helpText="help.state.bundu.wst.function" description="state.bundu.wst.load.function" state="org.dive4elements.river.artifacts.states.fixation.FunctionSelect">
-      <data name="function" type="String" />
+      <data name="function" type="String"/>
     </state>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.bundu.wst.load.function" />
-      <to state="state.bundu.wst.load.preprocessing" />
-      <condition data="calculation_mode" value="bundu_bezugswst" operator="equal" />
+      <from state="state.bundu.wst.load.function"/>
+      <to state="state.bundu.wst.load.preprocessing"/>
+      <condition data="calculation_mode" value="bundu_bezugswst" operator="equal"/>
     </transition>
 
     <state id="state.bundu.wst.load.preprocessing" helpText="help.state.bundu.wst.load.preprocessing" description="state.bundu.wst.load.preprocessing" state="org.dive4elements.river.artifacts.states.fixation.PreprocessingSelect">
-      <data name="preprocessing" type="Boolean" />
+      <data name="preprocessing" type="Boolean"/>
     </state>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.bundu.wst.load.preprocessing" />
-      <to state="state.bundu.wst.load.missing_volume" />
-      <condition data="calculation_mode" value="bundu_bezugswst" operator="equal" />
+      <from state="state.bundu.wst.load.preprocessing"/>
+      <to state="state.bundu.wst.load.missing_volume"/>
+      <condition data="calculation_mode" value="bundu_bezugswst" operator="equal"/>
     </transition>
 
     <state id="state.bundu.wst.load.missing_volume" helpText="help.state.bundu.wst.load.missing_volume" description="state.bundu.wst.load.missing_volume" state="org.dive4elements.river.artifacts.bundu.bezugswst.MissingVolumeSelect">
-      <data name="missing_volume" type="Boolean" />
+      <data name="missing_volume" type="Boolean"/>
     </state>
 
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.bundu.wst.load.missing_volume" />
-      <to state="state.bundu.wst.load.distance_only_part" />
-      <condition data="missing_volume" value="true" operator="equal" />
+      <from state="state.bundu.wst.load.missing_volume"/>
+      <to state="state.bundu.wst.load.distance_only_part"/>
+      <condition data="missing_volume" value="true" operator="equal"/>
     </transition>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.bundu.wst.load.missing_volume" />
-      <to state="state.bundu.wst.soundings" />
-      <condition data="missing_volume" value="false" operator="equal" />
+      <from state="state.bundu.wst.load.missing_volume"/>
+      <to state="state.bundu.wst.soundings"/>
+      <condition data="missing_volume" value="false" operator="equal"/>
     </transition>
 
     <state id="state.bundu.wst.load.distance_only_part" description="state.bundu.wst.load.distance_only_part" state="org.dive4elements.river.artifacts.bundu.bezugswst.DistanceOnlyPartMissVolumeSelect" helpText="help.state.bundu.wst.load.distance_only_part">
-      <data name="ld_from_part" type="Double" />
-      <data name="ld_to_part" type="Double" />
+      <data name="ld_from_part" type="Double"/>
+      <data name="ld_to_part" type="Double"/>
     </state>
 
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.bundu.wst.load.distance_only_part" />
-      <to state="state.bundu.wst.soundings" />
-      <condition data="calculation_mode" value="bundu_bezugswst" operator="equal" />
+      <from state="state.bundu.wst.load.distance_only_part"/>
+      <to state="state.bundu.wst.soundings"/>
+      <condition data="calculation_mode" value="bundu_bezugswst" operator="equal"/>
     </transition>
 
     <state id="state.bundu.wst.soundings" description="state.bundu.wst.soundings" state="org.dive4elements.river.artifacts.states.SoundingsSelectMultiple" helpText="help.state.bundu.wst.soundings">
-      <data name="soundings" type="multiattribute" />
+      <data name="soundings" type="multiattribute"/>
     </state>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.bundu.wst.soundings" />
-      <to state="state.bundu.wst" />
-      <condition data="calculation_mode" value="bundu_bezugswst" operator="equal" />
+      <from state="state.bundu.wst.soundings"/>
+      <to state="state.bundu.wst"/>
+      <condition data="calculation_mode" value="bundu_bezugswst" operator="equal"/>
     </transition>
 
 
 
     <state id="state.bundu.wst" helpText="help.state.bundu.wst" description="state.bundu.wst" state="org.dive4elements.river.artifacts.bundu.bezugswst.BezugswstState">
       <outputmodes>
-
+        <outputmode name="bundu_wspl_longitudinal_section" description="output.bundu_wspl_longitudinal_section" mime-type="image/png" type="chart">
+          <facets>
+            <facet name="bundu_facet_w" description="bundu_facet_w"/>
+            <facet name="bundu_facet_channelmin" description="bundu_facet_channelmin"/>
+            <facet name="bundu_facet_bedheight" description="bundu_facet_bedheight"/>
+            <facet name="longitudinal_section.q" description="longitudinal_section.q"/>
+            <facet name="longitudinal_section.annotations" description="facet.longitudinal_section.annotations"/>
+            <facet name="longitudinal_section.area" description="facet.longitudinal_section.area"/>
+            <facet name="longitudinal_section.manualpoints" description="Manuelle Punkte"/>
+          </facets>
+        </outputmode>
+        <outputmode name="bundu_depth_longitudinal_section" description="output.bundu_depth_longitudinal_section" mime-type="image/png" type="chart">
+          <facets>
+            <facet name="bundu_facet_flowdepth.filtered" description="bundu_facet_flowdepth.filtered"/>
+            <facet name="bundu_facet_channeldepth" description="bundu_facet_channeldepth"/>
+            <facet name="longitudinal_section.annotations" description="facet.longitudinal_section.annotations"/>
+            <facet name="longitudinal_section.area" description="facet.longitudinal_section.area"/>
+            <facet name="longitudinal_section.manualpoints" description="Manuelle Punkte"/>
+          </facets>
+        </outputmode>
         <outputmode name="bundu_wst_export" description="output.fix_waterlevel_export" mine-type="text/plain" type="export">
           <facets>
-            <facet name="csv" description="facet.waterlevel_export.csv" />
-            <facet name="pdf" description="facet.waterlevel_export.pdf" />
+            <facet name="csv" description="facet.waterlevel_export.csv"/>
+            <facet name="pdf" description="facet.waterlevel_export.pdf"/>
           </facets>
         </outputmode>
-
-
+        <outputmode name="bundu_wst_report" description="output.bundu_wst_report" mime-type="text/xml" type="report">
+          <facets>
+            <facet name="report" description="facet.bundu_wst_report" />
+          </facets>
+        </outputmode>
       </outputmodes>
     </state>