Changeset 4687

Timestamp:

08/19/04 11:28:02 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mastro/AstroLinkDef.h (modified) (1 diff)
• mastro/MTransCelLocCam.cc (deleted)
• mastro/MTransCelLocCam.h (deleted)
• mastro/Makefile (modified) (1 diff)
• mstarcam/MStarCamTrans.cc (modified) (16 diffs)
• mstarcam/MStarCamTrans.h (added)

trunk/MagicSoft/Mars/Changelog

@@ -20 +20 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2004/08/19: Thomas Bretz
+
+   * mastro/MTransCelLocCam.[h,cc]:
+     - renamed to MStarCamTrans and moved to mstarcam
+
+   * mastro/Makefile, mastro/AstroLinkDef.h:
+     - removed MTransCelLocCam
+
+   * mstarcam/Makefile, mstarcam/AstroLinkDef.h:
+   - cleaned up includes in Makefile
+   - added MStarCamTrans
+
+
+
  2004/08/19: Robert Wagner
+
    * mtemp/MFindStars.[cc,h], mastro/MAstroCamera.cc,
      mtemp/MSourceDirections.[cc,h]
-     - Changes to reflect the change of name of
-       MStarPos, MStarCam
+     - Changes to reflect the change of name of MStarPos, MStarCam
 
 

trunk/MagicSoft/Mars/mastro/AstroLinkDef.h

@@ -13 +13 @@
 
 #pragma link C++ class MObservatory+;
-#pragma link C++ class MTransCelLocCam+;
 
 #endif

trunk/MagicSoft/Mars/mastro/Makefile

@@ -26 +26 @@
            MAstroCatalog.cc \
            MAstroCamera.cc \
-           MObservatory.cc \
-           MTransCelLocCam.cc
+           MObservatory.cc
 
 ############################################################

trunk/MagicSoft/Mars/mstarcam/MStarCamTrans.cc

@@ -179 +179 @@
 // Output :  ( theta,  phi)    direction for the position (X,Y) in the camera
 //
-
-Bool_t MStarCamTrans::Loc0CamToLoc(Double_t theta0deg, Double_t phi0deg, 
+Bool_t MStarCamTrans::Loc0CamToLoc(Double_t theta0deg, Double_t phi0deg,
                                      Double_t X,         Double_t Y,
                                      Double_t &thetadeg, Double_t &phideg) 
@@ -235 +234 @@
 // Output :  (X, Y)      position in the camera corresponding to (theta, phi)
 //
-
 Bool_t MStarCamTrans::Loc0LocToCam(Double_t theta0deg, Double_t phi0deg,
                                      Double_t thetadeg,  Double_t phideg,
@@ -272 +270 @@
 // Output :  ( theta0,  phi0)    direction for the position (0,0) in the camera
 //
-
-Bool_t MStarCamTrans::LocCamToLoc0(Double_t thetadeg,   Double_t phideg, 
+Bool_t MStarCamTrans::LocCamToLoc0(Double_t thetadeg,   Double_t phideg,
                                      Double_t X,          Double_t Y,
                                      Double_t &theta0deg, Double_t &phi0deg) 
@@ -419 +416 @@
 // Output :  (dec,   h)    direction for the position (X,Y) in the camera
 //
-
-Bool_t MStarCamTrans::Cel0CamToCel(Double_t dec0deg, Double_t h0hour, 
+Bool_t MStarCamTrans::Cel0CamToCel(Double_t dec0deg, Double_t h0hour,
                                      Double_t X,       Double_t Y,
                                      Double_t &decdeg, Double_t &hhour) 
@@ -461 +457 @@
 // Output :  (X, Y)      position in the camera corresponding to (dec, h)
 //
-
 Bool_t MStarCamTrans::Cel0CelToCam(Double_t dec0deg, Double_t h0hour,
                                      Double_t decdeg,  Double_t hhour,
@@ -545 +540 @@
 // Output :  (theta2, phi2)  direction for the position (X2,Y2) in the camera
 //
-
-Bool_t MStarCamTrans::LocCamCamToLoc(Double_t theta1deg, Double_t phi1deg, 
+Bool_t MStarCamTrans::LocCamCamToLoc(Double_t theta1deg, Double_t phi1deg,
                                       Double_t X1,         Double_t Y1,
                                       Double_t X2,         Double_t Y2,
@@ -582 +576 @@
 // Output :  (    X2,   Y2)  position corresponding to (theta2, phi2)
 //
-
-Bool_t MStarCamTrans::LocCamLocToCam(Double_t theta1deg, Double_t phi1deg, 
+Bool_t MStarCamTrans::LocCamLocToCam(Double_t theta1deg, Double_t phi1deg,
                                        Double_t X1,        Double_t Y1,
                                        Double_t theta2deg, Double_t phi2deg,
@@ -616 +609 @@
 // Output :  (dec2, h2)  direction for the position (X2,Y2) in the camera
 //
-
-Bool_t MStarCamTrans::CelCamCamToCel(Double_t dec1deg, Double_t h1deg, 
+Bool_t MStarCamTrans::CelCamCamToCel(Double_t dec1deg, Double_t h1deg,
                                       Double_t X1,       Double_t Y1,
                                       Double_t X2,       Double_t Y2,
@@ -653 +645 @@
 // Output :  (  X2, Y2)  position corresponding to (dec2, h2)
 //
-
-Bool_t MStarCamTrans::CelCamCelToCam(Double_t dec1deg, Double_t h1deg, 
+Bool_t MStarCamTrans::CelCamCelToCam(Double_t dec1deg, Double_t h1deg,
                                        Double_t X1,      Double_t Y1,
                                        Double_t dec2deg, Double_t h2deg,
@@ -685 +676 @@
 // Output :  (theta, phi)    corresponding local coordinates
 //
-
-Bool_t MStarCamTrans::CelToLoc(Double_t decdeg,    Double_t hhour, 
+// (see also MAstroCatalog and MAstroSky2Local)
+//
+Bool_t MStarCamTrans::CelToLoc(Double_t decdeg,    Double_t hhour,
                                  Double_t &thetadeg, Double_t &phideg) 
 {
@@ -719 +711 @@
 // Output :  (dec,     h)    corresponding celestial coordinates
 //
-
-Bool_t MStarCamTrans::LocToCel(Double_t thetadeg, Double_t phideg, 
+// (see also MAstroCatalog and MAstroSky2Local)
+//
+Bool_t MStarCamTrans::LocToCel(Double_t thetadeg, Double_t phideg,
                                  Double_t &decdeg,  Double_t &hhour) 
 {
@@ -760 +753 @@
 //          and the lines of constant (Dec,   H  )
 //
-
+// (see also MAstroCatalog::Draw and MAstroCamera::Draw)
+//
+// Warning: Leaks Memory!
+//
 Bool_t MStarCamTrans::PlotGridAtDec0H0(TString name,
                                          Double_t dec0deg, Double_t h0hour) 
@@ -781 +777 @@
 //          and the lines of constant (Dec,   H  )
 //
-
+// (see also MAstroCatalog::Draw and MAstroCamera::Draw)
+//
+// Warning: Leaks Memory!
+//
 Bool_t MStarCamTrans::PlotGridAtTheta0Phi0(TString name,
                                     Double_t theta0deg, Double_t phi0deg) 
@@ -801 +800 @@
 //     set the binning along the lines (fGridFineBin)
 //
-
 Bool_t MStarCamTrans::SetGridParameters(
              Double_t gridbinning, Double_t gridfinebin) 
@@ -820 +818 @@
 //                              with the camera center at (Dec0,   H0  )
 //
-
+// (see also MAstroCatalog::Draw and MAstroCamera::Draw)
+//
+// Warning: Leaks Memory! 
+//
 Bool_t MStarCamTrans::PlotGrid(TString name,
                                  Double_t theta0deg, Double_t phi0deg,
@@ -1223 +1224 @@
     return kTRUE;
 }
-
-//===========================================================================
-
-
-
-
-
-
-
-
-
-