Changeset 3572 in Sophya for trunk/SophyaLib/SkyMap

Timestamp:

Feb 7, 2009, 10:50:34 PM (17 years ago)

Author:

cmv

Message:

char* -> const char* pour regler les problemes de deprecated string const... + comparaison unsigned signed + suppression EVOL_PLANCK rz+cmv 07/02/2009

Location:

trunk/SophyaLib/SkyMap

Files:

• fiolocalmap.cc (modified) (2 diffs)
• localmap.cc (modified) (3 diffs)
• spherehealpix.cc (modified) (6 diffs)
• spherepos.cc (modified) (1 diff)
• spherepos.h (modified) (1 diff)
• spherethetaphi.cc (modified) (6 diffs)

trunk/SophyaLib/SkyMap/fiolocalmap.cc

@@ -167 +167 @@
   int_4 nSzX= dobj->Size_x();
   int_4 nSzY= dobj->Size_y();
-  int_4 nPix= dobj->NbPixels();
  
   if(dobj->ptrInfo()) 
@@ -183 +182 @@
   os.PutI4(nSzX);
   os.PutI4(nSzY);
-  //  os.PutI4(nPix);
 
   if(dobj->LocalMap_isDone())

trunk/SophyaLib/SkyMap/localmap.cc

@@ -256 +256 @@
     throw(SzMismatchError("LocalMap<T>::CopyElt(const LocalMap<T>&) SizeMismatch")) ;
       recopierVariablesSimples(a);     
-  int k;
   pixels_ = a.pixels_;
   return(*this);
@@ -349 +348 @@
   double csTheta = cos(theta);
   double snTheta = sin(theta);
-  double csPhi   = cos(phi);
-  double snPhi   = sin(phi); 
   double csPhiMPhiC = cos (phi - phiC_);
   double snPhiMPhiC = sin (phi - phiC_);
@@ -585 +582 @@
   double sin_phi_axeZ;
 
-  double cth,sth, cdeltaPhi, phi, cphi, sphi;
+  double cth,sth, cdeltaPhi, phi;
 
   if ( snthC_ <= 0.) // carte centree au pole 

trunk/SophyaLib/SkyMap/spherehealpix.cc

@@ -177 +177 @@
   nPix_ = a.nPix_;
   omeg_ = a.omeg_;
-  int k;
   if (fgring_ == a.fgring_) 
-    for (k=0; k< nPix_; k++) pixels_(k) = a.pixels_(k);
+    for (int_4 k=0; k< nPix_; k++) pixels_(k) = a.pixels_(k);
   else {
-    if (fgring_)  for (k=0; k< nPix_; k++) 
+    if (fgring_)  for (int_4 k=0; k< nPix_; k++) 
       pixels_(k) = a.pixels_(ring2nest(nSide_, k));
-    else  for (k=0; k< nPix_; k++) 
+    else  for (int_4 k=0; k< nPix_; k++) 
       pixels_(k) = a.pixels_(nest2ring(nSide_, k));                          
   }
-  for (k=0; k< a.sliceBeginIndex_.Size(); k++) sliceBeginIndex_(k) = a.sliceBeginIndex_(k);
-  for (k=0; k< a.sliceLenght_.Size(); k++) sliceLenght_(k) = a.sliceLenght_(k);
+  for (size_t k=0; k< a.sliceBeginIndex_.Size(); k++) sliceBeginIndex_(k) = a.sliceBeginIndex_(k);
+  for (size_t k=0; k< a.sliceLenght_.Size(); k++) sliceLenght_(k) = a.sliceLenght_(k);
   return(*this);
 }
@@ -305 +304 @@
 {
   uint_4 nbslices = uint_4(4*nSide_-1);
-  if (index<0 || index >= nbslices) 
+  if (index<0 || index >= (int_4)nbslices) 
     throw RangeCheckError(" SphereHEALPix::ThetaOfSlice()  index out of range");
   r_8 theta, phi0;
@@ -322 +321 @@
 int_4 SphereHEALPix<T>::GetSymThetaSliceIndex(int_4 idx) const
 {
-  if(idx < 0 || idx >= NbThetaSlices()) 
+  if(idx < 0 || idx >= (int_4)NbThetaSlices()) 
     throw RangeCheckError("SphereHEALPix::GetSymThetaSliceIndex index out of range"); 
   return (NbThetaSlices()-1-idx);
@@ -340 +339 @@
 void SphereHEALPix<T>::GetThetaSlice(int_4 index,r_8& theta,TVector<r_8>& phi,TVector<T>& value) const 
 {
-  if (index<0 || index >= NbThetaSlices()) 
+  if (index<0 || index >= (int_4)NbThetaSlices()) 
     throw RangeCheckError(" SphereHEALPix::GetThetaSlice()  index out of range");
 
@@ -391 +390 @@
 {
 
-  if (sliceIndex<0 || sliceIndex >= NbThetaSlices()) 
+  if (sliceIndex<0 || sliceIndex >= (int_4)NbThetaSlices()) 
     throw RangeCheckError(" SphereHEALPix::GetThetaSlice() index out of range");
   int_4 iring= sliceBeginIndex_(sliceIndex);
@@ -420 +419 @@
 
 {
-  if (sliceIndex<0 || sliceIndex >= NbThetaSlices()) 
+  if (sliceIndex<0 || sliceIndex >= (int_4)NbThetaSlices()) 
     throw RangeCheckError(" SphereHEALPix::GetThetaSliceDataPtr(): index out of range");
   if (fgring_) 

trunk/SophyaLib/SkyMap/spherepos.cc

@@ -11 +11 @@
 #include <typeinfo>
 
-static char *head_spherepos_cc_ = "$Header: /Users/garnier/temp/CVSSophya/SophyaLib/SkyMap/spherepos.cc,v 1.4 2006-06-20 16:01:48 ansari Exp $";
 
 

trunk/SophyaLib/SkyMap/spherepos.h

@@ -9 +9 @@
 #include "anydataobj.h"
 
-static char *head_spherepos_h_ = "$Header: /Users/garnier/temp/CVSSophya/SophyaLib/SkyMap/spherepos.h,v 1.2 2006-06-20 16:01:48 ansari Exp $";
 
 namespace SOPHYA {

trunk/SophyaLib/SkyMap/spherethetaphi.cc

@@ -192 +192 @@
   NPix_  = a.NPix_;
   Omega_ = a.Omega_;
-  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);
-  for (k=0; k< a.TNphi_.Size(); k++) TNphi_(k) = a.TNphi_(k);
-  for (k=0; k< a.Theta_.Size(); k++) Theta_(k) = a.Theta_(k);
+  for (int_4 k=0; k< NPix_; k++) pixels_(k) = a.pixels_(k);
+  for (size_t k=0; k< a.NPhi_.Size(); k++) NPhi_(k) = a.NPhi_(k);
+  for (size_t k=0; k< a.TNphi_.Size(); k++) TNphi_(k) = a.TNphi_(k);
+  for (size_t k=0; k< a.Theta_.Size(); k++) Theta_(k) = a.Theta_(k);
   return(*this);
 
@@ -613 +612 @@
 int_4 SphereThetaPhi<T>::GetSymThetaSliceIndex(int_4 idx) const
 {
-  if(idx < 0 || idx >= NbThetaSlices()) 
+  if(idx < 0 || idx >= (int_4)NbThetaSlices()) 
     throw RangeCheckError("SphereThetaPhi::GetSymThetaSliceIndex index out of range"); 
   return (NbThetaSlices()-1-idx);
@@ -630 +629 @@
 {
 
-  if(index < 0 || index >= NbThetaSlices()) 
+  if(index < 0 || index >= (int_4)NbThetaSlices()) 
     throw RangeCheckError("SphereThetaPhi::GetThetaSlice(idx...) index out of range"); 
     
@@ -665 +664 @@
 {
 
-  if(index < 0 || index >= NbThetaSlices()) 
+  if(index < 0 || index >= (int_4)NbThetaSlices()) 
     throw RangeCheckError("SphereThetaPhi::GetThetaSlice(idx...)  idx out of range"); 
 
@@ -673 +672 @@
   pixelIndices.ReSize(lring);
   value.ReSize(lring);
-  double Te= 0.;
-  double Fi= 0.;
   for(int_4 kk = 0; kk < lring; kk++)  {
     pixelIndices(kk)=kk+iring ;
@@ -686 +683 @@
 T* SphereThetaPhi<T>::GetThetaSliceDataPtr(int_4 index)
 {
-  if(index < 0 || index >= NbThetaSlices()) 
+  if(index < 0 || index >= (int_4)NbThetaSlices()) 
     throw RangeCheckError("SphereThetaPhi::GetThetaSliceDataPtr(idx)  idx out of range"); 
   return pixels_.Begin()+Index(index,0);