Index: trunk/MagicSoft/Mars/mtools/MAstro.cc =================================================================== --- trunk/MagicSoft/Mars/mtools/MAstro.cc (revision 2553) +++ (revision ) @@ -1,202 +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): Thomas Bretz, 11/2003 -! -! Copyright: MAGIC Software Development, 2000-2003 -! -! -\* ======================================================================== */ - -///////////////////////////////////////////////////////////////////////////// -// -// MAstro -// ------ -// -//////////////////////////////////////////////////////////////////////////// -#include "MAstro.h" - -ClassImp(MAstro); - -Double_t MAstro::Trunc(Double_t val) -{ - /* dint(A) - truncate to nearest whole number towards zero (double) */ - return val<0 ? TMath::Ceil(val) : TMath::Floor(val); -} - -Double_t MAstro::Round(Double_t val) -{ - /* dnint(A) - round to nearest whole number (double) */ - return val<0 ? TMath::Ceil(val-0.5) : TMath::Floor(val+0.5); -} - -Double_t MAstro::Hms2Sec(Int_t deg, UInt_t min, Double_t sec, Char_t sgn) -{ - const Double_t rc = TMath::Sign((60.0 * (60.0 * (Double_t)TMath::Abs(deg) + (Double_t)min) + sec), (Double_t)deg); - return sgn=='-' ? -rc : rc; -} - -Double_t MAstro::Dms2Rad(Int_t deg, UInt_t min, Double_t sec, Char_t sgn) -{ - /* pi/(180*3600): arcseconds to radians */ -#define DAS2R 4.8481368110953599358991410235794797595635330237270e-6 - return Hms2Sec(deg, min, sec, sgn)*DAS2R; -} - -Double_t MAstro::Hms2Rad(Int_t hor, UInt_t min, Double_t sec, Char_t sgn) -{ - /* pi/(12*3600): seconds of time to radians */ -#define DS2R 7.2722052166430399038487115353692196393452995355905e-5 - return Hms2Sec(hor, min, sec, sgn)*DS2R; -} - -Double_t MAstro::Dms2Deg(Int_t deg, UInt_t min, Double_t sec, Char_t sgn) -{ - return Hms2Sec(deg, min, sec, sgn)/3600.; -} - -Double_t MAstro::Hms2Deg(Int_t hor, UInt_t min, Double_t sec, Char_t sgn) -{ - return Hms2Sec(hor, min, sec, sgn)/240.; -} - -Double_t MAstro::Dms2Hor(Int_t deg, UInt_t min, Double_t sec, Char_t sgn) -{ - return Hms2Sec(deg, min, sec, sgn)/15.; -} - -Double_t MAstro::Hms2Hor(Int_t hor, UInt_t min, Double_t sec, Char_t sgn) -{ - return Hms2Sec(hor, min, sec, sgn)/3600.; -} - -void MAstro::Day2Hms(Double_t day, Char_t &sgn, UShort_t &hor, UShort_t &min, UShort_t &sec) -{ - /* Handle sign */ - sgn = day<0?'-':'+'; - - /* Round interval and express in smallest units required */ - Double_t a = Round(86400. * TMath::Abs(day)); // Days to seconds - - /* Separate into fields */ - const Double_t ah = Trunc(a/3600.); - a -= ah * 3600.; - const Double_t am = Trunc(a/60.); - a -= am * 60.; - const Double_t as = Trunc(a); - - /* Return results */ - hor = (UShort_t)ah; - min = (UShort_t)am; - sec = (UShort_t)as; -} - -void MAstro::Rad2Hms(Double_t rad, Char_t &sgn, UShort_t °, UShort_t &min, UShort_t &sec) -{ - Day2Hms(rad/(TMath::Pi()*2), sgn, deg, min, sec); -} - -void MAstro::Rad2Dms(Double_t rad, Char_t &sgn, UShort_t °, UShort_t &min, UShort_t &sec) -{ - Rad2Hms(rad*15, sgn, deg, min, sec); -} - -void MAstro::Deg2Dms(Double_t d, Char_t &sgn, UShort_t °, UShort_t &min, UShort_t &sec) -{ - Day2Hms(d/24, sgn, deg, min, sec); -} - -void MAstro::Deg2Hms(Double_t d, Char_t &sgn, UShort_t °, UShort_t &min, UShort_t &sec) -{ - Rad2Hms(d/360, sgn, deg, min, sec); -} - -void MAstro::Hor2Dms(Double_t h, Char_t &sgn, UShort_t °, UShort_t &min, UShort_t &sec) -{ - Day2Hms(h*15/24, sgn, deg, min, sec); -} - -void MAstro::Hor2Hms(Double_t h, Char_t &sgn, UShort_t °, UShort_t &min, UShort_t &sec) -{ - Day2Hms(h/24, sgn, deg, min, sec); -} - -void MAstro::Day2Hm(Double_t day, Char_t &sgn, UShort_t &hor, Double_t &min) -{ - /* Handle sign */ - sgn = day<0?'-':'+'; - - /* Round interval and express in smallest units required */ - Double_t a = Round(86400. * TMath::Abs(day)); // Days to seconds - - /* Separate into fields */ - const Double_t ah = Trunc(a/3600.); - a -= ah * 3600.; - - /* Return results */ - hor = (UShort_t)ah; - min = a/60.; -} - -void MAstro::Rad2Hm(Double_t rad, Char_t &sgn, UShort_t °, Double_t &min) -{ - Day2Hm(rad/(TMath::Pi()*2), sgn, deg, min); -} - -void MAstro::Rad2Dm(Double_t rad, Char_t &sgn, UShort_t °, Double_t &min) -{ - Rad2Hm(rad*15, sgn, deg, min); -} - -void MAstro::Deg2Dm(Double_t d, Char_t &sgn, UShort_t °, Double_t &min) -{ - Day2Hm(d/24, sgn, deg, min); -} - -void MAstro::Deg2Hm(Double_t d, Char_t &sgn, UShort_t °, Double_t &min) -{ - Rad2Hm(d/360, sgn, deg, min); -} - -void MAstro::Hor2Dm(Double_t h, Char_t &sgn, UShort_t °, Double_t &min) -{ - Day2Hm(h*15/24, sgn, deg, min); -} - -void MAstro::Hor2Hm(Double_t h, Char_t &sgn, UShort_t °, Double_t &min) -{ - Day2Hm(h/24, sgn, deg, min); -} - -Bool_t MAstro::String2Angle(TString &str, Double_t &ret) -{ - Char_t sgn; - Int_t d, len; - UInt_t m; - Float_t s; - - // Skip whitespaces before %c and after %f - int n=sscanf(str.Data(), " %c %d %d %f %n", &sgn, &d, &m, &s, &len); - - if (n!=4 || (sgn!='+' && sgn!='-')) - return kFALSE; - - str.Remove(0, len); - - ret = Dms2Deg(d, m, s, sgn); - return kTRUE; -} Index: trunk/MagicSoft/Mars/mtools/MAstro.h =================================================================== --- trunk/MagicSoft/Mars/mtools/MAstro.h (revision 2553) +++ (revision ) @@ -1,44 +1,0 @@ -#ifndef MARS_MAstro -#define MARS_MAstro - -#ifndef ROOT_TROOT -#include -#endif - -class MAstro -{ -private: - static Double_t Round(Double_t val); - static Double_t Trunc(Double_t val); - -public: - static Double_t Hms2Sec(Int_t deg, UInt_t min, Double_t sec, char sgn='+'); - static Double_t Dms2Rad(Int_t deg, UInt_t min, Double_t sec, Char_t sgn='+'); - static Double_t Hms2Rad(Int_t hor, UInt_t min, Double_t sec, Char_t sgn='+'); - static Double_t Dms2Deg(Int_t deg, UInt_t min, Double_t sec, Char_t sgn='+'); - static Double_t Hms2Deg(Int_t hor, UInt_t min, Double_t sec, Char_t sgn='+'); - static Double_t Dms2Hor(Int_t deg, UInt_t min, Double_t sec, Char_t sgn='+'); - static Double_t Hms2Hor(Int_t hor, UInt_t min, Double_t sec, Char_t sgn='+'); - - static void Day2Hms(Double_t rad, Char_t &sgn, UShort_t °, UShort_t &min, UShort_t &sec); - static void Rad2Dms(Double_t rad, Char_t &sgn, UShort_t °, UShort_t &min, UShort_t &sec); - static void Rad2Hms(Double_t rad, Char_t &sgn, UShort_t °, UShort_t &min, UShort_t &sec); - static void Deg2Dms(Double_t rad, Char_t &sgn, UShort_t °, UShort_t &min, UShort_t &sec); - static void Deg2Hms(Double_t rad, Char_t &sgn, UShort_t °, UShort_t &min, UShort_t &sec); - static void Hor2Dms(Double_t rad, Char_t &sgn, UShort_t °, UShort_t &min, UShort_t &sec); - static void Hor2Hms(Double_t rad, Char_t &sgn, UShort_t °, UShort_t &min, UShort_t &sec); - - static void Day2Hm(Double_t rad, Char_t &sgn, UShort_t °, Double_t &min); - static void Rad2Dm(Double_t rad, Char_t &sgn, UShort_t °, Double_t &min); - static void Rad2Hm(Double_t rad, Char_t &sgn, UShort_t °, Double_t &min); - static void Deg2Dm(Double_t rad, Char_t &sgn, UShort_t °, Double_t &min); - static void Deg2Hm(Double_t rad, Char_t &sgn, UShort_t °, Double_t &min); - static void Hor2Dm(Double_t rad, Char_t &sgn, UShort_t °, Double_t &min); - static void Hor2Hm(Double_t rad, Char_t &sgn, UShort_t °, Double_t &min); - - static Bool_t String2Angle(TString &str, Double_t &ret); - - ClassDef(MAstro, 0) -}; - -#endif Index: trunk/MagicSoft/Mars/mtools/Makefile =================================================================== --- trunk/MagicSoft/Mars/mtools/Makefile (revision 2553) +++ trunk/MagicSoft/Mars/mtools/Makefile (revision 2604) @@ -34,5 +34,4 @@ MagicDomino.cc \ MagicCivilization.cc \ - MAstro.cc \ MineSweeper.cc Index: trunk/MagicSoft/Mars/mtools/ToolsLinkDef.h =================================================================== --- trunk/MagicSoft/Mars/mtools/ToolsLinkDef.h (revision 2553) +++ trunk/MagicSoft/Mars/mtools/ToolsLinkDef.h (revision 2604) @@ -5,5 +5,4 @@ #pragma link off all functions; -#pragma link C++ class MAstro+; #pragma link C++ class MChisqEval+; #pragma link C++ class MineSweeper+;