Changeset 17956 for trunk/Mars/fact

Timestamp:

08/13/14 12:34:21 (10 years ago)

Author:

tbretz

Message:

Replaced current prediction by the new central current prediction.

File:

• trunk/Mars/fact/plots/quality.C (modified) (1 diff)

trunk/Mars/fact/plots/quality.C

@@ -95 +95 @@
     Double_t jd = time + 40587 + 2400000.5;
 
-    // Sun properties
-    Nova::EquPosn  sun  = Nova::GetSolarEquCoords(jd);
-    Nova::ZdAzPosn hrzs = Nova::GetHrzFromEqu(sun, jd);
-
     // Get source position
     Nova::EquPosn pos = FindPointing(time);
 
-    // Moon properties
-    Nova::EquPosn moon = Nova::GetLunarEquCoords(jd, 0.01);
-    Nova::HrzPosn hrzm = Nova::GetHrzFromEqu(moon, jd);
-    double        disk = Nova::GetLunarDisk(jd);
-
-    // Derived moon properties
-    double angle = Nova::GetAngularSeparation(moon, pos);
-    double edist = Nova::GetLunarEarthDist(jd)/384400;
-
-    // Current prediction
-    double sin_malt  = hrzm.alt<0 ? 0 : sin(hrzm.alt*TMath::DegToRad());
-    double cos_mdist = cos(angle*TMath::DegToRad());
-    double sin_szd   = sin(hrzs.zd*TMath::DegToRad());
-
-    double c0 = pow(disk,      2.63);
-    double c1 = pow(sin_malt,  0.60);
-    double c2 = pow(edist,    -2.00);
-    double c3 = exp(0.67*cos_mdist*cos_mdist*cos_mdist*cos_mdist);
-    double c4 = exp(-97.8+105.8*sin_szd*sin_szd);
-
-    double cur = 6.2 + 95.7*c0*c1*c2*c3 + c4;
-
-    return cur;
+    return FACT::PredictI(jd, pos);
 }