* Bugfix Excel-Tool heading control

* Correction of output names in *_MS_MEAS.csv
* Implementation of better beta_ame calculation (beta calculation correct wind angles that are not guilty after test procedure)

CSE/Calculation/main_calculation_call.vb

@@ -362,7 +362,17 @@ Public Module main_calculation_call
         Next i
 
         Job.fv_pe = (sum_v_veh / (anz_DirID(0) + anz_DirID(1))) / (0.5 * (vair_ic(0) / anz_DirID(0) + vair_ic(1) / anz_DirID(1)))
-        If CalibRun Then Job.beta_ame = (0.5 * (beta_ic(0) / anz_DirID(0) + beta_ic(1) / anz_DirID(1))) - AmeAng
+        If CalibRun Then 'Job.beta_ame = (0.5 * (beta_ic(0) / anz_DirID(0) + beta_ic(1) / anz_DirID(1))) - AmeAng
+            If ((beta_ic(0) / anz_DirID(0)) <= 90 And (beta_ic(1) / anz_DirID(1)) >= 270) Or ((beta_ic(1) / anz_DirID(1)) <= 90 And (beta_ic(0) / anz_DirID(0)) >= 270) Then
+                If Job.beta_ame = (0.5 * (beta_ic(0) / anz_DirID(0) + beta_ic(1) / anz_DirID(1))) > 180 Then
+                    Job.beta_ame = (0.5 * (beta_ic(0) / anz_DirID(0) + beta_ic(1) / anz_DirID(1))) - 360
+                Else
+                    Job.beta_ame = (0.5 * (beta_ic(0) / anz_DirID(0) + beta_ic(1) / anz_DirID(1)))
+                End If
+            Else
+                Job.beta_ame = (0.5 * (beta_ic(0) / anz_DirID(0) + beta_ic(1) / anz_DirID(1))) - AmeAng
+            End If
+        End If
         Return True
     End Function
 

CSE/IO/output.vb

@@ -132,8 +132,8 @@ Module output
             If calibration Then
                 FileOut.WriteLine("# Datafile: ", Job.calib_run_fpath)
             Else
-                FileOut.WriteLine("# Datafile LS1: ", coasting_fpaths(0))
-                FileOut.WriteLine("# Datafile HS: ", coasting_fpaths(1))
+                FileOut.WriteLine("# Datafile HS: ", coasting_fpaths(0))
+                FileOut.WriteLine("# Datafile LS1: ", coasting_fpaths(1))
                 FileOut.WriteLine("# Datafile LS2: ", coasting_fpaths(2))
             End If
             FileOut.WriteLine("#")