Changeset 8324 for trunk

Timestamp:

02/16/07 09:21:13 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• macros/starvisyear.C (modified) (3 diffs)
• mastro/MAstro.cc (modified) (1 diff)
• mastro/MAstro.h (modified) (2 diffs)
• mastro/MObservatory.cc (modified) (1 diff)
• mbase/MMath.h (modified) (1 diff)
• mjobs/MSequence.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/macros/starvisyear.C

@@ -36 +36 @@
 {
     // Setup the observatory location (see MObservatory for details)
-    MObservatory obs(MObservatory::kTuorla);;
+    MObservatory obs(MObservatory::kMagic1);;
 
     // Setup the start time of the year (365 days) to be displayed
@@ -98 +98 @@
         }
 
-        // If nautical twilight doesn#t take place skip the rest
+        // If nautical twilight doesn't take place skip the rest
         if (sunri[1]<0 || sunst[1]<0)
             continue;
@@ -126 +126 @@
             v *= conv;
 
-            // check if moon is above or elow horizont
+            // check if moon is above or below horizont
             if (v.Theta()*TMath::RadToDeg()<90)
                 moon = 0;

trunk/MagicSoft/Mars/mastro/MAstro.cc

@@ -446 +446 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Estimates the time at which a source culminates.
+//
+// ra: right ascension [rad]
+// elong: observers longitude [rad]
+// mjd: modified julian date (utc)
+//
+// return time in [-12;12]
+//
+Double_t MAstro::EstimateCulminationTime(Double_t mjd, Double_t elong, Double_t ra)
+{
+    // startime at 1.1.2000 for greenwich 0h
+    const Double_t gmt0 = 6.664520;
+
+    // difference of startime for greenwich for two calendar days [h]
+    const Double_t d0 = 0.06570982224;
+
+    // mjd of greenwich 1.1.2000 0h
+    const Double_t mjd0 = 51544;
+
+    // mjd today
+    const Double_t mjd1 = TMath::Floor(mjd);
+
+    // scale between star-time and sun-time
+    const Double_t scale = 1;//1.00273790926;
+
+    const Double_t UT = (ra-elong)*RadToHor() - (gmt0 + d0 * (mjd1-mjd0))/scale;
+
+    return fmod(2412 + UT, 24) - 12;
+}
 
 // --------------------------------------------------------------------------

trunk/MagicSoft/Mars/mastro/MAstro.h

@@ -31 +31 @@
     static Double_t HorToDeg()        { return 1./15; }
 
-    static Double_t RadToHor()        { return 15/TMath::TwoPi(); }
-    static Double_t HorToRad()        { return TMath::TwoPi()/15; }
+    static Double_t RadToHor()        { return 24/TMath::TwoPi(); }
+    static Double_t HorToRad()        { return TMath::TwoPi()/24; }
 
     // Angle/Time conversion functions
@@ -86 +86 @@
     static Int_t    GetMagicPeriod(Double_t mjd);
 
+    static Double_t EstimateCulminationTime(Double_t mjd, Double_t longit, Double_t ra);
+
     // Estimate some parameters around the sun
     static Double_t GetSunRaDec(Double_t mjd, Double_t &ra, Double_t &dec);

trunk/MagicSoft/Mars/mastro/MObservatory.cc

@@ -110 +110 @@
     *fLog << all;
     *fLog << underline << fObservatoryName << ":" << endl;
-    *fLog << "Latitude:  " << TMath::Abs(fLatitude*kRad2Deg)  << " deg " << (fLatitude  > 0 ? "W" : "E") << endl;
-    *fLog << "Longitude: " << TMath::Abs(fLongitude*kRad2Deg) << " deg " << (fLongitude < 0 ? "N" : "S") << endl;
+    *fLog << "Latitude:  " << TMath::Abs(fLatitude*kRad2Deg)  << " deg " << (fLatitude  > 0 ? "N" : "S") << endl;
+    *fLog << "Longitude: " << TMath::Abs(fLongitude*kRad2Deg) << " deg " << (fLongitude < 0 ? "E" : "W") << endl;
     *fLog << "Height:    " << fHeight << "m" << endl;
 }

trunk/MagicSoft/Mars/mbase/MMath.h

@@ -12 +12 @@
 namespace MMath
 {
-    inline Double_t DegToHor() { return 1./15; }
-    inline Double_t HorToDeg() { return 15;    }
-
-    inline Double_t RadToHor() { return TMath::RadToDeg()/15; }
-    inline Double_t HorToRad() { return 15/TMath::RadToDeg(); }
-
     Double_t GaussProb(Double_t x, Double_t sigma=1, Double_t mean=0);
 

trunk/MagicSoft/Mars/mjobs/MSequence.cc

@@ -225 +225 @@
         case kRawAll:
             d += "rawfiles/";
-            d += fNight.GetStringFmt("%Y/%m/%d");
+            d += fNight.GetStringFmt("%Y/%m/%d/");
             break;
         case kRootDat:
@@ -232 +232 @@
         case kRootAll:
             d += "merpp/";
-            d += fNight.GetStringFmt("%Y/%m/%d");
+            d += fNight.GetStringFmt("%Y/%m/%d/");
             break;
         case kCalibrated: