Changeset 2990 in Sophya

Timestamp:

Jun 23, 2006, 12:35:17 PM (19 years ago)

Author:

ansari

Message:

Ajouts methode GetThetaSliceDataPtr() dans SphericalMap, SphereThetaPhi SphereHEALPix SphereECP pour optimisation calcul transforme Ylm + passage TypeOfMap TETAFI->ECP pour SphereECP , Reza 23/6/2006

Location:

trunk/SophyaLib/SkyMap

Files:

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

trunk/SophyaLib/SkyMap/sphereecp.cc

@@ -167 +167 @@
 string SphereECP<T>::TypeOfMap() const
 {
-  return string("TETAFI");
+  return string("ECP");
 }
 
@@ -370 +370 @@
   return;
 
+}
+
+template <class T>
+T*  SphereECP<T>::GetThetaSliceDataPtr(int_4 index)
+{
+  if( (index < 0) || (index >= _pixels.SizeY()) )  
+    throw RangeCheckError("SphereECP::GetThetaSliceDataPtr() index out of range");
+  int_4 ioff = _phi1/_dphi;
+  if (ioff != 0) return NULL;
+  return _pixels.Data() + index*_pixels.SizeX();
 }
 

trunk/SophyaLib/SkyMap/sphereecp.h

@@ -109 +109 @@
   virtual void          GetThetaSlice(int_4 sliceIndex, r_8& theta, r_8& phi0, 
                                       TVector<int_4>& pixelIndices,TVector<T>& value) const ;
+  virtual T*            GetThetaSliceDataPtr(int_4 index);
 
   // Valeur de pixel hors carte

trunk/SophyaLib/SkyMap/spherehealpix.cc

@@ -340 +340 @@
 void SphereHEALPix<T>::GetThetaSlice(int_4 index,r_8& theta,TVector<r_8>& phi,TVector<T>& value) const 
 {
-  if (index<0 || index >= NbThetaSlices())  {
-      cout << " SphereHEALPix::GetThetaSlice : Pixel index out of range" <<endl;
-      throw RangeCheckError(" SphereHEALPix::GetThetaSlice()  index out of range");
-  }
+  if (index<0 || index >= NbThetaSlices()) 
+    throw RangeCheckError(" SphereHEALPix::GetThetaSlice()  index out of range");
 
   int_4 iring= sliceBeginIndex_(index);
@@ -388 +386 @@
 
 template<class T>
-void SphereHEALPix<T>::GetThetaSlice(int_4 sliceIndex,r_8& theta, r_8& phi0, TVector<int_4>& pixelIndices,TVector<T>& value) const 
+void SphereHEALPix<T>::GetThetaSlice(int_4 sliceIndex,r_8& theta, r_8& phi0, 
+                                     TVector<int_4>& pixelIndices,TVector<T>& value) const 
 
 {
 
   if (sliceIndex<0 || sliceIndex >= NbThetaSlices()) 
-    {
-      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");
   int_4 iring= sliceBeginIndex_(sliceIndex);
   int_4 lring  =  sliceLenght_(sliceIndex);
@@ -417 +413 @@
     PixThetaPhi(ring2nest(nSide_,iring), theta, phi0);    
   }
+}
+
+//! return a pointer to the specified slice pixel data in RING ordering, NULL in NESTED
+template<class T>
+T* SphereHEALPix<T>::GetThetaSliceDataPtr(int_4 sliceIndex) 
+
+{
+  if (sliceIndex<0 || sliceIndex >= NbThetaSlices()) 
+    throw RangeCheckError(" SphereHEALPix::GetThetaSliceDataPtr(): index out of range");
+  if (fgring_) 
+    return pixels_.Begin()+sliceBeginIndex_(sliceIndex);
+  else return NULL;
 }
 

trunk/SophyaLib/SkyMap/spherehealpix.h

@@ -91 +91 @@
 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 ;
+virtual T*   GetThetaSliceDataPtr(int_4 sliceIndex);
 
 virtual bool ContainsSph(double theta, double phi) const;

trunk/SophyaLib/SkyMap/spherethetaphi.cc

@@ -192 +192 @@
   NPix_  = a.NPix_;
   Omega_ = a.Omega_;
-  int k;
+  int_4 k;
   for (k=0; k< NPix_; k++) pixels_(k) = a.pixels_(k);
   for (k=0; k< a.NPhi_.Size(); k++) NPhi_(k) = a.NPhi_(k);
@@ -246 +246 @@
 {
   double dphi;
-  int i,k;
+  int_4 i,k;
   bool fgzn = false;
 
@@ -270 +270 @@
 void SphereThetaPhi<T>::PixThetaPhi(int_4 k,double& theta,double& phi) const
 {
-  int i; 
+  int_4 i; 
   bool fgzn = false;
   
@@ -316 +316 @@
 void SphereThetaPhi<T>::Limits(int_4 k,double& tetMin,double& tetMax,double& phiMin,double& phiMax) 
   {
-  int j;
+  int_4 j;
   double dphi;
   bool fgzn= false;
@@ -335 +335 @@
   
   // on recupere l'indice i de la tranche qui contient le pixel k
-  int i;
+  int_4 i;
   for( i=0; i< NTheta_; i++ ) 
     if(k < TNphi_(i+1)) break;
@@ -378 +378 @@
 int_4 SphereThetaPhi<T>::NPhi(int_4 kt) const
 {
-  int nbpix;  
+  int_4 nbpix;  
   // verification
   if((kt < 0) || (kt >= 2*NTheta_)) return(-1);
@@ -455 +455 @@
 int_4 SphereThetaPhi<T>::Index(int_4 kt,int_4 jp) const
 {
-  int k;
+  int_4 k;
   bool fgzn= false;
   
@@ -494 +494 @@
   
   // on recupere l'indice kt de la tranche qui contient le pixel k
-  int i;
+  int_4 i;
   for(i = 0; i < NTheta_; i++) 
     if(k < TNphi_(i+1)) break;
@@ -523 +523 @@
 //--
 {
-  int ntotpix,j;
+  int_4 ntotpix,j;
   
   // Decodage et controle des arguments d'appel :
@@ -634 +634 @@
     
 
-  int iring= Index(index,0);
-  int lring  = NPhi(index);
+  int_4 iring= Index(index,0);
+  int_4 lring  = NPhi(index);
 
   phi.ReSize(lring);
@@ -643 +643 @@
   PixThetaPhi(iring,Te,Fi);
   double DFi = DeuxPi/(double)NPhi(index);
-  for(int kk = 0; kk < lring; kk++)   {
+  for(int_4 kk = 0; kk < lring; kk++)   {
     value(kk)= pixels_(kk+iring);
     phi(kk)= Fi;
@@ -668 +668 @@
     throw RangeCheckError("SphereThetaPhi::GetThetaSlice(idx...)  idx out of range"); 
 
-  int iring= Index(index,0);
-  int lring  = NPhi(index);
+  int_4 iring= Index(index,0);
+  int_4 lring  = NPhi(index);
 
   pixelIndices.ReSize(lring);
@@ -675 +675 @@
   double Te= 0.;
   double Fi= 0.;
-  for(int kk = 0; kk < lring; kk++)  {
+  for(int_4 kk = 0; kk < lring; kk++)  {
     pixelIndices(kk)=kk+iring ;
     value(kk)= pixels_(kk+iring);
@@ -682 +682 @@
 }
 
-
+//! return a pointer to the specified slice pixel data
+template <class T>
+T* SphereThetaPhi<T>::GetThetaSliceDataPtr(int_4 index)
+{
+  if(index < 0 || index >= NbThetaSlices()) 
+    throw RangeCheckError("SphereThetaPhi::GetThetaSliceDataPtr(idx)  idx out of range"); 
+  return pixels_.Begin()+Index(index,0);
+}
 
 
@@ -694 +701 @@
 
   os << "... NPhi_ Values : ";
-  int i;
+  int_4 i;
   for(i=0; i < NTheta_; i++)
     {

trunk/SophyaLib/SkyMap/spherethetaphi.h

@@ -132 +132 @@
 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 ;
+virtual T*   GetThetaSliceDataPtr(int_4 sliceIndex);
 
 

trunk/SophyaLib/SkyMap/sphericalmap.h

@@ -60 +60 @@
 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 ;
+/*!
+  If possible return a pointer to the slice pixel data. return NULL otherwise 
+*/
+virtual T*   GetThetaSliceDataPtr(int_4 sliceIndex) { return NULL; }
 };