Changeset 3506 in Sophya

Timestamp:

Aug 8, 2008, 12:52:17 PM (17 years ago)

Author:

ansari

Message:

Ajout SphereECP::ExtractPartial() et correction ds SphereECP::PixThetaPhi() - Reza 08/08/2008

Location:

trunk/SophyaLib/SkyMap

Files:

• sphereecp.cc (modified) (3 diffs)
• sphereecp.h (modified) (2 diffs)

trunk/SophyaLib/SkyMap/sphereecp.cc

@@ -9 +9 @@
 
   Class implementing spherical maps, with a pixelisation
-  corresponding to the an Equatorial Cylindrical Projection.
+  corresponding to the an Equatorial Cylindrical Projection (ECP).
   Pixel size varie from equator to poles. The sphere is divided 
   into a number of slices along the parallels. Each slice is subdivided
@@ -164 +164 @@
 }
 
+/*!
+  \brief Extract a partial map from a full ECP skymap
+  Theta and Phi limits are adjusted automatically to be correspond to the source map pixel boundaries
+*/
+template <class T>
+SphereECP<T> SphereECP<T>::ExtractPartial(r_8 tet1, r_8 tet2, r_8 phi1, r_8 phi2)
+{
+  if (IsPartial())      
+    throw  ParmError("SphereECP::ExtractPartial() source map NOT a full sky map");
+  if( (tet1 > M_PI) || (tet1 < 0.) || (tet2 > M_PI) || (tet2 < 0.) || 
+      (phi1 < 0.) || (phi1 > 2*M_PI) || (phi1 < 0.) || (phi1 > 2*M_PI) ||
+      (tet2 <= tet1) || (phi2 <= phi1) )
+    throw  ParmError("SphereECP::ExtractPartial() Bad range for theta/phi limits");
+
+// correction/calcul des limites en theta et nombre de rangees en theta  
+  sa_size_t ntet = (sa_size_t)((tet2-tet1)/_dtheta + 0.5);
+  sa_size_t offt = (sa_size_t)(tet1/_dtheta + 1e-3);
+  tet1 = _dtheta*offt;
+  tet2 = tet1+ntet*_dtheta;
+// correction/calcul des limites en phi et nombre de colonnes en phi
+  sa_size_t nphi = (sa_size_t)((phi2-phi1)/_dphi + 0.5);
+  sa_size_t offp = (sa_size_t)(phi1/_dphi + 1e-3);
+  phi1 = _dphi*offp;
+  phi2 = phi1+nphi*_dphi;
+
+// On cree une carte partielle avec les bons parametres
+  SphereECP<T> pmap(tet1, tet2, ntet, phi1, phi2, nphi);
+// On recopie les valeurs de pixels de la zone correspondante
+  pmap.GetPixelArray() = _pixels.SubArray(Range(offp, 0, nphi, 0), Range(offt, 0, ntet, 0),
+                                          Range::first(), Range::first(), Range::first());
+  return pmap;
+}
+
 template <class T>
 string SphereECP<T>::TypeOfMap() const
@@ -242 +275 @@
   int_4 jp = k % _pixels.SizeX();
   theta = _theta1+(it+0.5)*_dtheta;
-  phi = _phi1*(jp+0.5)*_dphi;
+  phi = _phi1+(jp+0.5)*_dphi;
   return;
 }

trunk/SophyaLib/SkyMap/sphereecp.h

@@ -9 +9 @@
 /* Classe de carte spherique avec decoupage theta-phi 
   (projection cylindique: Equatorial Cylindrical Projection) 
-  avec couverture posiibilite de couverture partielle,
-  limites en theta,phi
+  avec possibilite de couverture partielle, limitees en theta,phi
   R. Ansari  - Septembre 2004 
  */
@@ -44 +43 @@
   virtual               ~SphereECP();
 
-// Renvoie TETAPHI comme les SphereThetaPhi pour le moment  
+  // Extraction de carte partielle d'une carte ECP complete
+  virtual SphereECP<T> ExtractPartial(r_8 tet1, r_8 tet2, r_8 phi1, r_8 phi2);
+
+
+// Renvoie Type ECP 
   virtual string        TypeOfMap() const;  
   virtual void          SetTemp(bool temp=false) const;  // A supprimer