Changeset 8907 for trunk/MagicSoft/Mars/mastro

Timestamp:

06/02/08 09:52:26 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mastro

Files:

• MAstro.cc (modified) (1 diff)
• MAstro.h (modified) (1 diff)
• MAstroCatalog.cc (modified) (4 diffs)
• MAstroCatalog.h (modified) (2 diffs)
• MVector3.cc (modified) (3 diffs)
• MVector3.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mastro/MAstro.cc

@@ -44 +44 @@
 
 ClassImp(MAstro);
+
+Double_t MAstro::RadToHor()
+{
+    return 24/TMath::TwoPi();
+}
+
+Double_t MAstro::HorToRad()
+{
+    return TMath::TwoPi()/24;
+}
 
 Double_t MAstro::Trunc(Double_t val)

trunk/MagicSoft/Mars/mastro/MAstro.h

@@ -31 +31 @@
     static Double_t HorToDeg()        { return 1./15; }
 
-    static Double_t RadToHor()        { return 24/TMath::TwoPi(); }
-    static Double_t HorToRad()        { return TMath::TwoPi()/24; }
+    static Double_t RadToHor(); // { return 24/TMath::TwoPi(); }
+    static Double_t HorToRad(); // { return TMath::TwoPi()/24; }
 
     // Angle/Time conversion functions

trunk/MagicSoft/Mars/mastro/MAstroCatalog.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MAstroCatalog.cc,v 1.29 2007-09-02 13:53:55 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MAstroCatalog.cc,v 1.30 2008-06-02 08:46:39 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -20 +20 @@
 !   Author(s): Thomas Bretz, 03/2004 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
-!   Copyright: MAGIC Software Development, 2002-2005
+!   Copyright: MAGIC Software Development, 2002-2008
 !
 !
@@ -143 +143 @@
 #include <TPaveText.h>  // TPaveText
 
-#include <TGraph.h>
+#include <TH1.h>        // TH1F
+#include <TGraph.h>     // TGraph
 
 #include "MLog.h"
@@ -218 +219 @@
     }
 }
+
+// --------------------------------------------------------------------------
+//
+// Set Radius of FOV using the pixsize [arcsec/pix], width
+// and height [pixel] of image
+//
+void MAstroCatalog::SetRadiusFOV(Double_t pixsize, Double_t w, Double_t h)
+{
+    // pixsize [arcsec/pixel]
+    // w       [pixel]
+    // h       [pixel]
+    const Double_t scale = TMath::Hypot(w, h)/2;
+    SetRadiusFOV(scale*pixsize/3600);
+} 
 
 // --------------------------------------------------------------------------

trunk/MagicSoft/Mars/mastro/MAstroCatalog.h

@@ -108 +108 @@
     void SetObservatory(const MObservatory &obs);
     void SetLimMag(Double_t mag) { fLimMag=mag; Update(); } // *MENU* *ARGS={mag=>fLimMag}
+
+    void SetRadiusFOV(Double_t pixsize, Double_t w, Double_t h);
     void SetRadiusFOV(Double_t deg)
     {
@@ -121 +123 @@
         Update();
     } // *MENU* *ARGS={deg=>fRadiusFOV}
-    void SetRadiusFOV(Double_t pixsize, Double_t w, Double_t h)
-    {
-        // pixsize [arcsec/pixel]
-        // w       [pixel]
-        // h       [pixel]
-        const Double_t scale = TMath::Hypot(w, h)/2;
-        SetRadiusFOV(scale*pixsize/3600);
-    } // Set Radius of FOV using the pixsize [arcsec/pix], width and height [pixel] of image
 
     void     SetRaDec(Double_t ra, Double_t dec) { fRaDec.SetRaDec(ra, dec, 1); Update(); }

trunk/MagicSoft/Mars/mastro/MVector3.cc

@@ -18 +18 @@
 !   Author(s): Thomas Bretz, 03/2004 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
-!   Copyright: MAGIC Software Development, 2002-2004
+!   Copyright: MAGIC Software Development, 2002-2008
 !
 !
@@ -33 +33 @@
 #include <iostream>
 
+#include <TMath.h>
+
 #include "MLog.h"
 #include "MLogManip.h"
@@ -39 +41 @@
 
 using namespace std;
+
+void MVector3::SetThetaPhiMag(Double_t theta, Double_t phi, Double_t mag)
+{
+    SetMagThetaPhi(TMath::Power(10, -mag/2.5), theta, phi);
+}
+
+Double_t MVector3::Magnitude() const
+{
+    return -2.5*TMath::Log10(Mag());
+}
+
+void MVector3::SetRaDec(Double_t ra, Double_t dec, Double_t mag)
+{
+    fType = kIsRaDec;
+    SetThetaPhiMag(TMath::Pi()/2-dec, ra, mag);
+}
+
+void MVector3::SetAltAz(Double_t alt, Double_t az, Double_t mag)
+{
+    fType = kIsAltAz;
+    SetThetaPhiMag(TMath::Pi()/2-alt, az, mag);
+}
 
 void MVector3::WriteBinary(ostream &out) const

trunk/MagicSoft/Mars/mastro/MVector3.h

@@ -22 +22 @@
     TString fName;
 
-    void SetThetaPhiMag(Double_t theta, Double_t phi, Double_t mag)
-    {
-        SetMagThetaPhi(TMath::Power(10, -mag/2.5), theta, phi);
-    }
+    void SetThetaPhiMag(Double_t theta, Double_t phi, Double_t mag); // SetMagThetaPhi(TMath::Power(10, -mag/2.5), theta, phi);
 
 public:
@@ -35 +32 @@
     }
     MVector3(const TVector3 &v3) : TVector3(v3) { fType=kIsArbitrary; }
-    Double_t Magnitude() const { return -2.5*TMath::Log10(Mag()); }
+    Double_t Magnitude() const;// { return -2.5*TMath::Log10(Mag()); }
 
     Bool_t IsValid() const { return fType!=kIsInvalid; }
 
-    void SetRaDec(Double_t ra, Double_t dec, Double_t mag=0)
-    {
-        fType = kIsRaDec;
-        SetThetaPhiMag(TMath::Pi()/2-dec, ra, mag);
-    }
-    void SetName(const TString &str) { fName = str.Strip(TString::kBoth); }
+    void SetRaDec(Double_t ra, Double_t dec, Double_t mag=0); // SetThetaPhiMag(TMath::Pi()/2-dec, ra, mag);
+    void SetAltAz(Double_t alt, Double_t az, Double_t mag=0); // SetThetaPhiMag(TMath::Pi()/2-alt, az, mag);
     void SetZdAz(Double_t zd, Double_t az, Double_t mag=0)
     {
@@ -50 +43 @@
         SetThetaPhiMag(zd, az, mag);
     }
-    void SetAltAz(Double_t alt, Double_t az, Double_t mag=0)
-    {
-        fType = kIsAltAz;
-        SetThetaPhiMag(TMath::Pi()/2-alt, az, mag);
-    }
 
+    void SetName(const TString &str) { fName = str.Strip(TString::kBoth); }
     const char *GetName() const { return fName; }