Changeset 4977 for trunk/MagicSoft

Timestamp:

09/13/04 13:36:36 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (4 diffs)
• mastro/MAstroCatalog.cc (modified) (1 diff)
• mastro/MAstroCatalog.h (modified) (2 diffs)
• mastro/MVector3.cc (added)
• mastro/MVector3.h (added)
• mastro/Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -30 +30 @@
 
 
+
  2004/09/13: Markus Gaug 
  
@@ -41 +42 @@
              
 
+
+
  2004/09/13: Thomas Bretz
 
@@ -69 +72 @@
      - fixed number of bins
      - remove first edge when finalizing
+     - added plots for lambda and NDF
 
    * mjobs/MJStar.cc:
@@ -112 +116 @@
      - removed some obsolete (empty) destructors
 
+   * mastro/MVector3.[h,cc]:
+     - added from MAstroCatalog
+
+   * mastro/MAstroCatalog.[h,cc]:
+     - removed MVector3
+
+   * mastro/Makefile:
+     - added MVector3
 
 

trunk/MagicSoft/Mars/mastro/MAstroCatalog.cc

@@ -154 +154 @@
 #endif
 
-ClassImp(MVector3);
 ClassImp(MAstroCatalog);
 
 using namespace std;
-
-void MVector3::WriteBinary(ostream &out) const
-{
-    const Double_t t = Theta();
-    const Double_t p = Phi();
-    const Float_t  m = Mag();
-    out.write((char*)&t, 8);
-    out.write((char*)&p, 8);
-    out.write((char*)&m, 4);
-    out << fName << endl;
-}
-
-void MVector3::ReadBinary(istream &in)
-{
-    Double_t t, p;
-    Float_t  m;
-
-    in.read((char*)&t, 8);
-    in.read((char*)&p, 8);
-    in.read((char*)&m, 4);
-    fName.ReadLine(in);
-
-    SetMagThetaPhi(m, t, p);
-}
 
 // --------------------------------------------------------------------------

trunk/MagicSoft/Mars/mastro/MAstroCatalog.h

@@ -2 +2 @@
 #define MARS_MAstroCatalog
 
-#ifndef ROOT_TVector3
-#include <TVector3.h>
+#ifndef MARS_MVector3
+#include "MVector3.h"
 #endif
 #ifndef ROOT_TList
@@ -16 +16 @@
 class TArrayI;
 class TGToolTip;
-
-class MVector3 : public TVector3
-{
-private:
-    enum VectorType_t
-    {
-        kIsInvalid,
-        kIsRaDec,
-        kIsZdAz,
-        kIsAltAz,
-        kIsArbitrary
-    };
-
-    VectorType_t fType;
-
-    TString fName;
-
-public:
-    MVector3() { fType=kIsInvalid; }
-    MVector3(const TVector3 &v3) : TVector3(v3) { fType=kIsArbitrary; }
-    Double_t Magnitude() const { return -2.5*TMath::Log10(Mag()); }
-
-    void SetRaDec(Double_t ra, Double_t dec, Double_t mag=0)
-    {
-        fType = kIsRaDec;
-        SetMagThetaPhi(pow(10, -mag/2.5), TMath::Pi()/2-dec, ra);
-    }
-    void SetName(const TString &str) { fName = str.Strip(TString::kBoth); }
-    void SetZdAz(Double_t zd, Double_t az, Double_t mag=0)
-    {
-        fType = kIsZdAz;
-        SetMagThetaPhi(pow(10, -mag/2.5), zd, az);
-    }
-    void SetAltAz(Double_t alt, Double_t az, Double_t mag=0)
-    {
-        fType = kIsAltAz;
-        SetMagThetaPhi(pow(10, -mag/2.5), TMath::Pi()/2-alt, az);
-    }
-
-    const char *GetName() const { return fName; }
-
-    void WriteBinary(ostream &out) const;
-    void ReadBinary(istream &in);
-
-    ClassDef(MVector3, 1) // A specialized TVector3 storing a star-name
-};
 
 class MAstroCatalog : public TObject

trunk/MagicSoft/Mars/mastro/Makefile

@@ -22 +22 @@
 # mgeom (MAstroCamera): MGeomCam, MGeomMirror
 
-SRCFILES = MAstro.cc \
+SRCFILES = MVector3.cc \
+           MAstro.cc \
            MAstroSky2Local.cc \
            MAstroCatalog.cc \