Changeset 2978 in Sophya for trunk/SophyaLib/SkyMap/spherehealpix.h

Timestamp:

Jun 21, 2006, 10:38:26 AM (19 years ago)

Author:

ansari

Message:

1/ Mise en place de la prise en charge du schema de pixelisation NESTED dans
SphereHEALPix<T>
2/ petites corrections sur PixelMap<T> et cartes speheriques

Reza 21/06/2006

File:

• trunk/SophyaLib/SkyMap/spherehealpix.h (modified) (7 diffs)

trunk/SophyaLib/SkyMap/spherehealpix.h

@@ -52 +52 @@
          { return  HEALPix::ResolToSizeIndex(res); }
 
-SphereHEALPix();
-SphereHEALPix(int_4 m);
+SphereHEALPix(bool fgring=true);
+SphereHEALPix(int_4 m, bool fgring=true);
 SphereHEALPix(const SphereHEALPix<T>& s, bool share);
 SphereHEALPix(const SphereHEALPix<T>& s);
@@ -93 +93 @@
 virtual T SetPixels(T v);
 
-/*! Pixel Solid angle  (steradians)
+/*! \brief Pixel Solid angle  (steradians)
 
     All the pixels have the same solid angle. The dummy argument is
@@ -108 +108 @@
 
 virtual void Resize(int_4 m);
-
-/*! 
-
-\return type of storage of the map : RING or NESTED
-
-at the moment, always RING
-*/
-inline virtual string TypeOfMap() const {return string("RING");};
-
-
+virtual string TypeOfMap() const;
+
+inline bool IfRING() const { return fgring_; } 
+inline bool IfNESTED() const { return ( (fgring_) ? false : true ); } 
+
+/*
 virtual T& PixValNest(int_4 k);
 virtual T const& PixValNest(int_4 k) const;
-
 virtual int_4 PixIndexSphNest(double theta,double phi) const;
-
 virtual void PixThetaPhiNest(int_4 k,double& theta,double& phi) const;
+*/
 
 void Pixelize(int_4); 
@@ -138 +133 @@
 inline void Print(ostream& os) const { print(os); }
 
-
-
- 
-
-
-
-// Operations diverses  = , +=, ...
-
+//--------------------- Operations diverses  = , +=, ...
 
 SphereHEALPix<T>& Set(const SphereHEALPix<T>& a);
@@ -153 +141 @@
 // A += -= *= /= x (ajoute, soustrait, ... x a tous les elements)
 
-  //! Fill SphereHEALPix with all elements equal to \b x
+//! Fill SphereHEALPix with all elements equal to \b x
 virtual SphereHEALPix<T>& SetT(T a); 
 inline  SphereHEALPix<T>& operator = (T a) {return SetT(a);}
@@ -202 +190 @@
 void SetThetaSlices(); 
 
-inline void setParameters(int_4 nside, int_4 nbpixels, double solangle) 
-  {
-    nSide_= nside;
-    nPix_= nbpixels;
-    omeg_= solangle;
-  }
+inline void setParameters(int_4 nside, int_4 nbpixels, double solangle, 
+                          bool fgring) 
+{
+  nSide_= nside;
+  nPix_= nbpixels;
+  omeg_= solangle;
+  fgring_ = fgring;
+}
 
 // ------------- variables internes -----------------------
@@ -214 +204 @@
 int_4 nPix_;
 double omeg_;
+bool fgring_;  // true -> RING pixelisation , false -> NESTED
 
 NDataBlock<T> pixels_;
-NDataBlock<int_4> sliceBeginIndex_;         // Rationalisation Mac. D.Y.
+NDataBlock<int_4> sliceBeginIndex_;    // Indices in RING scheme
 NDataBlock<int_4> sliceLenght_;