Changeset 8337 for trunk/MagicSoft/Mars/mastro

Timestamp:

02/28/07 13:34:10 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mastro

Files:

• MObservatory.cc (modified) (4 diffs)
• MObservatory.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mastro/MObservatory.cc

@@ -53 +53 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Default constructor sets name and title of instace.
+// Default location is kMagic1
+//
 MObservatory::MObservatory(const char *name, const char *title)
 {
@@ -60 +65 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// For example "MObservator(MObservatory::kMagic1)"
+//
 MObservatory::MObservatory(LocationName_t key, const char *name, const char *title)
 {
@@ -65 +74 @@
 
     SetLocation(key);
+}
+
+// --------------------------------------------------------------------------
+//
+// Calls SetLocation
+//
+MObservatory::MObservatory(Double_t lon, Double_t lat, const char *name)
+{
+    Init();
+
+    SetLocation(lon, lat, 0, name);
+}
+
+// --------------------------------------------------------------------------
+//
+// Calls SetLocation
+//
+MObservatory::MObservatory(Double_t lon, Double_t lat, Double_t h, const char *name)
+{
+    Init();
+
+    SetLocation(lon, lat, h, name);
 }
 
@@ -106 +137 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Longitude/Latitude [rad]
+// Height             [m]
+//
+void MObservatory::SetLocation(Double_t lon, Double_t lat, Double_t h, const char *name)
+{
+    fLongitude = lon;
+    fLatitude  = lat;
+    fHeight    = h;
+
+    fSinLatitude = TMath::Sin(fLatitude);
+    fCosLatitude = TMath::Cos(fLatitude);
+
+    if (name)
+        fObservatoryName = name;
+}
+
 void MObservatory::Print(Option_t *) const
 {

trunk/MagicSoft/Mars/mastro/MObservatory.h

@@ -32 +32 @@
     Double_t fHeight;                //! [m] height of observatory
 
-    void Init(const char *name, const char *title);
+    void Init(const char *name=NULL, const char *title=NULL);
 
 public:
     MObservatory(const char *name=NULL, const char *title=NULL);
     MObservatory(LocationName_t key, const char *name=NULL, const char *title=NULL);
+    MObservatory(Double_t lon, Double_t lat, const char *name="<n/a>");
+    MObservatory(Double_t lon, Double_t lat, Double_t h, const char *name="<n/a>");
 
     void Copy(TObject &obj) const
@@ -50 +52 @@
 
     void SetLocation(LocationName_t name);
+    void SetLocation(Double_t lon, Double_t lat, Double_t h=0, const char *name=NULL);
 
     void Print(Option_t *o=0) const;