Index: trunk/MagicSoft/Mars/mtemp/MObservatory.cc
===================================================================
--- trunk/MagicSoft/Mars/mtemp/MObservatory.cc	(revision 2800)
+++ 	(revision )
@@ -1,91 +1,0 @@
-/* ======================================================================== *\
-!
-! *
-! * This file is part of MARS, the MAGIC Analysis and Reconstruction
-! * Software. It is distributed to you in the hope that it can be a useful
-! * and timesaving tool in analysing Data of imaging Cerenkov telescopes.
-! * It is distributed WITHOUT ANY WARRANTY.
-! *
-! * Permission to use, copy, modify and distribute this software and its
-! * documentation for any purpose is hereby granted without fee,
-! * provided that the above copyright notice appear in all copies and
-! * that both that copyright notice and this permission notice appear
-! * in supporting documentation. It is provided "as is" without express
-! * or implied warranty.
-! *
-!
-!
-!   Author(s): Robert Wagner  10/2002 <mailto:magicsoft@rwagner.de>
-!   Author(s): Thomas Bretz   2/2003 <mailto:tbretz@astro.uni-wuerzburg.de>
-!
-!   Copyright: MAGIC Software Development, 2002-2003
-!
-!
-\* ======================================================================== */
-
-/////////////////////////////////////////////////////////////////////////////
-//                                                                         //
-// MObservatory                                                            //
-//                                                                         //
-/////////////////////////////////////////////////////////////////////////////
-#include "MObservatory.h"
-
-#include "MAstro.h"
-
-#include "MLog.h"
-#include "MLogManip.h"
-
-ClassImp(MObservatory);
-
-void MObservatory::Init(const char *name, const char *title)
-{
-    fName  = name  ? name  : "MObservatory";
-    fTitle = title ? title : "Storage container for coordinates of an observatory";   
-}
-
-MObservatory::MObservatory(const char *name, const char *title)
-{
-    Init(name, title);
-
-    SetLocation(kMagic1);
-}
-
-MObservatory::MObservatory(LocationName_t key, const char *name=NULL, const char *title=NULL)
-{
-    Init(name, title);
-
-    SetLocation(key);
-}
-
-void MObservatory::SetLocation(LocationName_t name)
-{
-    switch (name)
-    {
-    case kMagic1:
-        // Values taken from the GPS Receiver (avg 20h)
-        // on 26/11/2003 at 17h30 in the counting house
-        fLatitude  = MAstro::Dms2Rad(28, 45, 42.576, '+');
-        fLongitude = MAstro::Dms2Rad(17, 53, 26.460, '-');
-        fHeight    = 2196.5; // m
-        fObservatoryName = "Observatorio del Roque de los Muchachos (Magic1)";
-        return;
-
-    case kWuerzburgCity:
-        fLatitude  = MAstro::Dms2Rad(51, 38, 48.0);
-        fLongitude = MAstro::Dms2Rad( 9, 56, 36.0);
-        fHeight    = 300;
-        fObservatoryName = "Wuerzburg City";
-        return;
-
-    }
-}
-
-void MObservatory::Print(Option_t *) const
-{
-    *fLog << all;
-    *fLog << fObservatoryName << endl;
-    *fLog << "Latitude " << (fLatitude > 0 ? (fLatitude*kRad2Deg) : -(fLatitude*kRad2Deg)) << " deg " << (fLatitude > 0 ? "W" : "E") << endl;
-    *fLog << "Longitude " << (fLongitude > 0 ? (fLongitude*kRad2Deg) : -(fLongitude*kRad2Deg)) <<" deg " << (fLongitude < 0 ? "N" : "S") << endl;
-    *fLog << "Height " << fHeight << "m" << endl;
-}
-
Index: trunk/MagicSoft/Mars/mtemp/MObservatory.h
===================================================================
--- trunk/MagicSoft/Mars/mtemp/MObservatory.h	(revision 2800)
+++ 	(revision )
@@ -1,55 +1,0 @@
-#ifndef MARS_MObservatory
-#define MARS_MObservatory
-
-#ifndef MARS_MParContainer
-#include "MParContainer.h"
-#endif
-
-class MObservatory : public MParContainer
-{
-public:
-    enum LocationName_t
-    {
-        kMagic1,
-        kWuerzburgCity
-    };
-
-private:
-    LocationName_t fObservatoryKey;  //!
-
-    TString  fObservatoryName;       //! Name of the observatory
-
-    Double_t fLongitude;             //! [rad] Longitude of observatory (+ east)
-    Double_t fLatitude;              //! [rad] Latitude of observatory (+ north)
-
-    Double_t fHeight;                //! [m] height of observatory
-
-    void Init(const char *name, const char *title);
-
-public:
-    MObservatory(const char *name=NULL, const char *title=NULL);
-    MObservatory(LocationName_t key, const char *name=NULL, const char *title=NULL);
-
-    void SetLocation(LocationName_t name);
-
-    void Print(Option_t *o=0) const;
-
-    const TString &GetObservatoryName() const { return fObservatoryName; }
-
-    Double_t GetLatitudeDeg() const     { return fLatitude*kRad2Deg; }  //[deg]
-    Double_t GetLongitudeDeg() const    { return fLongitude*kRad2Deg; } //[deg]
-
-    Double_t GetLatitudeRad() const     { return fLatitude; }           //[rad]
-    Double_t GetLongitudeRad() const    { return fLongitude; }          //[rad]
-
-    Double_t GetPhi() const             { return fLatitude; }           //[rad]
-    Double_t GetElong() const           { return fLongitude; }          //[rad]
-
-    Double_t GetHeight() const          { return fHeight; }
-
-    LocationName_t GetObservatoryKey() const { return fObservatoryKey; }
-
-    ClassDef(MObservatory, 0)
-};
-
-#endif
Index: trunk/MagicSoft/Mars/mtemp/MObservatoryLocation.cc
===================================================================
--- trunk/MagicSoft/Mars/mtemp/MObservatoryLocation.cc	(revision 2800)
+++ 	(revision )
@@ -1,92 +1,0 @@
-/* ======================================================================== *\
-!
-! *
-! * This file is part of MARS, the MAGIC Analysis and Reconstruction
-! * Software. It is distributed to you in the hope that it can be a useful
-! * and timesaving tool in analysing Data of imaging Cerenkov telescopes.
-! * It is distributed WITHOUT ANY WARRANTY.
-! *
-! * Permission to use, copy, modify and distribute this software and its
-! * documentation for any purpose is hereby granted without fee,
-! * provided that the above copyright notice appear in all copies and
-! * that both that copyright notice and this permission notice appear
-! * in supporting documentation. It is provided "as is" without express
-! * or implied warranty.
-! *
-!
-!
-!   Author(s): Robert Wagner  10/2002 <mailto:magicsoft@rwagner.de>
-!
-!   Copyright: MAGIC Software Development, 2002
-!
-!
-\* ======================================================================== */
-
-/////////////////////////////////////////////////////////////////////////////
-//                                                                         //
-// MObservatoryLocation                                                    //
-//                                                                         //
-//                                                                         //
-/////////////////////////////////////////////////////////////////////////////
-#include "MObservatoryLocation.h"
-
-#include <TMath.h>
-
-#include "MLog.h"
-#include "MLogManip.h"
-
-ClassImp(MObservatoryLocation);
-
-void MObservatoryLocation::Init(const char *name, const char *title)
-{
-    fName  = name  ? name  : "MObservatoryLocation";
-    fTitle = title ? title : "Storage container for coordinates of an observatory";   
-}
-
-MObservatoryLocation::MObservatoryLocation(const char *name, const char *title)
-{
-    Init();
-
-    fLatitude  =  28.7594 / kRad2Deg; // rad; 28 45 34
-    fLongitude =  17.8761 / kRad2Deg; // rad; 17 52 34;
-                                        // slalib uses + for WEST !!!
-    fElevation = 2300; // m
-    fObsName = "Observatorio del Roque de los Muchachos";
-}
-
-MObservatoryLocation::MObservatoryLocation(LocationName_t name, const char *name=NULL, const char *title=NULL)
-{
-    Init();
-
-    switch (name)
-    {
-    case kMagic1:
-    case kMagic2:
-    case kRobertGarten:
-        fLatitude  =  28.7594 / kRad2Deg; // rad; 28 45 34
-        fLongitude =  17.8761 / kRad2Deg; // rad; 17 52 34;
-                                          // slalib uses + for WEST !!!
-        fElevation = 2300; // m
-        fObsName = "Observatorio del Roque de los Muchachos";
-        break;
-    }
-}
-
-//Double_t GetHorizon(Double_t phi);
-//TF1 SetHorizonLine() { return fHorizon; }
-//TF1 GetHorizonLine() { return fHorizon; }
-
-MObservatoryLocation::~MObservatoryLocation()
-{
-  // do nothing special.
-}
-
-void MObservatoryLocation::Print(Option_t *) const
-{
-  *fLog << all;
-  *fLog << fObsName << endl;
-  *fLog << "Latitude " << (fLatitude > 0 ? (fLatitude*kRad2Deg) : -(fLatitude*kRad2Deg)) << " deg " << (fLatitude > 0 ? "W" : "E") << endl;
-  *fLog << "Longitude " << (fLongitude > 0 ? (fLongitude*kRad2Deg) : -(fLongitude*kRad2Deg)) <<" deg " << (fLongitude < 0 ? "N" : "S") << endl;
-  *fLog << "Elevation " << fElevation << "m" << endl;
-}
-
Index: trunk/MagicSoft/Mars/mtemp/MObservatoryLocation.h
===================================================================
--- trunk/MagicSoft/Mars/mtemp/MObservatoryLocation.h	(revision 2800)
+++ 	(revision )
@@ -1,54 +1,0 @@
-#ifndef MARS_MObservatoryLocation
-#define MARS_MObservatoryLocation
-
-#ifndef MARS_MParContainer
-#include "MParContainer.h"
-#endif
-
-class MObservatoryLocation : public MParContainer
-{
-private:
-  TString  fObsName;
-  Double_t fLatitude;
-  Double_t fLongitude;
-  Double_t fElevation;
-  static Double_t fgDegToRad;
-  //  TH1F     fHorizon;
-
-  void Init(const char *name, const char *title);
-
-public:
-    enum LocationName_t
-    {
-        kMagic1,
-        kMagic2,
-        kRobertGarten
-    };
-
-  MObservatoryLocation(const char *name=NULL, const char *title=NULL);
-  MObservatoryLocation(LocationName_t name, const char *name=NULL, const char *title=NULL);
-  ~MObservatoryLocation();
-
-  void SetLatitude(Double_t latitude)   { fLatitude = latitude; }
-  void SetLongitude(Double_t longitude) { fLongitude = longitude; }
-  void SetElevation(Double_t elevation) { fElevation = elevation; }
-  void SetObservatoryName(TString name) { fObsName = name; }
-  
-  void Print(Option_t *) const;
-  
-  Double_t GetLatitude() const        { return fLatitude*kRad2Deg; }
-  Double_t GetLongitude() const       { return fLongitude*kRad2Deg; }
-  Double_t GetElevation() const       { return fElevation; }
-  Double_t GetLatitudeRad() const     { return fLatitude; }
-  Double_t GetLongitudeRad() const    { return fLongitude; }
-  TString  GetObservatoryName() const { return fObsName; }
-  // Double_t GetHorizon(Double_t phi);
-  // void SetHorizonLine(TF1 hor) { fHorizon = hor; }
-  // TH1F GetHorizonLine() { return fHorizon; }
-  
-  ClassDef(MObservatoryLocation, 1)
-
-};
-
-#endif
-
