Changeset 2013 in Sophya for trunk/SophyaLib/SkyMap/localmap.h

Timestamp:

May 24, 2002, 4:54:53 PM (23 years ago)

Author:

lemeur

Message:

amelioration de la projection de localmap

File:

• trunk/SophyaLib/SkyMap/localmap.h (modified) (6 diffs)

trunk/SophyaLib/SkyMap/localmap.h

@@ -19 +19 @@
 
 
+template <class T>
+class FIO_LocalMap;
+
+template<class T>
+class FITS_LocalMap;
+
 /* Class LocalMap */
 
@@ -26 +32 @@
 {
 
+ // friend declaration for classes which handle persistence and FITS IO
+  friend class FIO_LocalMap<T>; 
+  friend class FITS_LocalMap<T>; 
+
 public:
 
 LocalMap();
-LocalMap(int_4 nx, int_4 ny);
+LocalMap(int_4 nx, int_4 ny, double angleX,double angleY, double theta0,double phi0,int_4 x0,int_4 y0,double angle=0.);
+LocalMap(int_4 nx, int_4 ny, double angleX,double angleY, double theta0,double phi0, double angle=0.);
 LocalMap(const LocalMap<T>& lm, bool share);
 LocalMap(const LocalMap<T>& lm);
@@ -69 +80 @@
 inline virtual char* TypeOfMap() const {return "LOCAL";};
  
-virtual void SetOrigin(double theta=90.,double phi=0.,double angle=0.);
-virtual void SetOrigin(double theta,double phi,int_4 x0,int_4 y0,double angle=0.);
-
-virtual void SetSize(double angleX,double angleY);
 
 /*! Check to see if the local mapping is done */
-inline bool LocalMap_isDone() const {return(originFlag_ && extensFlag_);};
-
-virtual void Project(SphericalMap<T>& sphere) const;
+  //inline bool LocalMap_isDone() const {return(originFlag_ && extensFlag_);};
+
+void PixThetaPhi(int_4 ip,int_4 it, double& theta,double& phi) const;
+
+
+void ProjectionToSphere(SphericalMap<T>&) const;
   
 /* There should be a more complex algorithm somewhere to combine *several* local maps to a full sphere.
@@ -92 +102 @@
 inline int_4 SizeY() const {return nSzY_;}
 
-inline void Origin(double& theta,double& phi,int_4& x0,int_4& y0,double& angle) const {theta= theta0_; phi= phi0_; x0= x0_; y0= y0_;angle= angle_;}
-
-inline void Aperture(double& anglex,double& angley) const {anglex= angleX_; angley= angleY_;}
+inline void Origin(double& theta,double& phi,int_4& x0,int_4& y0,double& angle) const {theta= thetaDegresC_; phi= phiDegresC_; x0= x0_; y0= y0_;angle= angleDegres_;}
+
+/*! total aperture in theta and phi, in degrees ( from SetSize() ) */
+inline void Aperture(double& anglex,double& angley) const {anglex= angleDegresX_; angley= angleDegresY_;}
 
 
 /*  Acces to the DataBlock  */
-inline       NDataBlock<T>& DataBlock()       {return pixels_;}
-inline const NDataBlock<T>& DataBlock() const {return pixels_;}
+inline       NDataBlock<T>& DataBlock()       {return pixels_.DataBlock();}
+inline const NDataBlock<T>& DataBlock() const {return pixels_.DataBlock();}
+
+/*  Acces to the matrix  */
+//! access to matrix 
+/*!
+  \warning : a pixel is defined by the pair of a phi-like index 
+   (x-axis) and a theta-like index (y-axis). The phi-like index denotes
+   the column number in the matrix ; the theta-like index denotes the
+   row number.
+*/
+inline       TMatrix<T>& Matrix()       {return pixels_;}
+inline const TMatrix<T>& Matrix() const {return pixels_;}
 
 /* impression */ 
@@ -156 +178 @@
 
 void InitNul();
+void SetOrigin(double theta=90.,double phi=0.,double angle=0.);
+void SetOrigin(double theta,double phi,int_4 x0,int_4 y0,double angle=0.);
+void SetSize(double angleX,double angleY);
+void SetCoorC(double theta0, double phi0);
+TMatrix<double> CalculMatricePassage();
 void Getij(int_4 k,int_4& i,int_4& j) const;
-void ReferenceToUser(double& theta,double& phi) const; 
-void UserToReference(double& theta,double& phi) const;
-void PixProjToAngle(double x,double y,double& theta,double& phi) const; 
-void AngleProjToPix(double theta,double phi,double& x,double& y) const; 
+  void PixToSphereC(int_4 ip, int_4 it, double& XP, double& YP, double& ZP) const;
 
 void recopierVariablesSimples(const LocalMap<T>& lm);
@@ -167 +191 @@
 // ---------- Variables internes ----------------------------
 
-int_4 nSzX_;
-int_4 nSzY_;
-int_4 nPix_;
-bool originFlag_;
-bool extensFlag_;
-int_4 x0_;
-int_4 y0_;
-double theta0_;
-double phi0_;
-double angle_;
-double cos_angle_;
-double sin_angle_;
-double angleX_;
-double angleY_;
-double tgAngleX_;
-double tgAngleY_;
-NDataBlock<T> pixels_;
+
+  // variables suffisantes pour reconstruire l'objet
+
+  int_4 nSzX_;
+  int_4 nSzY_;
+  double angleDegresX_;
+  double angleDegresY_;
+  double thetaDegresC_;
+  double phiDegresC_;
+  int_4 x0_;
+  int_4 y0_;
+  double angleDegres_;
+
+  //  NDataBlock<T> pixels_;
+  TMatrix<T> pixels_;
+
+
+  // variables derivees (redondantes, precalculees pour ameliorer 
+  // les performances)
+
+  int_4 nPix_;
+
+
+  double thetaC_;
+  double phiC_;
+  double csthC_;
+  double snthC_;
+  double csphC_;
+  double snphC_;
+  double XC_;
+  double YC_;
+  double ZC_;
+
+
+  double angle_;
+  double cosAngle_;
+  double sinAngle_;
+  double deltaPhi_;
+  double deltaTheta_;
+
+
+
 };