Changeset 697 in Sophya for trunk/SophyaLib

Timestamp:

Jan 3, 2000, 10:36:55 AM (26 years ago)

Author:

ansari

Message:

correction de la traduction en c++ de l'interface avec la pixelisation Gorski (pix2ang_ring)

File:

• trunk/SophyaLib/Samba/spheregorski.cc (modified) (7 diffs)

trunk/SophyaLib/Samba/spheregorski.cc

@@ -345 +345 @@
 //--
 {
-  cout << "entree GetThetaSlice, couche no " << index << endl;
-
-  if (index<0 || index > NbThetaSlices()) 
+
+  if (index<0 || index >= NbThetaSlices()) 
     {
       // THROW(out_of_range("SphereGorski::PIxVal Pixel index out of range")); 
-      cout << " SphereGorski::GetThetaSlice : exceptions  a mettre en place" <<endl;
+      cout << " SphereGorski::GetThetaSlice : Pixel index out of range" <<endl;
       THROW(rangeCheckErr);
     }
@@ -397 +396 @@
     {
       // THROW(out_of_range("SphereGorski::PIxVal Pixel index out of range")); 
-      cout << " SphereGorski::PIxVal : exceptions  a mettre en place" <<endl;
+      cout << " SphereGorski::PIxVal : exception  a mettre en place, k= " << k <<endl;
       THROW(rangeCheckErr);
     }
@@ -414 +413 @@
     {
       //THROW(out_of_range("SphereGorski::PIxVal Pixel index out of range")); 
-      cout << " SphereGorski::PIxVal : exceptions  a mettre en place" <<endl;
+      cout << " SphereGorski::PIxVal : exception  a mettre en place, k= " << k <<endl;
       THROW(rangeCheckErr);
     }
@@ -677 +676 @@
     
     hip   = ipring1/2.;
-    fihip = (int)floor ( hip );
+    fihip = floor ( hip );
     irn   = (int)floor( sqrt( hip - sqrt(fihip) ) ) + 1;// ! counted from North pole
     iphi  = ipring1 - 2*irn*(irn - 1);
@@ -954 +953 @@
     
     theta = acos( 1. - iring*iring / fact2 );
-    phi   = (1.*iphi - 0.5) * Pi/(2.*iring);
+    phi   = ((double)iphi - 0.5) * Pi/(2.*iring);
     //    cout << theta << " " << phi << endl;
   }
@@ -961 +960 @@
     ip    = ipix1 - ncap - 1;
     iring = (int)floor( ip / nl4 ) + nside;// ! counted from North pole
-    iphi  = (int)fmod(ip,nl4) + 1;
-    
-    fodd  = 0.5 * (1 + fmod((double)(iring+nside),2));//  ! 1 if iring+nside is odd, 1/2 otherwise
+    iphi  = ip%nl4 + 1;
+    
+    fodd  = 0.5 * (1 + (iring+nside)%2 );//  ! 1 if iring+nside is odd, 1/2 otherwise
     theta = acos( (nl2 - iring) / fact1 );
-    phi   = (1.*iphi - fodd) * Pi /(2.*nside);
+    phi   = ((double)iphi - fodd) * Pi /(2.*nside);
   }
   else {//! South Polar cap -----------------------------------
@@ -971 +970 @@
     ip    = npix - ipix1 + 1;
     hip   = ip/2.;
-    fihip = 1.*hip;
+    fihip = floor(hip);
     iring = (int)floor( sqrt( hip - sqrt(fihip) ) ) + 1;//     ! counted from South pole
     iphi  = (int)(4.*iring + 1 - (ip - 2.*iring*(iring-1)));
     
     theta = acos( -1. + iring*iring / fact2 );
-    phi   = (1.*iphi - 0.5) * Pi/(2.*iring);
+    phi   = ((double)iphi - 0.5) * Pi/(2.*iring);
     //    cout << theta << " " << phi << endl;
   }