Index: /trunk/MagicSoft/Mars/Changelog =================================================================== --- /trunk/MagicSoft/Mars/Changelog (revision 3569) +++ /trunk/MagicSoft/Mars/Changelog (revision 3570) @@ -70,4 +70,20 @@ * mpointing/Makefile: - added include MAstro + + * manalysis/MSrcPosCam.[h,cc]: + - moved to mpointing + + * mpointing/MSrcPosCalc.[h,cc]: + - added: Derotates a star in the camera into MSrcPosCam + + * mpointing/Makefile, mpointing/PointingLinkDef.h: + - added MSrcPosCam + - added MSrcPosCalc + + * manalysis/Makefile, manalysis/AnalysisLinkDef.h: + - removed MSrcPosCam + + * manalysis/AnalysisIncl.h: + - removed TVector2 Index: /trunk/MagicSoft/Mars/manalysis/AnalysisIncl.h =================================================================== --- /trunk/MagicSoft/Mars/manalysis/AnalysisIncl.h (revision 3569) +++ /trunk/MagicSoft/Mars/manalysis/AnalysisIncl.h (revision 3570) @@ -1,5 +1,3 @@ #ifndef __CINT__ -#include - #endif // __CINT__ Index: /trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h =================================================================== --- /trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h (revision 3569) +++ /trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h (revision 3570) @@ -33,6 +33,4 @@ #pragma link C++ class MMultiDimDistCalc+; -#pragma link C++ class MSrcPosCam+; - #pragma link C++ class MEnergyEst+; #pragma link C++ class MEnergyEstimate+; @@ -57,4 +55,5 @@ #pragma link C++ class MParameterI+; #pragma link C++ class MParameterD+; +//#pragma link C++ class MParameters+; #pragma link C++ class MMcTriggerLvl2+; Index: unk/MagicSoft/Mars/manalysis/MSrcPosCam.cc =================================================================== --- /trunk/MagicSoft/Mars/manalysis/MSrcPosCam.cc (revision 3569) +++ (revision ) @@ -1,120 +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 12/2000 -! Author(s): Rudolf Bock 10/2001 -! -! Copyright: MAGIC Software Development, 2000-2002 -! -! -\* ======================================================================== */ - -////////////////////////////////////////////////////////////////////////////// -// -// MSrcPosCam -// -// Storage Container to hold the current position of the source (or -// anti/false source) in the camera plain -// -////////////////////////////////////////////////////////////////////////////// -#include "MSrcPosCam.h" - -#include - -#include - -#include "MLog.h" -#include "MLogManip.h" - -ClassImp(MSrcPosCam); - -using namespace std; - -static const TString gsDefName = "MSrcPosCam"; -static const TString gsDefTitle = "Virtual source position in the camera"; - -// -------------------------------------------------------------------------- -// -// Default constructor. -// -MSrcPosCam::MSrcPosCam(const char *name, const char *title) : fX(0), fY(0) -{ - fName = name ? name : gsDefName.Data(); - fTitle = title ? title : gsDefTitle.Data(); -} - -// ----------------------------------------------------------------------- -// -void MSrcPosCam::Print(Option_t *) const -{ - *fLog << all; - *fLog << "Source position in the camera plain (" << GetName() << ")" << endl; - *fLog << " - x [mm] = " << fX << endl; - *fLog << " - y [mm] = " << fY << endl; -} - -void MSrcPosCam::SetXY(const TVector2 &v) -{ - fX = v.X(); - fY = v.Y(); -} - -TVector2 MSrcPosCam::GetXY() const -{ - return TVector2(fX, fY); -} - -/* -// ----------------------------------------------------------------------- -// -// overloaded MParContainer to read MSrcPosCam from an ascii file -// -void MSrcPosCam::AsciiRead(ifstream &fin) -{ - fin >> fX; - fin >> fY; -} - -// ----------------------------------------------------------------------- -// -// overloaded MParContainer to write MSrcPosCam to an ascii file -// -void MSrcPosCam::AsciiWrite(ofstream &fout) const -{ - fout << fX << " " << fY; -} -*/ - -// -------------------------------------------------------------------------- -// -// Implementation of SavePrimitive. Used to write the call to a constructor -// to a macro. In the original root implementation it is used to write -// gui elements to a macro-file. -// -void MSrcPosCam::StreamPrimitive(ofstream &out) const -{ - out << " MSrcPosCam " << GetUniqueName(); - if (fName!=gsDefName) - { - out << "(\"" << fName << "\""; - if (fTitle!=gsDefTitle) - out << ", \"" << fTitle << "\""; - out <<")"; - } - out << ";" << endl; - - out << " " << GetUniqueName() << ".SetXY(" << fX << ", " << fY << ");" << endl;} Index: unk/MagicSoft/Mars/manalysis/MSrcPosCam.h =================================================================== --- /trunk/MagicSoft/Mars/manalysis/MSrcPosCam.h (revision 3569) +++ (revision ) @@ -1,40 +1,0 @@ -#ifndef MARS_MSrcPosCam -#define MARS_MSrcPosCam - -#ifndef MARS_MParContainer -#include "MParContainer.h" -#endif - -class TVector2; - -class MSrcPosCam : public MParContainer -{ -private: - Float_t fX; // [mm] x position of source in camera - Float_t fY; // [mm] y position of source in camera - - void StreamPrimitive(ofstream &out) const; - -public: - MSrcPosCam(const char *name=NULL, const char *title=NULL); - - void Clear(Option_t *) { fX = 0; fY = 0; } - - void SetX(Float_t x) { fX = x; } - void SetY(Float_t y) { fY = y; } - void SetXY(Float_t x, Float_t y) { fX = x; fY = y; } - void SetXY(const TVector2 &v); - - Float_t GetX() const { return fX; } - Float_t GetY() const { return fY; } - TVector2 GetXY() const; - - void Print(Option_t *opt=NULL) const; - - //void AsciiRead(ifstream &fin); - //void AsciiWrite(ofstream &fout) const; - - ClassDef(MSrcPosCam, 1) // container to store source position in the camera plain -}; - -#endif Index: /trunk/MagicSoft/Mars/manalysis/Makefile =================================================================== --- /trunk/MagicSoft/Mars/manalysis/Makefile (revision 3569) +++ /trunk/MagicSoft/Mars/manalysis/Makefile (revision 3570) @@ -48,5 +48,4 @@ MEnergyEstParam.cc \ MEnergyEstParamDanielMkn421.cc \ - MSrcPosCam.cc \ MHadronness.cc \ MMatrixLoop.cc \ Index: /trunk/MagicSoft/Mars/mpointing/MSrcPosCalc.cc =================================================================== --- /trunk/MagicSoft/Mars/mpointing/MSrcPosCalc.cc (revision 3569) +++ /trunk/MagicSoft/Mars/mpointing/MSrcPosCalc.cc (revision 3570) @@ -169,6 +169,4 @@ TVector2 v(fX, fY); - *fLog << dbg << fPointPos << " " << fGeom << " " << fObservatory << " " << fSrcPos << endl; - // rotate the source position by the current rotation angle const Double_t rho = fPointPos->RotationAngle(*fObservatory); Index: /trunk/MagicSoft/Mars/mpointing/Makefile =================================================================== --- /trunk/MagicSoft/Mars/mpointing/Makefile (revision 3569) +++ /trunk/MagicSoft/Mars/mpointing/Makefile (revision 3570) @@ -22,5 +22,6 @@ # connect the include files defined in the config.mk file # -INCLUDES = -I. -I../mbase -I../mraw -I../mreport -I../mmc -I../mastro +INCLUDES = -I. -I../mbase -I../mraw -I../mreport -I../mmc \ + -I../mastro -I../mgeom #------------------------------------------------------------------------------ @@ -29,5 +30,7 @@ SRCFILES = MPointingPos.cc \ - MPointingPosCalc.cc + MPointingPosCalc.cc \ + MSrcPosCam.cc \ + MSrcPosCalc.cc SRCS = $(SRCFILES) Index: /trunk/MagicSoft/Mars/mpointing/PointingIncl.h =================================================================== --- /trunk/MagicSoft/Mars/mpointing/PointingIncl.h (revision 3569) +++ /trunk/MagicSoft/Mars/mpointing/PointingIncl.h (revision 3570) @@ -1,3 +1,5 @@ #ifndef __CINT__ +#include + #endif // __CINT__ Index: /trunk/MagicSoft/Mars/mpointing/PointingLinkDef.h =================================================================== --- /trunk/MagicSoft/Mars/mpointing/PointingLinkDef.h (revision 3569) +++ /trunk/MagicSoft/Mars/mpointing/PointingLinkDef.h (revision 3570) @@ -8,3 +8,6 @@ #pragma link C++ class MPointingPosCalc+; +#pragma link C++ class MSrcPosCalc+; +#pragma link C++ class MSrcPosCam+; + #endif