Changeset 14882 for trunk

Timestamp:

02/07/13 10:57:35 (12 years ago)

Author:

tbretz

Message:

Added a new preliminary formula for current prediction based on a higher statistical bases.

File:

• trunk/FACT++/src/makeplots.cc (modified) (2 diffs)

trunk/FACT++/src/makeplots.cc

@@ -309 +309 @@
 
             // Current prediction
-            const double lc = angle*hrzm.alt*pow(disk, 6)/360/360;
-            const double cur = lc>0 ? 7.7+4942*lc : 7.7;
+            const double cang = sin(angle   *M_PI/180);
+            const double calt = sin(hrzm.alt*M_PI/180);
+
+            const double lc = calt>0 ? cang*sqrt(calt)*pow(disk, 3) : -1;
+            const double cur = lc>0 ? 8+104.5*lc : 8;
 
             // Relative  energy threshold prediction
@@ -334 +337 @@
 
             if (no_limits || (cur<max_current && 90-hrz.alt<max_zd))
-                g3.SetPoint(g3.GetN(), axis, ratio*cur/7.7);
+                g3.SetPoint(g3.GetN(), axis, ratio*cur/8);
 
             if (no_limits || (cur<max_current && 90-hrz.alt<max_zd))