Changeset 2968 in Sophya

Timestamp:

Jun 6, 2006, 6:53:51 PM (19 years ago)

Author:

ansari

Message:

Ajout methode ThetaOfSlice() a l'interface SphericalMap et propagation , Reza 06/06/2006

Location:

trunk/SophyaLib/SkyMap

Files:

• sphereecp.cc (modified) (2 diffs)
• sphereecp.h (modified) (1 diff)
• spherehealpix.cc (modified) (2 diffs)
• spherehealpix.h (modified) (1 diff)
• spherethetaphi.cc (modified) (2 diffs)
• spherethetaphi.h (modified) (1 diff)
• sphericalmap.h (modified) (1 diff)

trunk/SophyaLib/SkyMap/sphereecp.cc

@@ -304 +304 @@
 
 template <class T>
+r_8  SphereECP<T>::ThetaOfSlice(int_4 index) const
+{
+  if( (index < 0) || (index >= _pixels.SizeY()) )  
+     throw RangeCheckError("SphereECP::ThetaOfSlice() theta index out of range");
+  return (_theta1 + (index+0.5)*_dtheta);
+ 
+}
+
+template <class T>
 void  SphereECP<T>::GetThetaSlice(int_4 index,r_8& theta, 
                                   TVector<r_8>& phi, TVector<T>& value) const 
 {
   if( (index < 0) || (index >= _pixels.SizeY()) )  
-     throw RangeCheckError("SphereECP::GetThetaSlice() theta index out of range");
+     throw RangeCheckError("SphereECP::GetThetaSlice() index out of range");
 
   theta = _theta1 + (index+0.5)*_dtheta;
@@ -336 +345 @@
 {
   if( (index < 0) || (index >= _pixels.SizeY()) )  
-    throw RangeCheckError("SphereECP::GetThetaSlice() theta index out of range");
+    throw RangeCheckError("SphereECP::GetThetaSlice() index out of range");
   
   theta = _theta1 + (index+0.5)*_dtheta;

trunk/SophyaLib/SkyMap/sphereecp.h

@@ -96 +96 @@
   inline  uint_4        NbPhiSlices() const { return _pixels.SizeX(); }
 
+  virtual r_8           ThetaOfSlice(int_4 index) const;
   virtual void          GetThetaSlice(int_4 index,r_8& theta, 
                                       TVector<r_8>& phi, TVector<T>& value) const ; 

trunk/SophyaLib/SkyMap/spherehealpix.cc

@@ -299 +299 @@
 }
 
+//! Return the theta angle for slice defined by \b index
+template<class T>
+r_8 SphereHEALPix<T>::ThetaOfSlice(int_4 index) const
+{
+  uint_4 nbslices = uint_4(4*nSide_-1);
+  if (index<0 || index >= nbslices) 
+    throw RangeCheckError(" SphereHEALPix::ThetaOfSlice()  index out of range");
+  r_8 theta, phi0;
+  PixThetaPhi(sliceBeginIndex_(index), theta, phi0);
+  return theta;
+}
+
 /*!  \fn void SOPHYA::SphereHEALPix::GetThetaSlice(int_4 index,r_8& theta,TVector<r_8>& phi,TVector<T>& value) const 
 
@@ -317 +329 @@
     {
       cout << " SphereHEALPix::GetThetaSlice : Pixel index out of range" <<endl;
-      throw RangeCheckError(" SphereHEALPix::GetThetaSlice : Pixel index out of range");
+      throw RangeCheckError(" SphereHEALPix::GetThetaSlice()  index out of range");
     }
 

trunk/SophyaLib/SkyMap/spherehealpix.h

@@ -70 +70 @@
 virtual T const& PixVal(int_4 k) const;
 
-uint_4 NbThetaSlices() const;
+virtual uint_4 NbThetaSlices() const;
+virtual r_8  ThetaOfSlice(int_4 index) const;
 virtual void GetThetaSlice(int_4 index,r_8& theta,TVector<r_8>& phi,TVector<T>& value) const;
 virtual void GetThetaSlice(int_4 sliceIndex,r_8& theta, r_8& phi0, TVector<int_4>& pixelIndices,TVector<T>& value) const ;

trunk/SophyaLib/SkyMap/spherethetaphi.cc

@@ -592 +592 @@
 }
 
+//! Return the theta angle for slice defined by \b index
+template <class T>
+r_8 SphereThetaPhi<T>::ThetaOfSlice(int_4 index) const
+{
+  if(index < 0 || index >= 2*NTheta_) 
+    throw RangeCheckError("SphereThetaPhi::ThetaOfSlice() index out of range"); 
+  double tet1, tet2;
+  Theta(index, tet1, tet2); 
+  return 0.5*(tet1+tet2);  
+}
 
 /*!    
@@ -606 +616 @@
 
   if(index < 0 || index >= NbThetaSlices()) 
-    {
-       throw RangeCheckError("SphereThetaPhi::PIxVal Pixel index out of range"); 
-    }
+    throw RangeCheckError("SphereThetaPhi::GetThetaSlice() index out of range"); 
+    
 
   int iring= Index(index,0);

trunk/SophyaLib/SkyMap/spherethetaphi.h

@@ -119 +119 @@
 void Pixelize(int_4); 
 
+virtual r_8  ThetaOfSlice(int_4 index) const;
 virtual void GetThetaSlice(int_4 index,r_8& theta,TVector<r_8>& phi,TVector<T>& value) const; 
 virtual void GetThetaSlice(int_4 index, r_8& theta, r_8& phi0,TVector<int_4>& pixelIndices, TVector<T>& value) const ;

trunk/SophyaLib/SkyMap/sphericalmap.h

@@ -47 +47 @@
 virtual void Resize(int_4 m)=0;
 virtual uint_4 NbThetaSlices() const=0;
+virtual r_8  ThetaOfSlice(int_4 index) const=0;
 virtual void GetThetaSlice(int_4 index,r_8& theta, TVector<r_8>& phi, TVector<T>& value) const=0; 
 virtual void GetThetaSlice(int_4 sliceIndex, r_8& theta, r_8& phi0, TVector<int_4>& pixelIndices,TVector<T>& value) const=0 ;