Changeset 2052 in Sophya for trunk/SophyaLib/SkyMap

Timestamp:

Jun 11, 2002, 7:13:42 PM (23 years ago)

Author:

ansari

Message:

corrections mineures ds localmap - Reza 11/6/2002

Location:

trunk/SophyaLib/SkyMap

Files:

• localmap.cc (modified) (5 diffs)
• localmap.h (modified) (3 diffs)

trunk/SophyaLib/SkyMap/localmap.cc

@@ -318 +318 @@
   double xmin= -x0_-0.5;
   double xmax= xmin+nSzX_;
-  if((X > xmax) || (X < xmin)) return(-1);
+  if((X > xmax) || (X < xmin)) { 
+    if (exc_outofmap_) throw RangeCheckError("LocalMap<T>::PixIndexSph() - Out of Map Theta/Phi (X) ");
+    else return(-1);
+  }
   double xcurrent= xmin;
   for(i = 0; i < nSzX_; i++ ) 
@@ -327 +330 @@
   double ymin= -y0_-0.5;
   double ymax= ymin+nSzY_;
-  if((Y >  ymax) || (Y < ymin)) return(-1);
+  if((Y >  ymax) || (Y < ymin)) { 
+    if (exc_outofmap_) throw RangeCheckError("LocalMap<T>::PixIndexSph() - Out of Map Theta/Phi (Y) ");
+    else return(-1);
+  }
   double ycurrent= ymin;
   for(j = 0; j < nSzY_; j++ ) 
@@ -467 +473 @@
   if ( theta0 < 0. || theta0 > 180. || phi0 < 0. || phi0 > 360. || angle < -90. || angle > 90.)
     {
-      throw "LocalMap::SetOrigin  angle out of range"; 
+      throw ParmError("LocalMap::SetOrigin  angle out of range"); 
     }
   SetCoorC(theta0,phi0);
@@ -574 +580 @@
   if ( angleX <= 0. || angleX > 180. || angleY <= 0. || angleY > 180.)
     {
-      throw "LocalMap::SetSize extension angle out of range"; 
+      throw ParmError("LocalMap::SetSize extension angle out of range"); 
     }
 
@@ -646 +652 @@
   deltaPhi_   = 0.;
   deltaTheta_ =0.;
+  SetThrowExceptionWhenOutofMapFlag(false); // Genere des exceptions si theta-phi out of range 
 }
 

trunk/SophyaLib/SkyMap/localmap.h

@@ -57 +57 @@
 inline T& operator()(int_4 ix, int_4 iy) {return PixVal(iy*nSzX_+ix);};
 inline T const& operator()(int_4 ix, int_4 iy) const {return PixVal(iy*nSzX_+ix);};
+
+// Acces a un pixel 
+inline T& operator()(double theta,double phi) {return(PixValSph(theta,phi));};
+inline T  const& operator()(double theta,double phi) const {return(PixValSph(theta,phi));};
    
 // ---------- Definition of PixelMap abstract methods -------
@@ -64 +68 @@
 virtual T& PixVal(int_4 k);
 virtual T const& PixVal(int_4 k) const;
+
+inline  void SetThrowExceptionWhenOutofMapFlag(bool fg = false) { exc_outofmap_ = fg; }
+// true --> Genere des exceptions si theta-phi out of range , sinon, index a -1
+inline  void GetThrowExceptionWhenOutofMapFlag() { return exc_outofmap_; }
 
 virtual bool ContainsSph(double theta, double phi) const;
@@ -231 +239 @@
   double deltaTheta_;
 
+  bool exc_outofmap_;